Code clean-up

870abe077675f30e3546a9c4eaa6a4b68b1c234e

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: b39b7998ce5cfed8e5945d0bd29e3851eb9a205a

public/scripts/slash-commands.js+24 -61 Viewed

     extractMessageBias,
     generateQuietPrompt,
     generateRaw,
 +    getFirstDisplayedMessageId,
     getThumbnailUrl,
     is_send_press,
     main_api,

     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'chat-jump',
         aliases: ['floor', 'jumpchat-scrollto', 'scrolltofloor-teleport'],
         callback: async (_, index) => {
             const floorIndexmessageIndex = Number(index);
 -            const chatLength = typeof chat !== 'undefined' ? chat.length : -1; // Use -1 if chat is undefined to avoid errors
 +            if (isNaN(messageIndex) || messageIndex < 0 || messageIndex >= chat.length) {
 -            if (isNaN(floorIndex) || floorIndex < 0 || (chatLength !== -1 && floorIndex >= chatLength)) {
 +                toastr.warning(t`Invalid message index: ${index}. Please enter a number between 0 and ${chat.length}.`);
 -                const maxIndex = (chatLength !== -1 ? chatLength - 1 : 'unknown');
 +                console.warn(`WARN: Invalid message index provided for /chat-jump: ${index}. Max index: ${chat.length}`);
 -                toastr.warning(`Invalid message index: ${index}. Please enter a number between 0 and ${maxIndex}.`);
 -                console.warn(`WARN: Invalid message index provided for /chat-jump: ${index}. Max index: ${maxIndex}`);
                 return '';
+            }
 -            // --- Load all messages first to ensure the target element exists ---
 +            // Load more messages if needed
 -            console.log(`INFO: Attempting to load all messages before attempting to chat-jump ${index}.`);
 +            const firstDisplayedMessageId = getFirstDisplayedMessageId();
 -            try {
 +            if (isFinite(firstDisplayedMessageId) && messageIndex < firstDisplayedMessageId) {
 -                // Assuming showMoreMessages is available globally or within scope
 +                const needToLoadCount = firstDisplayedMessageId - messageIndex;
                 await showMoreMessages(Number.MAX_SAFE_INTEGERneedToLoadCount);
 -                console.log('INFO: All messages loaded (or loading initiated).');
 +                await delay(1);
 -                // Give the rendering a moment to potentially catch up after showMoreMessages
 -                await new Promise(resolve => setTimeout(resolve, 100)); // Adjust delay if needed
 -            } catch (error) {
 -                console.error('Error loading messages:', error);
 -                toastr.error('An error occurred while trying to load messages.');
 -                return ''; // Exit if loading fails
+            }
 -            // --- End of loading step ---
 -            const messageElement = document.querySelector(`[mesid="${floorIndex}"]`);
             const chatContainer = document.getElementById('chat');
 +            const messageElement = document.querySelector(`#chat .mes[mesid="${messageIndex}"]`);
             if (messageElement instanceof HTMLElement && chatContainer instanceof HTMLElement) {
                 const headerElementelementRect = messageElement.querySelectorgetBoundingClientRect('.ch_name');
 -                const elementToScroll = headerElement || messageElement; // Fallback to the entire message div
+-
 -                // Calculate position relative to chat container
 -                const elementRect = elementToScroll.getBoundingClientRect();
                 const containerRect = chatContainer.getBoundingClientRect();
 -                const scrollPosition = elementRect.top - containerRect.top + chatContainer.scrollTop;
 -                const viewportOffset = chatContainer.clientHeight * 0.1; // 25% from top
 +                const scrollPosition = elementRect.top - containerRect.top + chatContainer.scrollTop;
                 chatContainer.scrollTo({
                     top: scrollPosition - viewportOffset,
                     behavior: 'smooth',
                 });
 -                // Highlight the message element
 +                flashHighlight($(messageElement), 2000);
 -                if (messageElement instanceof HTMLElement) {
 -                    if (typeof $ !== 'undefined') { // Check if jQuery is available
 -                        flashHighlight($(messageElement), 1500);
 -                    } else {
 -                        console.warn('jQuery not available, cannot use flashHighlight.');
 -                        // Optional: Add a temporary CSS class highlight if jQuery/flashHighlight is missing
 -                        messageElement.style.transition = 'background-color 0.5s ease';
 -                        messageElement.style.backgroundColor = 'yellow'; // Or some highlight color
 -                        setTimeout(() => {
 -                            messageElement.style.backgroundColor = ''; // Remove highlight
 -                        }, 1500); // Match flash duration
 -                    }
 -                } else {
 -                    console.warn('Message element is not an HTMLElement, cannot flash highlight.');
 -                }
             } else {
 -                // Only warn if element is not found *after* attempting to load all messages
 +                toastr.warning(t`Could not find element for message ${messageIndex}. It might not be rendered yet or the index is invalid.`);
 -                toastr.warning(`Could not find element for message ${floorIndex} (using [mesid="${floorIndex}"]) even after attempting to load all messages. It might not be rendered yet or the index is invalid.`);
 +                console.warn(`WARN: Element not found for message index ${messageIndex} in /chat-jump.`);
 -                console.warn(`WARN: Element not found for message index ${floorIndex} using querySelector [mesid="${floorIndex}"] in /chat-jump, even after attempting to load all messages.`);
 -                // Do NOT scroll the chat container in this case
+            }
 -            return ''; // Return empty string as expected by some slash command parsers
++
 +            return '';
         },
         unnamedArgumentList: [
             SlashCommandArgument.fromProps({

         ],
         helpString: `
         <div>
             Scrolls the chat view to the specified message index. Uses the <code>[mesid]</code> attribute for locating the message element. Index starts at 0.
 -            It attempts to center the character's name/header area within the message block by targeting the <code>.ch_name</code> element. Highlights the message using a flash animation.
 -            Automatically attempts to load all messages before scrolling to improve success rate, addressing issues with lazy loading.
 -            A warning is displayed if the message element cannot be located even after attempting to load all messages.
         </div>
         <div>
             <strong>Example:</strong> <pre><code>/chat-jump 10</code></pre> Scrolls to the 11th message (mesidid=10).
         </div>
     `,
     }));
 -    const styleId = 'chat-jump-highlight-style';
 -    if (document.getElementById(styleId)) {
 -        document.getElementById(styleId).remove();
 -    }
+-
     registerVariableCommands();
+}