Group Chat Queue Display - removing queue position from character object - storing in map in group_chat.js instead - moving queue position to div - moving '#' from js to css ::before - adding option to settings - cleaning up guards

2fccd83083b714e165eda5102112b7b21ba4865c

David Fedolfi <dfedolfi@gmail.com>

Parents: f85b843b3ebeaed162d4b28cbbc74b7a429a7a9a
4 files changed, +39 -16Ignore whitespace
public/index.html+5 -0
@@ -4141,6 +4141,10 @@
41414141 <input id="request_token_probabilities" type="checkbox" />
41424142 <small data-i18n="Request token probabilities">Request token probabilities</small>
41434143 </label>
4144+ <label data-newbie-hidden class="checkbox_label" for="show_group_chat_queue" title="In group chat, highlight the character(s) that are currently queued to generate responses and the order in which they will respond." data-i18n="[title]Requests logprobs from the API for the Token Probabilities feature">
4145+ <input id="show_group_chat_queue" type="checkbox" />
4146+ <small data-i18n="Request token probabilities">Show group chat queue</small>
4147+ </label>
41444148 <div data-newbie-hidden class="inline-drawer wide100p flexFlowColumn">
41454149 <div class="inline-drawer-toggle inline-drawer-header userSettingsInnerExpandable" title="Automatically reject and re-generate AI message based on configurable criteria." data-i18n="[title]Automatically reject and re-generate AI message based on configurable criteria">
41464150 <b><span data-i18n="Auto-swipe">Auto-swipe</span></b>
@@ -5796,6 +5800,7 @@
57965800 <div class="tags tags_inline"></div>
57975801 </div>
57985802 <input class="ch_fav" value="" hidden />
5803+ <div class="queue_position"></div>
57995804 <div class="group_member_icon">
58005805 <div title="Temporarily disable automatic replies from this character" data-action="disable" class="right_menu_button fa-solid fa-lg fa-comment-slash" data-i18n="[title]Temporarily disable automatic replies from this character"></div>
58015806 <div title="Enable automatic replies from this character" data-action="enable" class="right_menu_button fa-solid fa-lg fa-comment-slash" data-i18n="[title]Enable automatic replies from this character"></div>
public/scripts/group-chats.js+19 -16
@@ -121,6 +121,7 @@ const DEFAULT_AUTO_MODE_DELAY = 5;
121121export const groupCandidatesFilter = new FilterHelper(debounce(printGroupCandidates, debounce_timeout.quick));
122122let autoModeWorker = null;
123123const saveGroupDebounced = debounce(async (group, reload) => await _save(group, reload), debounce_timeout.relaxed);
124+let groupChatQueueOrder = new Map();
124125
125126function setAutoModeWorker() {
126127 clearInterval(autoModeWorker);
@@ -787,7 +788,6 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
787788 return Promise.resolve();
788789 }
789790
790- const showChatQueue = (!(typingIndicator.length === 0 && !isStreamingEnabled()) && openGroupId);
791791 try {
792792 throwIfAborted();
793793 hideSwipeButtons();
@@ -859,9 +859,11 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
859859 await saveChatConditional();
860860 $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true }));
861861 }
862- if (showChatQueue){
862+ groupChatQueueOrder = new Map();
863+
864+ if (power_user.show_group_chat_queue){
863865 for (let i = 0; i < activatedMembers.length; ++i){
864866 groupChatQueueOrder.set(characters[activatedMembers[i]].queueOrder =avatar, (i+1);
865867 }
866868 }
867869 // now the real generation begins: cycle through every activated character
@@ -871,7 +873,7 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
871873 const generateType = type == 'swipe' || type == 'impersonate' || type == 'quiet' || type == 'continue' ? type : 'group_chat';
872874 setCharacterId(chId);
873875 setCharacterName(characters[chId].name);
874876 if (showChatQueuepower_user.show_group_chat_queue){
875877 printGroupMembers();
876878 }
877879 await eventSource.emit(event_types.GROUP_MEMBER_DRAFTED, chId);
@@ -894,9 +896,9 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
894896 messageChunk = textResult?.messageChunk;
895897 }
896898 }
897899 if (showChatQueuepower_user.show_group_chat_queue){
898- activatedMembers.filter(chidx => characters[chidx].queueOrder > 0)
900+ groupChatQueueOrder.delete(characters[chId].avatar);
899- .forEach(chindex => characters[chindex].queueOrder -= 1);
901+ groupChatQueueOrder.forEach((value, key, map) => map.set(key, value-1));
900902 }
901903 }
902904 } finally {
@@ -905,12 +907,8 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
905907 is_group_generating = false;
906908 setSendButtonState(false);
907909 setCharacterId(undefined);
908-
910+ if (power_user.show_group_chat_queue){
909- if (showChatQueue){
911+ groupChatQueueOrder = new Map();
910- group.members.forEach(avatar => {
911- let character = characters.find(x => x.avatar === avatar || x.name === avatar);
912- character.queueOrder = undefined;
913- });
914912 printGroupMembers();
915913 }
916914 setCharacterName('');
@@ -1333,10 +1331,15 @@ function getGroupCharacterBlock(character) {
13331331 template.find('.ch_name').text(character.name + (character.queueOrder > 0?' (#' + character.queueOrder + ')':'')); template.attr('chid', characters.indexOf(character));
13341332 template.find('.ch_fav').val(isFav);
13351333 template.toggleClass('is_fav', isFav);
1336- template.toggleClass('is_active', character.queueOrder === 1);
1334+
1337- template.toggleClass('is_queued', character.queueOrder > 1);
1335+ let queuePosition = groupChatQueueOrder.get(character.avatar);
1336+ if (queuePosition){
1337+ template.find('.queue_position').text(queuePosition);
1338+ template.toggleClass('is_queued', queuePosition > 1);
1339+ template.toggleClass('is_active', queuePosition === 1);
1340+ }
1341+
13381342 template.toggleClass('disabled', isGroupMemberDisabled(character.avatar));
1339- template.toggleClass('is_active', character.avatar === (this_chid && characters[this_chid] && characters[this_chid].avatar));
13401343
13411344 // Display inline tags
13421345 const tagsElement = template.find('.tags');
public/scripts/power-user.js+7 -0
@@ -179,6 +179,7 @@ let power_user = {
179179 send_on_enter: send_on_enter_options.AUTO,
180180 console_log_prompts: false,
181181 request_token_probabilities: false,
182+ show_group_chat_queue: false,
182183 render_formulas: false,
183184 allow_name1_display: false,
184185 allow_name2_display: false,
@@ -1601,6 +1602,7 @@ function loadPowerUserSettings(settings, data) {
16011602
16021603 $('#console_log_prompts').prop('checked', power_user.console_log_prompts);
16031604 $('#request_token_probabilities').prop('checked', power_user.request_token_probabilities);
1605+ $('#show_group_chat_queue').prop('checked', power_user.show_group_chat_queue);
16041606 $('#auto_fix_generated_markdown').prop('checked', power_user.auto_fix_generated_markdown);
16051607 $('#auto_scroll_chat_to_bottom').prop('checked', power_user.auto_scroll_chat_to_bottom);
16061608 $('#bogus_folders').prop('checked', power_user.bogus_folders);
@@ -3567,6 +3569,11 @@ $(document).ready(() => {
35673569 saveSettingsDebounced();
35683570 });
35693571
3572+ $('#show_group_chat_queue').on('input', function () {
3573+ power_user.show_group_chat_queue = !!$(this).prop('checked');
3574+ saveSettingsDebounced();
3575+ });
3576+
35703577 $('#auto_scroll_chat_to_bottom').on('input', function () {
35713578 power_user.auto_scroll_chat_to_bottom = !!$(this).prop('checked');
35723579 saveSettingsDebounced();
public/style.css+8 -0
@@ -2922,6 +2922,14 @@ input[type=search]:focus::-webkit-search-cancel-button {
29222922 position: relative;
29232923}
29242924
2925+.group_member .queue_position:not(:empty)::before {
2926+ content: "#";
2927+}
2928+
2929+.group_member .queue_position{
2930+ margin-right: 1rem;
2931+}
2932+
29252933.group_member.is_queued {
29262934 border: 2px solid var(--golden);
29272935}