Merge pull request #3948 from InspectorCaracal/patch-3 Adds a check for jailbreaks existing in new TC PHI

5fa64361c24f868a914055ea0c87cb808a92e35d

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

Signed
1 files changed, +9 -6Ignore whitespace
public/script.js+9 -6
@@ -4214,12 +4214,15 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
42144214 ? substituteParams(jailbreak, name1, name2, (power_user.sysprompt.post_history ?? ''))
42154215 : baseChatReplace(power_user.sysprompt.post_history, name1, name2);
42164216
4217- // When continuing generation of previous output, last user message precedes the message to continue
4217+ // Only inject the jb if there is one
42184218 if (isContinuejailbreak) {
4219- coreChat.splice(coreChat.length - 1, 0, { mes: jailbreak, is_user: true });
4219+ // When continuing generation of previous output, last user message precedes the message to continue
4220- }
4220+ if (isContinue) {
4221- else {
4221+ coreChat.splice(coreChat.length - 1, 0, { mes: jailbreak, is_user: true });
4222- coreChat.push({ mes: jailbreak, is_user: true });
4222+ }
4223+ else {
4224+ coreChat.push({ mes: jailbreak, is_user: true });
4225+ }
42234226 }
42244227 }
42254228