From 8b3bbf0a92683e2f5ef4eef2827d516704074c0a Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Fri, 26 May 2023 00:01:41 +0900
Subject: [PATCH 1/5] [fix] text input leaves gap

---
 src/lib/ChatScreens/DefaultChatScreen.svelte | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/lib/ChatScreens/DefaultChatScreen.svelte b/src/lib/ChatScreens/DefaultChatScreen.svelte
index e72c7a07..0801af79 100644
--- a/src/lib/ChatScreens/DefaultChatScreen.svelte
+++ b/src/lib/ChatScreens/DefaultChatScreen.svelte
@@ -199,8 +199,8 @@
                 loadPages += 30
             }
         }}>
-            <div class="flex items-end mt-2 mb-2">
-                <textarea class="text-neutral-200 p-2 bg-transparent input-text text-xl flex-grow ml-4 mr-2 border-gray-700 resize-none focus:bg-selected maxw overflow-y-hidden overflow-x-hidden max-w-full"
+            <div class="flex items-end mt-2 mb-2 w-full">
+                <textarea class="text-neutral-200 p-2 min-w-0 bg-transparent input-text text-xl flex-grow ml-4 mr-2 border-gray-700 resize-none focus:bg-selected overflow-y-hidden overflow-x-hidden max-w-full"
                     bind:value={messageInput}
                     bind:this={inputEle}
                     on:keydown={(e) => {
@@ -374,9 +374,6 @@
     {/if}
 </div>
 <style>
-    .maxw{
-        max-width: calc(100vw - 10rem);
-    }
     .loadmove {
         animation: spin 1s linear infinite;
         border-radius: 50%;

From 3082b5d223edcd16d9970f7928dfb7038406a255 Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Fri, 26 May 2023 00:02:00 +0900
Subject: [PATCH 2/5] [fix] no force apply

---
 src/main.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main.ts b/src/main.ts
index a58426f2..53d6097a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -11,7 +11,6 @@ import {scrollBehaviourDragImageTranslateOverride} from "mobile-drag-drop/scroll
 dragDropPolyfil({
   // use this to make use of the scroll behaviour
   dragImageTranslateOverride: scrollBehaviourDragImageTranslateOverride,
-  forceApply: navigator.maxTouchPoints > 0,
   holdToDrag: 400
 });
 

From 0badf24b226ad7582c17572256f396e9443c8ed3 Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Fri, 26 May 2023 00:02:39 +0900
Subject: [PATCH 3/5] [fix] global scripts not working

---
 src/ts/process/scripts.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ts/process/scripts.ts b/src/ts/process/scripts.ts
index 0e903c17..0a82f2e0 100644
--- a/src/ts/process/scripts.ts
+++ b/src/ts/process/scripts.ts
@@ -14,7 +14,7 @@ export function processScriptFull(char:character, data:string, mode:ScriptMode){
     let db = get(DataBase)
     let emoChanged = false
     const scripts = char.customscript.concat(db.globalscript ?? [])
-    for (const script of char.customscript){
+    for (const script of scripts){
         if(script.type === mode){
             const reg = new RegExp(script.in,'g')
             data = data.replace(reg, (v) => {

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 4/5] [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){

From 92f5d9b9449e024a561c4d57829798eb4e5123c9 Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Fri, 26 May 2023 00:16:37 +0900
Subject: [PATCH 5/5] bump version to 1.17.2

---
 src-tauri/tauri.conf.json | 2 +-
 src/ts/database.ts        | 2 +-
 version.json              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 31535ba1..eb261c1f 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "RisuAI",
-    "version": "1.17.1"
+    "version": "1.17.2"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/ts/database.ts b/src/ts/database.ts
index d754a3ab..01d6e091 100644
--- a/src/ts/database.ts
+++ b/src/ts/database.ts
@@ -7,7 +7,7 @@ import { cloneDeep } from 'lodash';
 
 export const DataBase = writable({} as any as Database)
 export const loadedStore = writable(false)
-export let appVer = '1.17.1'
+export let appVer = '1.17.2'
 
 
 export function setDatabase(data:Database){
diff --git a/version.json b/version.json
index a33e810d..ea154bb7 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version":"1.17.1"}
\ No newline at end of file
+{"version":"1.17.2"}
\ No newline at end of file