Rework realm and several bug fixes
This commit is contained in:
@@ -31,7 +31,7 @@
|
||||
search: '',
|
||||
page: 0,
|
||||
nsfw: false,
|
||||
sort: ''
|
||||
sort: 'recommended'
|
||||
}) then charas}
|
||||
{#if charas.length > 0}
|
||||
{@html hubAdditionalHTML}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
let charas:hubType[] = $state([])
|
||||
|
||||
let page = $state(0)
|
||||
let sort = $state('')
|
||||
let sort = $state('recommended')
|
||||
|
||||
let search = $state('')
|
||||
let menuOpen = $state(false)
|
||||
@@ -27,6 +27,16 @@
|
||||
})
|
||||
}
|
||||
|
||||
function changeSort(type:string) {
|
||||
if(sort === type){
|
||||
sort = 'recommended'
|
||||
}else{
|
||||
sort = type
|
||||
}
|
||||
page = 0
|
||||
return getHub()
|
||||
}
|
||||
|
||||
getHub()
|
||||
|
||||
|
||||
@@ -36,6 +46,9 @@
|
||||
<input bind:value={search} class="peer focus:border-textcolor transition-colors outline-none text-textcolor p-2 min-w-0 border border-r-0 bg-transparent rounded-md rounded-r-none input-text text-xl flex-grow ml-4 border-darkborderc resize-none overflow-y-hidden overflow-x-hidden max-w-full">
|
||||
<button
|
||||
onclick={() => {
|
||||
if(sort === 'random' || sort === 'recommended'){
|
||||
sort = ''
|
||||
}
|
||||
page = 0
|
||||
getHub()
|
||||
}}
|
||||
@@ -81,6 +94,7 @@
|
||||
getHub()
|
||||
}}>
|
||||
{
|
||||
sort === 'recommended' ? language.recommended :
|
||||
sort === '' ? language.recent :
|
||||
sort === 'trending' ? language.trending :
|
||||
sort === 'downloads' ? language.downloads :
|
||||
@@ -99,26 +113,22 @@
|
||||
</button>
|
||||
<div class="ml-2 mr-2 h-full border-r border-r-selected"></div>
|
||||
<button class="bg-darkbg p-2 rounded-lg ml-2 flex justify-center items-center hover:bg-selected transition-shadow" class:ring={sort === ''} onclick={() => {
|
||||
sort = ''
|
||||
getHub()
|
||||
changeSort('')
|
||||
}}>
|
||||
{language.recent}
|
||||
</button>
|
||||
<button class="bg-darkbg p-2 rounded-lg ml-2 flex justify-center items-center hover:bg-selected transition-shadow" class:ring={sort === 'trending'} onclick={() => {
|
||||
sort = 'trending'
|
||||
getHub()
|
||||
changeSort('trending')
|
||||
}}>
|
||||
{language.trending}
|
||||
</button>
|
||||
<button class="bg-darkbg p-2 rounded-lg ml-2 flex justify-center items-center hover:bg-selected transition-shadow" class:ring={sort === 'downloads'} onclick={() => {
|
||||
sort = 'downloads'
|
||||
getHub()
|
||||
changeSort('downloads')
|
||||
}}>
|
||||
{language.downloads}
|
||||
</button>
|
||||
<button class="bg-darkbg p-2 rounded-lg ml-2 flex justify-center items-center hover:bg-selected transition-shadow min-w-0 max-w-full" class:ring={sort === 'random'} onclick={() => {
|
||||
sort = 'random'
|
||||
getHub()
|
||||
changeSort('random')
|
||||
}}>
|
||||
{language.random}
|
||||
</button>
|
||||
@@ -132,7 +142,7 @@
|
||||
{/each}
|
||||
{/key}
|
||||
</div>
|
||||
{#if sort !== 'random'}
|
||||
{#if sort !== 'random' && sort !== 'recommended'}
|
||||
<div class="w-full flex justify-center">
|
||||
<div class="flex">
|
||||
<button class="bg-darkbg h-14 w-14 min-w-14 rounded-lg flex justify-center items-center hover:ring transition-shadow" onclick={() => {
|
||||
|
||||
@@ -1141,7 +1141,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{
|
||||
pointer++
|
||||
}
|
||||
formated = formated.filter((v) => {
|
||||
return v.content !== ''
|
||||
return v.content !== '' || (v.multimodals && v.multimodals.length > 0)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -218,8 +218,13 @@ function reformater(formated:OpenAIChat[],modelInfo:LLMModel){
|
||||
|
||||
if(!modelInfo.flags.includes(LLMFlags.hasFullSystemPrompt)){
|
||||
if(modelInfo.flags.includes(LLMFlags.hasFirstSystemPrompt)){
|
||||
if(formated[0].role === 'system'){
|
||||
systemPrompt = formated[0]
|
||||
while(formated[0].role === 'system'){
|
||||
if(systemPrompt){
|
||||
systemPrompt.content += '\n\n' + formated[0].content
|
||||
}
|
||||
else{
|
||||
systemPrompt = formated[0]
|
||||
}
|
||||
formated = formated.slice(1)
|
||||
}
|
||||
}
|
||||
@@ -400,7 +405,7 @@ async function requestOpenAI(arg:RequestDataArgumentExtended):Promise<requestDat
|
||||
|
||||
if(db.newOAIHandle){
|
||||
formatedChat = formatedChat.filter(m => {
|
||||
return m.content !== ''
|
||||
return m.content !== '' || (m.multimodals && m.multimodals.length > 0)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -856,6 +856,7 @@ export interface Database{
|
||||
googleClaudeTokenizing: boolean
|
||||
presetChain: string
|
||||
legacyMediaFindings?:boolean
|
||||
geminiStream?:boolean
|
||||
}
|
||||
|
||||
interface SeparateParameters{
|
||||
|
||||
Reference in New Issue
Block a user