Merge branch 'kwaroran:main' into main

src/ts/storage/database.ts

@@ -14,7 +14,7 @@ import type { OobaChatCompletionRequestParams } from '../model/ooba';
 
 export const DataBase = writable({} as any as Database)
 export const loadedStore = writable(false)
-export let appVer = "114.2.2"
+export let appVer = "114.3.0"
 export let webAppSubVer = ''
 
 export function setDatabase(data:Database){

src/ts/storage/globalApi.ts

@@ -7,7 +7,7 @@ import { get } from "svelte/store";
 import {open} from '@tauri-apps/api/shell'
 import { DataBase, loadedStore, setDatabase, type Database, defaultSdDataFunc } from "./database";
 import { appWindow } from "@tauri-apps/api/window";
-import { checkUpdate } from "../update";
+import { checkRisuUpdate } from "../update";
 import { botMakerMode, selectedCharID } from "../stores";
 import { Body, ResponseType, fetch as TauriFetch } from "@tauri-apps/api/http";
 import { loadPlugins } from "../plugins/plugins";
@@ -419,7 +419,7 @@ export async function loadData() {
                         throw "Your save file is corrupted"
                     }
                 }
-                await checkUpdate()
+                await checkRisuUpdate()
                 await changeFullscreen()
     
             }

src/ts/update.ts

@@ -1,49 +1,30 @@
-import { fetch } from "@tauri-apps/api/http";
-import { DataBase, appVer, setDatabase } from "./storage/database";
-import { alertConfirm, alertError, alertMd } from "./alert";
+import { alertConfirm, alertWait } from "./alert";
 import { language } from "../lang";
-import { get } from "svelte/store";
-import {open} from '@tauri-apps/api/shell'
 import { Capacitor } from "@capacitor/core";
+import {
+    checkUpdate,
+    installUpdate,
+} from '@tauri-apps/api/updater'
+import { relaunch } from '@tauri-apps/api/process'
+
+export async function checkRisuUpdate(){
+
+    if(Capacitor.isNativePlatform()){
+        return
+    }
 
-export async function checkUpdate(){
     try {
-
-        if(Capacitor.isNativePlatform()){
-            return
-        }
-
-         let db = get(DataBase)
-        const da = await fetch('https://raw.githubusercontent.com/kwaroran/RisuAI-release/main/version.json')
-        //@ts-ignore
-        const v:string = da.data.version
-        if(!v){
-            return
-        }
-        if(v === db.lastup){
-            return
-        }
-        const nextVer = versionStringToNumber(v)
-        if(isNaN(nextVer) || (!nextVer)){
-            return
-        }
-        const appVerNum = versionStringToNumber(appVer)
-
-        if(appVerNum < nextVer){
+        const checked = await checkUpdate()     
+        if(checked.shouldUpdate){
             const conf = await alertConfirm(language.newVersion)
             if(conf){
-                open("https://risuai.net/?page=download")
-            }
-            else{
-                db = get(DataBase)
-                db.lastup = v
-                setDatabase(db)
+                alertWait(`Updating to ${checked.manifest.version}...`)
+                await installUpdate()
+                await relaunch()
             }
         }
-        
     } catch (error) {
-        alertError(error)
-        return
+        
     }
 }