From 9af38ced76cb1727119c038046f554b8b6494ba2 Mon Sep 17 00:00:00 2001
From: bangonicdd <157843588+bangonicdd2@users.noreply.github.com>
Date: Sat, 19 Apr 2025 12:01:53 +0900
Subject: [PATCH 1/2] feat: add persona sort

---
 src/lib/Setting/Pages/PersonaSettings.svelte | 54 +++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/lib/Setting/Pages/PersonaSettings.svelte b/src/lib/Setting/Pages/PersonaSettings.svelte
index f6824319..f533ca2a 100644
--- a/src/lib/Setting/Pages/PersonaSettings.svelte
+++ b/src/lib/Setting/Pages/PersonaSettings.svelte
@@ -8,16 +8,65 @@
     import { alertConfirm, alertSelect } from "src/ts/alert";
     import { getCharImage } from "src/ts/characters";
     import { changeUserPersona, exportUserPersona, importUserPersona, saveUserPersona, selectUserImg } from "src/ts/persona";
+    import Sortable from 'sortablejs/modular/sortable.core.esm.js';
+    import { onDestroy, onMount } from "svelte";
+    import { sleep, sortableOptions } from "src/ts/util";
     import { setDatabase } from "src/ts/storage/database.svelte";
     import { DBState } from 'src/ts/stores.svelte';
     import { get } from "svelte/store";
 
+    let stb: Sortable = null
+    let ele: HTMLDivElement = $state()
+    let sorted = $state(0)
+    const createStb = () => {
+        stb = Sortable.create(ele, {
+            onStart: async () => {
+                saveUserPersona()
+            },
+            onEnd: async () => {
+                let idx:number[] = []
+                ele.querySelectorAll('[data-risu-idx]').forEach((e, i) => {
+                    idx.push(parseInt(e.getAttribute('data-risu-idx')))
+                })
+                let newValue:{
+                    personaPrompt:string
+                    name:string
+                    icon:string
+                    largePortrait?:boolean
+                    id?:string
+                }[] = []
+                idx.forEach((i) => {
+                    newValue.push(DBState.db.personas[i])
+                })
+                DBState.db.personas = newValue
+                changeUserPersona(0, 'noSave')
+                try {
+                    stb.destroy()
+                } catch (error) {}
+                sorted += 1
+                await sleep(1)
+                createStb()
+            },
+            ...sortableOptions
+        })
+    }
+
+    onMount(createStb)
+
+    onDestroy(() => {
+        if(stb){
+            try {
+                stb.destroy()
+            } catch (error) {}
+        }
+    })
 </script>
 <h2 class="mb-2 text-2xl font-bold mt-2">{language.persona}</h2>
 
-<div class="p-4 rounded-md border-darkborderc border mb-2 flex-wrap flex gap-2">
+{#key sorted}
+<div class="p-4 rounded-md border-darkborderc border mb-2 flex-wrap flex gap-2" bind:this={ele}>
     {#each DBState.db.personas as persona, i}
-        <button onclick={() => {
+        <button data-risu-idx={i} onclick={() => {
             changeUserPersona(i)
         }}>
             {#if persona.icon === ''}
@@ -58,6 +107,7 @@
         </BaseRoundedButton>
     </div>
 </div>
+{/key}
 
 <div class="flex w-full items-starts rounded-md border-darkborderc border p-4 max-w-full flex-wrap">
     <div class="flex flex-col mt-4 mr-4">

From a7aebab65cdcc31560da4f1e17ff104bf879204c Mon Sep 17 00:00:00 2001
From: bangonicdd <157843588+bangonicdd2@users.noreply.github.com>
Date: Sat, 19 Apr 2025 15:34:52 +0900
Subject: [PATCH 2/2] fix: preserve selected persona after sorting

---
 src/lib/Setting/Pages/PersonaSettings.svelte | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/lib/Setting/Pages/PersonaSettings.svelte b/src/lib/Setting/Pages/PersonaSettings.svelte
index f533ca2a..6e2e70c6 100644
--- a/src/lib/Setting/Pages/PersonaSettings.svelte
+++ b/src/lib/Setting/Pages/PersonaSettings.svelte
@@ -14,13 +14,17 @@
     import { setDatabase } from "src/ts/storage/database.svelte";
     import { DBState } from 'src/ts/stores.svelte';
     import { get } from "svelte/store";
+    import { v4 } from "uuid"
 
     let stb: Sortable = null
     let ele: HTMLDivElement = $state()
     let sorted = $state(0)
+    let selectedId:string = null
     const createStb = () => {
         stb = Sortable.create(ele, {
             onStart: async () => {
+                DBState.db.personas[DBState.db.selectedPersona].id ??= v4()
+                selectedId = DBState.db.personas[DBState.db.selectedPersona].id
                 saveUserPersona()
             },
             onEnd: async () => {
@@ -39,7 +43,8 @@
                     newValue.push(DBState.db.personas[i])
                 })
                 DBState.db.personas = newValue
-                changeUserPersona(0, 'noSave')
+                const selectedPersona = DBState.db.personas.findIndex((e) => e.id === selectedId)
+                changeUserPersona(selectedPersona !== -1 ? selectedPersona : 0, 'noSave')
                 try {
                     stb.destroy()
                 } catch (error) {}