From 55f38f69d62dc97194dcad2cdadb986fc8a90d21 Mon Sep 17 00:00:00 2001
From: RossAscends <124905043+RossAscends@users.noreply.github.com>
Date: Wed, 31 May 2023 22:22:52 +0900
Subject: [PATCH] fix new char highlight, group drawers autoOpen logic

---
 public/script.js              | 57 +++++++++++++++++++++++------------
 public/scripts/group-chats.js |  3 ++
 2 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/public/script.js b/public/script.js
index 90c05c512..269f48f11 100644
--- a/public/script.js
+++ b/public/script.js
@@ -4248,27 +4248,40 @@ function select_rm_info(type, charId, previousCharId = null) {
     getCharacters();
     selectRightMenuWithAnimation('rm_characters_block');
 
-    if (type === 'char_import' || type === 'char_create') {
+    setTimeout(function () {
+        if (type === 'char_import' || type === 'char_create') {
+            const element = $(`#rm_characters_block [title="${charId}"]`).parent().get(0);
+            console.log(element);
+            element.scrollIntoView({ behavior: 'smooth', block: 'start' });
 
-        const element = $(`#rm_characters_block [title="${charId}"]`).get(0);
-        element.scrollIntoView({ behavior: 'smooth', block: 'end' });
-
-        $(`#rm_characters_block [title="${charId}"]`).parent().addClass('flash animated');
-        setTimeout(function () {
-            $(`#rm_characters_block [title="${charId}"]`).parent().removeClass('flash animated');
-        }, 5000);
-    }
-
-    if (type === 'group_create') {
-        //for groups, ${charId} = data.id from group-chats.js createGroup()
-        const element = $(`#rm_characters_block [grid="${charId}"]`).get(0);
-        element.scrollIntoView({ behavior: 'smooth', block: 'end' });
-        $(`#rm_characters_block [grid="${charId}"]`).addClass('flash animated');
-        setTimeout(function () {
-            $(`#rm_characters_block [grid="${charId}"]`).removeClass('flash animated');
-        }, 5000);
-    }
+            try {
+                if (element !== undefined || element !== null) {
+                    $(element).addClass('flash animated');
+                    setTimeout(function () {
+                        $(element).removeClass('flash animated');
+                    }, 5000);
+                } else { console.log('didnt find the element'); }
+            } catch (e) {
+                console.error(e);
+            }
+        }
 
+        if (type === 'group_create') {
+            //for groups, ${charId} = data.id from group-chats.js createGroup()
+            const element = $(`#rm_characters_block [grid="${charId}"]`).get(0);
+            element.scrollIntoView({ behavior: 'smooth', block: 'start' });
+            try {
+                if (element !== undefined || element !== null) {
+                    $(element).addClass('flash animated');
+                    setTimeout(function () {
+                        $(element).removeClass('flash animated');
+                    }, 5000);
+                } else { console.log('didnt find the element'); }
+            } catch (e) {
+                console.error(e);
+            }
+        }
+    }, 100);
     setRightTabSelectedClass();
 
     if (previousCharId) {
@@ -5106,6 +5119,12 @@ function importCharacter(file) {
 $(document).ready(function () {
     //////////INPUT BAR FOCUS-KEEPING LOGIC/////////////
 
+    setTimeout(function () {
+        $("#groupControlsToggle").trigger('click');
+        $("#groupCurrentMemberListToggle .inline-drawer-icon").trigger('click');
+    }, 200);
+
+
     $("#rm_print_characters_block").on('scroll',
         debounce(updateVisibleDivs, 5));
 
diff --git a/public/scripts/group-chats.js b/public/scripts/group-chats.js
index a10bd608a..8eb58706f 100644
--- a/public/scripts/group-chats.js
+++ b/public/scripts/group-chats.js
@@ -972,6 +972,9 @@ function select_group_chats(groupId, skipAnimation) {
         $("#rm_group_scenario").show();
     } else {
         $("#rm_group_submit").show();
+        if ($("#groupAddMemberListToggle .inline-drawer-content").css('display') !== 'block') {
+            $("#groupAddMemberListToggle").trigger('click');
+        }
         $("#rm_group_delete").hide();
         $("#rm_group_scenario").hide();
     }