From 059647b286f5f298fb66bc3495cb393bcaa8a1a6 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 19 Aug 2023 03:13:40 +0300
Subject: [PATCH] Dynamically update group avatars

---
 public/script.js              |  5 ++++-
 public/scripts/group-chats.js | 18 +++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/public/script.js b/public/script.js
index fa7a46a96..97b22af2c 100644
--- a/public/script.js
+++ b/public/script.js
@@ -2429,11 +2429,14 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
 
         const memberIds = enabledMembers
             .map((member) => characterIndexMap.get(member))
-            .filter((index) => index !== undefined);
+            .filter((index) => index !== undefined && index !== null);
 
         if (memberIds.length > 0) {
             setCharacterId(memberIds[0]);
             setCharacterName('');
+        } else {
+            console.log('No enabled members found');
+            return;
         }
     }
 
diff --git a/public/scripts/group-chats.js b/public/scripts/group-chats.js
index 898388e5f..9c9c73e4e 100644
--- a/public/scripts/group-chats.js
+++ b/public/scripts/group-chats.js
@@ -61,6 +61,7 @@ import {
     getCurrentChatId,
     setScenarioOverride,
     getCropPopup,
+    system_avatar,
 } from "../script.js";
 import { appendTagToList, createTagMapFromList, getTagsList, applyTagsOnCharacterSelect, tag_map } from './tags.js';
 import { FilterHelper } from './filters.js';
@@ -354,12 +355,11 @@ export function getGroupBlock(group) {
 }
 
 function updateGroupAvatar(group) {
-    $("#rm_print_characters_block .group_select").each(function () {
+    $("#group_avatar_preview").empty().append(getGroupAvatar(group));
+
+    $(".group_select").each(function () {
         if ($(this).data("id") == group.id) {
-            const avatar = getGroupAvatar(group);
-            if (avatar) {
-                $(this).find(".avatar").replaceWith(avatar);
-            }
+                $(this).find(".avatar").replaceWith(getGroupAvatar(group));
         }
     });
 }
@@ -401,7 +401,7 @@ function getGroupAvatar(group) {
 
     // default avatar
     const groupAvatar = $("#group_avatars_template .collage_1").clone();
-    groupAvatar.find(".img_1").attr("src", group.avatar_url);
+    groupAvatar.find(".img_1").attr("src", group.avatar_url || system_avatar);
     return groupAvatar;
 }
 
@@ -877,8 +877,8 @@ async function modifyGroupMember(chat_id, groupMember, isDelete) {
 
 async function reorderGroupMember(chat_id, groupMember, direction) {
     const id = groupMember.data("id");
-    const group = groups.find((x) => x.id == chat_id);
-    const memberArray = group?.members ?? newGroupMembers;
+    const thisGroup = groups.find((x) => x.id == chat_id);
+    const memberArray = thisGroup?.members ?? newGroupMembers;
 
     const indexOf = memberArray.indexOf(id);
     if (direction == 'down') {
@@ -901,7 +901,7 @@ async function reorderGroupMember(chat_id, groupMember, direction) {
     // Existing groups need to modify members list
     if (openGroupId) {
         await editGroup(chat_id, false, false);
-        updateGroupAvatar(group);
+        updateGroupAvatar(thisGroup);
     }
 }