- Adding display of queued speakers in group chat windows.

f85b843b3ebeaed162d4b28cbbc74b7a429a7a9a

David Fedolfi <dfedolfi@gmail.com>

public/scripts/char-data.js+1 -0 Viewed

  * @property {string} chat - name of the current chat file chat
  * @property {string} avatar - file name of the avatar image (acts as a unique identifier)
  * @property {string} json_data - the full raw JSON data of the character
+ * @property {number} queueOrder - Characters position in the char queue. #1 is currently generating.
  */
 export default 0;// now this file is a module

public/scripts/group-chats.js+27 -4 Viewed

     animation_duration,
     depth_prompt_role_default,
     shouldAutoContinue,
+    this_chid,
 } from '../script.js';
 import { printTagList, createTagMapFromList, applyTagsOnCharacterSelect, tag_map, applyTagsOnGroupSelect } from './tags.js';
 import { FILTER_TYPES, FilterHelper } from './filters.js';

         sendSystemMessage(system_message_types.EMPTY, '', { isSmallSys: true });
         return Promise.resolve();
+    }
+    const showChatQueue = (!(typingIndicator.length === 0 && !isStreamingEnabled()) && openGroupId);
     try {
         throwIfAborted();
         hideSwipeButtons();

             await saveChatConditional();
             $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true }));
+        }
+        if (showChatQueue){
+            for (let i = 0; i < activatedMembers.length; ++i){
+                characters[activatedMembers[i]].queueOrder = (i+1);
+            }
+        }
         // now the real generation begins: cycle through every activated character
         for (const chId of activatedMembers) {
             throwIfAborted();

             const generateType = type == 'swipe' || type == 'impersonate' || type == 'quiet' || type == 'continue' ? type : 'group_chat';
             setCharacterId(chId);
             setCharacterName(characters[chId].name);
+            if (showChatQueue){
+                printGroupMembers();
+            }
             await eventSource.emit(event_types.GROUP_MEMBER_DRAFTED, chId);
             if (type !== 'swipe' && type !== 'impersonate' && !isStreamingEnabled()) {

@@ -885,6 +894,10 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
885	messageChunk = textResult?.messageChunk;	894	messageChunk = textResult?.messageChunk;
886	}	895	}
887	}	896	}
		897	if (showChatQueue){
		898	activatedMembers.filter(chidx => characters[chidx].queueOrder > 0)
		899	.forEach(chindex => characters[chindex].queueOrder -= 1);
		900	}
888	}	901	}
889	} finally {	902	} finally {
890	typingIndicator.hide();	903	typingIndicator.hide();

         is_group_generating = false;
         setSendButtonState(false);
         setCharacterId(undefined);
+        if (showChatQueue){
+            group.members.forEach(avatar => {
+                let character = characters.find(x => x.avatar === avatar || x.name === avatar);
+                character.queueOrder = undefined;
+            });
+            printGroupMembers();
+        }
         setCharacterName('');
         activateSendButtons();
         showSwipeButtons();

     const isFav = character.fav || character.fav == 'true';
     template.data('id', character.avatar);
     template.find('.avatar img').attr({ 'src': avatar, 'title': character.avatar });
-    template.find('.ch_name').text(character.name);
+    template.find('.ch_name').text(character.name + (character.queueOrder > 0?'   (#' + character.queueOrder + ')':''));    template.attr('chid', characters.indexOf(character));
-    template.attr('chid', characters.indexOf(character));
     template.find('.ch_fav').val(isFav);
     template.toggleClass('is_fav', isFav);
+    template.toggleClass('is_active', character.queueOrder === 1);
+    template.toggleClass('is_queued', character.queueOrder > 1);
     template.toggleClass('disabled', isGroupMemberDisabled(character.avatar));
+    template.toggleClass('is_active', character.avatar === (this_chid && characters[this_chid] && characters[this_chid].avatar));
     // Display inline tags
     const tagsElement = template.find('.tags');

public/style.css+8 -0 Viewed

     position: relative;
+}
+.group_member.is_queued {
+    border: 2px solid var(--golden);
+}
+.group_member.is_active {
+    border: 2px solid var(--active);
+}
 .character_select.is_fav .avatar,
 .group_select.is_fav .avatar,
 .group_member.is_fav .avatar,