From a208623621c1de5d709f504dafb7b398289f8235 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Wed, 19 Jul 2023 22:31:47 +0900 Subject: [PATCH] [feat] added license --- src/lib/Others/AlertComp.svelte | 2 +- src/lib/SideBars/CharConfig.svelte | 28 ++++++++++++++++++++-------- src/lib/UI/GUI/Button.svelte | 2 +- src/lib/UI/Realm/RealmUpload.svelte | 12 ++++++++---- src/ts/characterCards.ts | 11 +++++++---- src/ts/storage/database.ts | 1 + 6 files changed, 38 insertions(+), 18 deletions(-) diff --git a/src/lib/Others/AlertComp.svelte b/src/lib/Others/AlertComp.svelte index 9f3cc408..ed78f202 100644 --- a/src/lib/Others/AlertComp.svelte +++ b/src/lib/Others/AlertComp.svelte @@ -107,7 +107,7 @@ }}>{n} {/each} {:else if $alertStore.type === 'error' || $alertStore.type === 'normal' || $alertStore.type === 'markdown'} - - + {#if currentChar.data.license !== 'CC BY-NC-SA 4.0' + && currentChar.data.license !== 'CC BY-SA 4.0' + && currentChar.data.license !== 'CC BY-ND 4.0' + && currentChar.data.license !== 'CC BY-NC-ND 4.0' + } + + {/if} + + {#if currentChar.data.license !== 'CC BY-NC-SA 4.0' + && currentChar.data.license !== 'CC BY-SA 4.0' + } + + {/if} + {#if openHubUpload} - {openHubUpload=false}}/> + {openHubUpload=false}}/> {/if} {:else} {#if currentChar.data.chats[currentChar.data.chatPage].supaMemoryData && currentChar.data.chats[currentChar.data.chatPage].supaMemoryData.length > 4} diff --git a/src/lib/UI/GUI/Button.svelte b/src/lib/UI/GUI/Button.svelte index 7cd89290..92efc544 100644 --- a/src/lib/UI/GUI/Button.svelte +++ b/src/lib/UI/GUI/Button.svelte @@ -1,4 +1,4 @@ - @@ -59,7 +63,8 @@ shareRisuHub(char, { privateMode: privateMode, nsfw: nsfwMode, - tag: tags + tag: tags, + license: license }) close() } @@ -80,9 +85,8 @@ import TextAreaInput from "../GUI/TextAreaInput.svelte"; import Button from "../GUI/Button.svelte"; import SelectInput from "../GUI/SelectInput.svelte"; - import { CCLicenseData } from "src/ts/copyright/license"; - import { key } from "localforage"; - import OptionInput from "../GUI/OptionInput.svelte"; + import { CCLicenseData } from "src/ts/copyright/license"; + import OptionInput from "../GUI/OptionInput.svelte"; export let close = () => {} export let char:character let tags="" diff --git a/src/ts/characterCards.ts b/src/ts/characterCards.ts index 4503c2a0..c8fb79dc 100644 --- a/src/ts/characterCards.ts +++ b/src/ts/characterCards.ts @@ -451,7 +451,8 @@ async function createBaseV2(char:character) { utilityBot: char.utilityBot, sdData: char.sdData, additionalAssets: char.additionalAssets, - backgroundHTML: char.backgroundHTML + backgroundHTML: char.backgroundHTML, + license: char.license } } } @@ -527,9 +528,10 @@ export async function shareRisuHub(char:character, arg:{ nsfw: boolean, privateMode:boolean tag:string + license: string }) { char = cloneDeep(char) - + char.license = arg.license let tagList = arg.tag.split(',') if(arg.nsfw){ @@ -584,7 +586,7 @@ export async function shareRisuHub(char:character, arg:{ card: card, img: Buffer.from(img).toString('base64'), resources: resources, - token: get(DataBase)?.account?.token + token: get(DataBase)?.account?.token, }) }) @@ -709,7 +711,8 @@ type CharacterCardV2 = { utilityBot?: boolean, sdData?:[string,string][], additionalAssets?:[string,string,string][], - backgroundHTML?:string + backgroundHTML?:string, + license?:string } } } diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts index 89d63618..55100bfd 100644 --- a/src/ts/storage/database.ts +++ b/src/ts/storage/database.ts @@ -364,6 +364,7 @@ export interface character{ backgroundHTML?:string reloadKeys?:number backgroundCSS?:string + license?:string }