Fix convert to persona with unusual names (#4319) * Fix convert to persona with unusual names * Fix picking new persona on current persona deletion * Prefer actual path on page reload

7b67769c926cf2e92cb8cbe19c22b9a678834b30

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

Signed

public/script.js+2 -6 Viewed

         const formData = new FormData(/** @type {HTMLFormElement} */($('#form_create').get(0)));
         await fetch(getThumbnailUrl('avatar', formData.get('avatar_url').toString()), {
             method: 'GET',
-            cache: 'no-cache',
+            cache: 'reload',
-            headers: {
-                'pragma': 'no-cache',
-                'cache-control': 'no-cache',
-            },
         });
         const messages = $('.mes').toArray();

                             data.set(file, characters[this_chid].avatar);
                             await processDroppedFiles([file], data);
                             await openCharacterChat(chatFile);
-                            await fetch(getThumbnailUrl('avatar', characters[this_chid].avatar), { cache: 'no-cache' });
+                            await fetch(getThumbnailUrl('avatar', characters[this_chid].avatar), { cache: 'reload' });
                         } catch {
                             toastr.error('Failed to replace the character card.', 'Something went wrong');
+                        }

public/scripts/personas.js+25 -11 Viewed

         formData.append('overwrite_name', name);
+    }
-    await fetch('/api/avatars/upload', {
+    const response = await fetch('/api/avatars/upload', {
         method: 'POST',
         headers: getRequestHeaders({ omitContentType: true }),
         cache: 'no-cache',
         body: formData,
     });
-    await getUserAvatars(true, name);
+    if (!response.ok) {
+        throw new Error(`Failed to upload avatar: ${response.statusText}`);
+    }
+    // Get the actual path from the response
+    const data = await response.json();
+    await getUserAvatars(true, data?.path || name);
+}
 async function changeUserAvatar(e) {

     const response = await fetch(url, {
         method: 'POST',
-        headers: getRequestHeaders({ omitContentType:true }),
+        headers: getRequestHeaders({ omitContentType: true }),
         cache: 'no-cache',
         body: formData,
     });

     if (response.ok) {
         const data = await response.json();
+        const overwriteName = formData.get('overwrite_name');
+        const dataPath = data?.path;
         // If the user uploaded a new avatar, we want to make sure it's not cached
-        const name = formData.get('overwrite_name');
+        if (overwriteName && dataPath) {
-        if (name) {
+            await fetch(getUserAvatar(String(dataPath)), { cache: 'reload' });
-            await fetch(getUserAvatar(String(name)), { cache: 'no-cache' });
+            await fetch(getThumbnailUrl('persona', String(dataPath)), { cache: 'reload' });
-            await fetch(getThumbnailUrl('persona', String(name)), { cache: 'no-cache' });
             reloadUserAvatar(true);
+        }
-        if (!name && data.path) {
+        if (!overwriteName && dataPath) {
             await getUserAvatars();
-            await delay(500);
+            await delay(1);
-            await createPersona(data.path);
+            await createPersona(dataPath);
+        }
-        await getUserAvatars(true, name || data.path);
+        await getUserAvatars(true, dataPath || overwriteName);
+    }
     // Will allow to select the same file twice in a row

     // Cache persona list to check if they exist
     const userAvatars = await getUserAvatars(doRender);
+    // Check if the user avatar is set and exists in the list of user avatars
+    if (userAvatars.length && !userAvatars.includes(user_avatar)) {
+        console.log(`User avatar ${user_avatar} not found in user avatars list, pick the first available one`);
+        setUserAvatar(userAvatars[0], { toastPersonaNameChange: false, navigateToCurrent: true });
+    }
     // Define a persona for this chat
     let chatPersona = '';

src/endpoints/avatars.js+1 -1 Viewed

             cacheBuster.bust(request, response);
+        }
-        const filename = request.body.overwrite_name || `${Date.now()}.png`;
+        const filename = sanitize(request.body.overwrite_name || `${Date.now()}.png`);
         const pathToNewFile = path.join(request.user.directories.avatars, filename);
         writeFileAtomicSync(pathToNewFile, image);
         fs.unlinkSync(pathToUpload);