refac
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { WEBUI_API_BASE_URL, WEBUI_BASE_URL } from '$lib/constants';
|
import { WEBUI_API_BASE_URL, WEBUI_BASE_URL } from '$lib/constants';
|
||||||
import { marked } from 'marked';
|
import { marked } from 'marked';
|
||||||
|
import DOMPurify from 'dompurify';
|
||||||
|
|
||||||
import { config, user, models as _models, temporaryChatEnabled } from '$lib/stores';
|
import { config, user, models as _models, temporaryChatEnabled } from '$lib/stores';
|
||||||
import { onMount, getContext } from 'svelte';
|
import { onMount, getContext } from 'svelte';
|
||||||
@@ -96,11 +97,11 @@
|
|||||||
<div
|
<div
|
||||||
class="mt-0.5 text-base font-normal text-gray-500 dark:text-gray-400 line-clamp-3 markdown"
|
class="mt-0.5 text-base font-normal text-gray-500 dark:text-gray-400 line-clamp-3 markdown"
|
||||||
>
|
>
|
||||||
{@html marked.parse(
|
{@html DOMPurify.sanitize(marked.parse(
|
||||||
sanitizeResponseContent(
|
sanitizeResponseContent(
|
||||||
models[selectedModelIdx]?.info?.meta?.description
|
models[selectedModelIdx]?.info?.meta?.description
|
||||||
).replaceAll('\n', '<br>')
|
).replaceAll('\n', '<br>')
|
||||||
)}
|
))}
|
||||||
</div>
|
</div>
|
||||||
{#if models[selectedModelIdx]?.info?.meta?.user}
|
{#if models[selectedModelIdx]?.info?.meta?.user}
|
||||||
<div class="mt-0.5 text-sm font-normal text-gray-400 dark:text-gray-500">
|
<div class="mt-0.5 text-sm font-normal text-gray-400 dark:text-gray-500">
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { toast } from 'svelte-sonner';
|
import { toast } from 'svelte-sonner';
|
||||||
import { marked } from 'marked';
|
import { marked } from 'marked';
|
||||||
|
import DOMPurify from 'dompurify';
|
||||||
|
|
||||||
import { onMount, getContext, tick, createEventDispatcher } from 'svelte';
|
import { onMount, getContext, tick, createEventDispatcher } from 'svelte';
|
||||||
import { blur, fade } from 'svelte/transition';
|
import { blur, fade } from 'svelte/transition';
|
||||||
@@ -174,11 +175,11 @@
|
|||||||
<div
|
<div
|
||||||
class="mt-0.5 px-2 text-sm font-normal text-gray-500 dark:text-gray-400 line-clamp-2 max-w-xl markdown"
|
class="mt-0.5 px-2 text-sm font-normal text-gray-500 dark:text-gray-400 line-clamp-2 max-w-xl markdown"
|
||||||
>
|
>
|
||||||
{@html marked.parse(
|
{@html DOMPurify.sanitize(marked.parse(
|
||||||
sanitizeResponseContent(
|
sanitizeResponseContent(
|
||||||
models[selectedModelIdx]?.info?.meta?.description ?? ''
|
models[selectedModelIdx]?.info?.meta?.description ?? ''
|
||||||
).replaceAll('\n', '<br>')
|
).replaceAll('\n', '<br>')
|
||||||
)}
|
))}
|
||||||
</div>
|
</div>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
|
|
||||||
|
|||||||
@@ -41,11 +41,9 @@
|
|||||||
style="white-space: pre-wrap;"
|
style="white-space: pre-wrap;"
|
||||||
>
|
>
|
||||||
{#if ($config?.ui?.pending_user_overlay_content ?? '').trim() !== ''}
|
{#if ($config?.ui?.pending_user_overlay_content ?? '').trim() !== ''}
|
||||||
{@html marked.parse(
|
{@html DOMPurify.sanitize(marked.parse(
|
||||||
DOMPurify.sanitize(
|
($config?.ui?.pending_user_overlay_content ?? '').replace(/\n/g, '<br>')
|
||||||
($config?.ui?.pending_user_overlay_content ?? '').replace(/\n/g, '<br>')
|
))}
|
||||||
)
|
|
||||||
)}
|
|
||||||
{:else}
|
{:else}
|
||||||
{$i18n.t('Your account status is currently pending activation.')}{'\n'}{$i18n.t(
|
{$i18n.t('Your account status is currently pending activation.')}{'\n'}{$i18n.t(
|
||||||
'To access the WebUI, please reach out to the administrator. Admins can manage user statuses from the Admin Panel.'
|
'To access the WebUI, please reach out to the administrator. Admins can manage user statuses from the Admin Panel.'
|
||||||
|
|||||||
Reference in New Issue
Block a user