Feature: Auto Swipe

public/index.html

@@ -1661,6 +1661,20 @@
                                     <option value="1">Always enabled</option>
                                 </select>
                             </div>
+                            
+                            <h4>Auto-swipe</h4>
+                            <label for="auto_swipe">
+                                <input id="auto_swipe" type="checkbox" />
+                                Auto-swipe enabled
+                            </label>
+                            <div>Minimum generated message length</div>
+                            <input id="auto_swipe_minimum_length" name="auto_swipe_minimum_length" type="number" min="0" step="1" value="0" class="text_pole">
+                            <div>Blacklisted words</div>
+                            <div class="auto_swipe">
+                                <input id="auto_swipe_blacklist" name="auto_swipe_blacklist" placeholder="ethical, guidelines, harmful, illegal, comfortable, generating" class="text_pole" maxlength="500" value="" autocomplete="off">
+                                <div>Blacklisted word count to swipe</div>
+                                <input id="auto_swipe_blacklist_threshold" name="auto_swipe_blacklist_threshold" type="number" min="0" step="1" value="1" class="text_pole">
+                            </div>
                         </div>
                     </div>
 

public/script.js

@@ -1184,7 +1184,6 @@ function substituteParams(content, _name1, _name2) {
     _name1 = _name1 ?? name1;
     _name2 = _name2 ?? name2;
     if (!content) {
-        console.warn("No content on substituteParams")
         return ''
     }
 
@@ -1469,13 +1468,46 @@ class StreamingProcessor {
         this.hideStopButton(this.messageId);
         this.onProgressStreaming(messageId, text);
         addCopyToCodeBlocks($(`#chat .mes[mesid="${messageId}"]`));
-        playMessageSound();
         saveChatConditional();
         activateSendButtons();
         showSwipeButtons();
         setGenerationProgress(0);
         $('.mes_buttons:last').show();
         generatedPromtCache = '';
+        
+        console.log("Generated text size:", text.length, text)
+
+        if (power_user.auto_swipe) {
+            function containsBlacklistedWords(str, blacklist, threshold) {
+                const regex = new RegExp(`\\b(${blacklist.join('|')})\\b`, 'gi');
+                const matches = str.match(regex) || [];
+                return matches.length >= threshold;
+            }
+
+            const generatedTextFiltered = (text) => {
+                if (text) {
+                    if (power_user.auto_swipe_minimum_length) {
+                        if (text.length < power_user.auto_swipe_minimum_length && text.length !== 0) {
+                            console.log("Generated text size too small")
+                            return true
+                        }
+                    }
+                    if (power_user.auto_swipe_blacklist_threshold) {
+                        if (containsBlacklistedWords(text, power_user.auto_swipe_blacklist, power_user.auto_swipe_blacklist_threshold)) {
+                            console.log("Generated text has blacklisted words")
+                            return true
+                        }
+                    }
+                }
+                return false
+            }
+
+            if (generatedTextFiltered(text)) {
+                swipe_right()
+                return
+            }
+        }
+        playMessageSound();
     }
 
     onErrorStreaming() {
@@ -1630,8 +1662,6 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
         let anchorTop = '';
         let anchorBottom = '';
         if (!is_pygmalion) {
-            console.log('saw not pyg');
-
             let postAnchorChar = character_anchor ? name2 + " Elaborate speaker" : "";
             let postAnchorStyle = style_anchor ? "Writing style: very long messages" : "";
             if (anchor_order === 0) {
@@ -4005,54 +4035,8 @@ window["SillyTavern"].getContext = function () {
     };
 };
 
-
+// when we click swipe right button
-
+const swipe_right = () => {
-$(document).ready(function () {
-
-
-    //////////INPUT BAR FOCUS-KEEPING LOGIC/////////////
-
-    let S_TAFocused = false;
-    let S_TAPreviouslyFocused = false;
-    $('#send_textarea').on('focusin focus click', () => {
-        S_TAFocused = true;
-        S_TAPreviouslyFocused = true;
-    });
-    $('#send_textarea').on('focusout blur', () => S_TAFocused = false);
-    $('#options_button, #send_but, #option_regenerate').on('click', () => {
-        if (S_TAPreviouslyFocused) {
-            $('#send_textarea').focus();
-            S_TAFocused = true;
-        }
-    });
-    $(document).click(event => {
-        if ($(':focus').attr('id') !== 'send_textarea') {
-            if (!$(event.target.id).is("#options_button, #send_but, #send_textarea, #option_regenerate")) {
-                S_TAFocused = false;
-                S_TAPreviouslyFocused = false;
-            }
-        } else {
-            S_TAFocused = true;
-            S_TAPreviouslyFocused = true;
-        }
-    });
-
-    /////////////////
-
-    $('#swipes-checkbox').change(function () {
-        swipes = !!$('#swipes-checkbox').prop('checked');
-        if (swipes) {
-            //console.log('toggle change calling showswipebtns');
-            showSwipeButtons();
-        } else {
-            hideSwipeButtons();
-        }
-        saveSettingsDebounced();
-    });
-
-    ///// SWIPE BUTTON CLICKS ///////
-
-    $(document).on('click', '.swipe_right', function () {               //when we click swipe right button
     if (chat.length - 1 === Number(this_edit_mes_id)) {
         closeMessageEditor();
     }
@@ -4086,16 +4070,19 @@ $(document).ready(function () {
         run_swipe_right = true; //then prepare to do normal right swipe to show next message
     }
 
+    const currentMessage = $("#chat").children().filter(`[mesid="${count_view_mes - 1}"]`);
+    let this_div = currentMessage.children('.swipe_right');
+    let this_mes_div = this_div.parent();
+
     if (chat[chat.length - 1]['swipe_id'] > chat[chat.length - 1]['swipes'].length) { //if we swipe right while generating (the swipe ID is greater than what we are viewing now)
         chat[chat.length - 1]['swipe_id'] = chat[chat.length - 1]['swipes'].length; //show that message slot (will be '...' while generating)
     }
     if (run_generate) {               //hide swipe arrows while generating
-            $(this).css('display', 'none');
+        this_div.css('display', 'none');
     }
-        if (run_generate || run_swipe_right) {                // handles animated transitions when swipe right, specifically height transitions between messages
+    // handles animated transitions when swipe right, specifically height transitions between messages
-
+    if (run_generate || run_swipe_right) {
-            let this_mes_div = $(this).parent();
+        let this_mes_block = this_mes_div.children('.mes_block').children('.mes_text');
-            let this_mes_block = $(this).parent().children('.mes_block').children('.mes_text');
         const this_mes_div_height = this_mes_div[0].scrollHeight;
         const this_mes_block_height = this_mes_block[0].scrollHeight;
 
@@ -4177,20 +4164,19 @@ $(document).ready(function () {
                 });
             }
         });
-
+        this_mes_div.children('.avatar').transition({ // moves avatar along with swipe
-            $(this).parent().children('.avatar').transition({ // moves avatar aong with swipe
             x: '-' + swipe_range,
             duration: swipe_duration,
             easing: animation_easing,
             queue: false,
             complete: function () {
-                    $(this).parent().children('.avatar').transition({
+                this_mes_div.children('.avatar').transition({
                     x: swipe_range,
                     duration: 0,
                     easing: animation_easing,
                     queue: false,
                     complete: function () {
-                            $(this).parent().children('.avatar').transition({
+                        this_mes_div.children('.avatar').transition({
                             x: '0px',
                             duration: swipe_duration,
                             easing: animation_easing,
@@ -4204,8 +4190,54 @@ $(document).ready(function () {
             }
         });
     }
+}
 
+$(document).ready(function () {
+
+
+    //////////INPUT BAR FOCUS-KEEPING LOGIC/////////////
+
+    let S_TAFocused = false;
+    let S_TAPreviouslyFocused = false;
+    $('#send_textarea').on('focusin focus click', () => {
+        S_TAFocused = true;
+        S_TAPreviouslyFocused = true;
     });
+    $('#send_textarea').on('focusout blur', () => S_TAFocused = false);
+    $('#options_button, #send_but, #option_regenerate').on('click', () => {
+        if (S_TAPreviouslyFocused) {
+            $('#send_textarea').focus();
+            S_TAFocused = true;
+        }
+    });
+    $(document).click(event => {
+        if ($(':focus').attr('id') !== 'send_textarea') {
+            if (!$(event.target.id).is("#options_button, #send_but, #send_textarea, #option_regenerate")) {
+                S_TAFocused = false;
+                S_TAPreviouslyFocused = false;
+            }
+        } else {
+            S_TAFocused = true;
+            S_TAPreviouslyFocused = true;
+        }
+    });
+
+    /////////////////
+
+    $('#swipes-checkbox').change(function () {
+        swipes = !!$('#swipes-checkbox').prop('checked');
+        if (swipes) {
+            //console.log('toggle change calling showswipebtns');
+            showSwipeButtons();
+        } else {
+            hideSwipeButtons();
+        }
+        saveSettingsDebounced();
+    });
+
+    ///// SWIPE BUTTON CLICKS ///////
+
+    $(document).on('click', '.swipe_right', swipe_right);
 
     $(document).on('click', '.swipe_left', function () {      // when we swipe left..but no generation.
         if (chat.length - 1 === Number(this_edit_mes_id)) {

public/scripts/openai.js

@@ -310,7 +310,7 @@ async function prepareOpenAIMessages(name2, storyString, worldInfoBefore, worldI
     let whole_prompt = getSystemPrompt(nsfw_toggle_prompt, enhance_definitions_prompt, wiBefore, storyString, wiAfter, extensionPrompt, isImpersonate);
 
     // Join by a space and replace placeholders with real user/char names
-    storyString = substituteParams(whole_prompt.join(" ")).replace(/\r/gm, '').trim();
+    storyString = substituteParams(whole_prompt.join("\n")).replace(/\r/gm, '').trim();
 
     let prompt_msg = { "role": "system", "content": storyString }
     let examples_tosend = [];
@@ -469,7 +469,7 @@ function getSystemPrompt(nsfw_toggle_prompt, enhance_definitions_prompt, wiBefor
             whole_prompt = [nsfw_toggle_prompt, oai_settings.main_prompt, enhance_definitions_prompt + "\n\n" + wiBefore, storyString, wiAfter, extensionPrompt];
         }
         else {
-            whole_prompt = [oai_settings.main_prompt, nsfw_toggle_prompt, enhance_definitions_prompt + "\n\n" + wiBefore, storyString, wiAfter, extensionPrompt];
+            whole_prompt = [oai_settings.main_prompt, nsfw_toggle_prompt, enhance_definitions_prompt, "\n", wiBefore, storyString, wiAfter, extensionPrompt].filter(elem => elem);
         }
     }
     return whole_prompt;

public/scripts/power-user.js

@@ -106,6 +106,10 @@ let power_user = {
     noShadows: false,
     theme: 'Default (Dark)',
 
+    auto_swipe: false,
+    auto_swipe_minimum_length: 0,
+    auto_swipe_blacklist: ["ethical", "guidelines", "harmful", "illegal", "comfortable", "generating"],
+    auto_swipe_blacklist_threshold: 2,
     auto_scroll_chat_to_bottom: true,
     auto_fix_generated_markdown: true,
     send_on_enter: send_on_enter_options.AUTO,
@@ -476,6 +480,11 @@ function loadPowerUserSettings(settings, data) {
     power_user.font_scale = Number(localStorage.getItem(storage_keys.font_scale) ?? 1);
     power_user.blur_strength = Number(localStorage.getItem(storage_keys.blur_strength) ?? 10);
 
+    $('#auto_swipe').prop("checked", power_user.auto_swipe);
+    $('#auto_swipe_minimum_length').val(power_user.auto_swipe_minimum_length);
+    $('#auto_swipe_blacklist').val(power_user.auto_swipe_blacklist.join(", "));
+    $('#auto_swipe_blacklist_threshold').val(power_user.auto_swipe_blacklist_threshold);
+
     $('#auto_fix_generated_markdown').prop("checked", power_user.auto_fix_generated_markdown);
     $('#auto_scroll_chat_to_bottom').prop("checked", power_user.auto_scroll_chat_to_bottom);
     $(`#tokenizer option[value="${power_user.tokenizer}"]`).attr('selected', true);
@@ -999,6 +1008,39 @@ $(document).ready(() => {
         saveSettingsDebounced();
     });
 
+    $('#auto_swipe').on('input', function () {
+        power_user.auto_swipe = !!$(this).prop('checked');
+        console.log("power_user.auto_swipe", power_user.auto_swipe)
+        saveSettingsDebounced();
+    });
+
+    $('#auto_swipe_blacklist').on('input', function () {
+        power_user.auto_swipe_blacklist = $(this).val()
+            .split(",")
+            .map(str => str.trim())
+            .filter(str => str);
+        console.log("power_user.auto_swipe_blacklist", power_user.auto_swipe_blacklist)
+        saveSettingsDebounced();
+    });
+
+    $('#auto_swipe_minimum_length').on('input', function () {
+        const number = parseInt($(this).val());
+        if (!isNaN(number)) {
+            power_user.auto_swipe_minimum_length = number;
+            console.log("power_user.auto_swipe_minimum_length", power_user.auto_swipe_minimum_length)
+            saveSettingsDebounced();
+        }
+    });
+
+    $('#auto_swipe_blacklist_threshold').on('input', function () {
+        const number = parseInt($(this).val());
+        if (!isNaN(number)) {
+            power_user.auto_swipe_blacklist_threshold = number;
+            console.log("power_user.auto_swipe_blacklist_threshold", power_user.auto_swipe_blacklist_threshold)
+            saveSettingsDebounced();
+        }
+    });
+
     $('#auto_fix_generated_markdown').on('input', function () {
         power_user.auto_fix_generated_markdown = !!$(this).prop('checked');
         reloadCurrentChat();