From 78ba88f94ffdb840a9b8a367bebcdbf6fb1eb1cf Mon Sep 17 00:00:00 2001
From: LenAnderson <Anderson.Len@outlook.com>
Date: Tue, 26 Mar 2024 12:21:22 -0400
Subject: [PATCH 1/2] set active character / active group in /go command

---
 public/scripts/slash-commands.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/public/scripts/slash-commands.js b/public/scripts/slash-commands.js
index a954404c0..76d4b11db 100644
--- a/public/scripts/slash-commands.js
+++ b/public/scripts/slash-commands.js
@@ -25,6 +25,8 @@ import {
     saveChatConditional,
     sendMessageAsUser,
     sendSystemMessage,
+    setActiveCharacter,
+    setActiveGroup,
     setCharacterId,
     setCharacterName,
     setExtensionPrompt,
@@ -1248,11 +1250,15 @@ async function goToCharacterCallback(_, name) {
 
     if (characterIndex !== -1) {
         await openChat(new String(characterIndex));
+        setActiveCharacter(characters[characterIndex]?.avatar);
+        setActiveGroup(null);
         return characters[characterIndex]?.name;
     } else {
         const group = groups.find(it => it.name.toLowerCase() == name.toLowerCase());
         if (group) {
             await openGroupById(group.id);
+            setActiveCharacter(null);
+            setActiveGroup(group.id);
             return group.name;
         } else {
             console.warn(`No matches found for name "${name}"`);

From 4e7cd6d63b096f3242e2303c8d3902717c056954 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Tue, 26 Mar 2024 18:30:12 +0200
Subject: [PATCH 2/2] Set active character for /random

---
 public/scripts/power-user.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 5628793bc..d0cc3fc06 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -21,6 +21,8 @@ import {
     saveChatConditional,
     setAnimationDuration,
     ANIMATION_DURATION_DEFAULT,
+    setActiveGroup,
+    setActiveCharacter,
 } from '../script.js';
 import { isMobile, initMovingUI, favsToHotswap } from './RossAscends-mods.js';
 import {
@@ -2302,6 +2304,8 @@ async function doRandomChat() {
     resetSelectedGroup();
     const characterId = Math.floor(Math.random() * characters.length).toString();
     setCharacterId(characterId);
+    setActiveCharacter(characters[characterId]?.avatar);
+    setActiveGroup(null);
     await delay(1);
     await reloadCurrentChat();
     return characters[characterId]?.name;