From 80967adc907a5c6f71a369ac573943d196c127de Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Fri, 26 May 2023 00:15:34 +0900
Subject: [PATCH] [fix] folder not moving

---
 src/lib/SideBars/Sidebar.svelte | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/lib/SideBars/Sidebar.svelte b/src/lib/SideBars/Sidebar.svelte
index eaf99e65..d5ec538d 100644
--- a/src/lib/SideBars/Sidebar.svelte
+++ b/src/lib/SideBars/Sidebar.svelte
@@ -35,7 +35,7 @@
   import { language } from "../../lang";
   import Botpreset from "../Setting/botpreset.svelte";
   import { onDestroy } from "svelte";
-  import { isEqual } from "lodash";
+  import { cloneDeep, isEqual } from "lodash";
   import SidebarAvatar from "./SidebarAvatar.svelte";
   import BaseRoundedButton from "../UI/BaseRoundedButton.svelte";
   import { get } from "svelte/store";
@@ -138,6 +138,7 @@
     let mainFolderIndex = mainIndex.folder ? getFolderIndex(mainIndex.folder) : null
     let targetFolderIndex = targetIndex.folder ? getFolderIndex(targetIndex.folder) : null
     let mainFolderId = mainIndex.folder ? (db.characterOrder[mainFolderIndex] as folder).id : ''
+    let movingFolder:folder|false = false
     let mainId = ''
     if(mainIndex.folder){
       mainId = (db.characterOrder[mainFolderIndex] as folder).data[mainIndex.index]
@@ -145,15 +146,24 @@
     else{
       const da = db.characterOrder[mainIndex.index]
       if(typeof(da) !== 'string'){
-        return
+        mainId = da.id
+        movingFolder = cloneDeep(da)
+        if(targetIndex.folder){
+          return
+        }
+      }
+      else{
+        mainId = da
       }
-      mainId = da
     }
     if(targetIndex.folder){
         const folder = db.characterOrder[targetFolderIndex] as folder
         folder.data.splice(targetIndex.index,0,mainId)
         db.characterOrder[targetFolderIndex] = folder
     }
+    else if(movingFolder){
+        db.characterOrder.splice(targetIndex.index,0,movingFolder)
+    }
     else{
         db.characterOrder.splice(targetIndex.index,0,mainId)
     }
@@ -180,6 +190,16 @@
         console.log('folder not found')
       }
     }
+    else if(movingFolder){
+      let idList:string[] = []
+      for(const ord of db.characterOrder){
+        idList.push(typeof(ord) === 'string' ? ord : ord.id)
+      }
+      const ind = mainIndex.index > targetIndex.index ? idList.lastIndexOf(mainId) : idList.indexOf(mainId) 
+      if(ind !== -1){
+        db.characterOrder.splice(ind, 1)
+      }
+    }
     else{
       const ind = mainIndex.index > targetIndex.index ? db.characterOrder.lastIndexOf(mainId) : db.characterOrder.indexOf(mainId) 
       if(ind !== -1){