@@ -389,10 +359,10 @@
/>
-
-
+
+
)
- {user.name}
+ {user.name}
|
{user.email} |
@@ -414,8 +384,6 @@
{dayjs(user.created_at * 1000).format('LL')}
|
- {user.oauth_sub ?? ''} |
-
{#if $config.features.enable_admin_chat_access && user.role !== 'admin'}
@@ -508,11 +476,11 @@
> [!NOTE]
> # **Hey there! 👋**
>
-> It looks like you have over 50 users — that usually falls under organizational usage.
+> It looks like you have over 50 users, that usually falls under organizational usage.
>
-> Open WebUI is proudly open source and completely free, with no hidden limits — and we'd love to keep it that way. 🌱
+> Open WebUI is completely free to use as-is, with no restrictions or hidden limits, and we'd love to keep it that way. 🌱
>
-> By supporting the project through sponsorship or an enterprise license, you’re not only helping us stay independent, you’re also helping us ship new features faster, improve stability, and grow the project for the long haul. With an *enterprise license*, you also get additional perks like dedicated support, customization options, and more — all at a fraction of what it would cost to build and maintain internally.
+> By supporting the project through sponsorship or an enterprise license, you’re not only helping us stay independent, you’re also helping us ship new features faster, improve stability, and grow the project for the long haul. With an *enterprise license*, you also get additional perks like dedicated support, customization options, and more, all at a fraction of what it would cost to build and maintain internally.
>
> Your support helps us stay independent and continue building great tools for everyone. 💛
>
diff --git a/src/lib/components/admin/Users/UserList/EditUserModal.svelte b/src/lib/components/admin/Users/UserList/EditUserModal.svelte
index 51d9f0eb3b..a653e15da0 100644
--- a/src/lib/components/admin/Users/UserList/EditUserModal.svelte
+++ b/src/lib/components/admin/Users/UserList/EditUserModal.svelte
@@ -12,6 +12,7 @@
import localizedFormat from 'dayjs/plugin/localizedFormat';
import XMark from '$lib/components/icons/XMark.svelte';
import SensitiveInput from '$lib/components/common/SensitiveInput.svelte';
+ import UserProfileImage from '$lib/components/chat/Settings/Account/UserProfileImage.svelte';
const i18n = getContext('i18n');
const dispatch = createEventDispatcher();
@@ -83,110 +84,118 @@
submitHandler();
}}
>
-
-
- 
-
-
-
- {selectedUser.name}
-
-
- {$i18n.t('Created at')}
- {dayjs(selectedUser.created_at * 1000).format('LL')}
+
-
-
-
- {$i18n.t('Role')}
+
+
+
+ {selectedUser.name}
+
-
-
+
+ {$i18n.t('Created at')}
+ {dayjs(selectedUser.created_at * 1000).format('LL')}
+
-
- {#if userGroups}
-
- {$i18n.t('User Groups')}
+
+ {#if (userGroups ?? []).length > 0}
+
+ {$i18n.t('User Groups')}
- {#if userGroups.length}
-
- {:else}
- -
{/if}
-
- {/if}
-
- {$i18n.t('Email')}
+
+ {$i18n.t('Role')}
-
-
-
-
+
+
+
+
-
- {$i18n.t('Name')}
+
+ {$i18n.t('Name')}
-
-
-
-
+
+
+
+
-
- {$i18n.t('New Password')}
+
+ {$i18n.t('Email')}
-
+
+ {#if _user?.oauth_sub}
+
+ {$i18n.t('OAuth ID')}
+
+
+ {_user.oauth_sub ?? ''}
+
+
+ {/if}
+
+
+ {$i18n.t('New Password')}
+
+
+
+
+
diff --git a/src/lib/components/admin/Users/UserList/UserChatsModal.svelte b/src/lib/components/admin/Users/UserList/UserChatsModal.svelte
index fa95088933..480f7ccf56 100644
--- a/src/lib/components/admin/Users/UserList/UserChatsModal.svelte
+++ b/src/lib/components/admin/Users/UserList/UserChatsModal.svelte
@@ -43,6 +43,10 @@
let searchDebounceTimeout;
const searchHandler = async () => {
+ if (!show) {
+ return;
+ }
+
if (searchDebounceTimeout) {
clearTimeout(searchDebounceTimeout);
}
@@ -103,7 +107,9 @@
bind:query
bind:orderBy
bind:direction
- title={$i18n.t("{{user}}'s Chats", { user: user.name })}
+ title={$i18n.t("{{user}}'s Chats", {
+ user: user.name.length > 32 ? `${user.name.slice(0, 32)}...` : user.name
+ })}
emptyPlaceholder={$i18n.t('No chats found for this user.')}
shareUrl={true}
{chatList}
diff --git a/src/lib/components/channel/Channel.svelte b/src/lib/components/channel/Channel.svelte
index 57e66b6844..40ce02f3fe 100644
--- a/src/lib/components/channel/Channel.svelte
+++ b/src/lib/components/channel/Channel.svelte
@@ -14,17 +14,20 @@
import Drawer from '../common/Drawer.svelte';
import EllipsisVertical from '../icons/EllipsisVertical.svelte';
import Thread from './Thread.svelte';
+ import i18n from '$lib/i18n';
export let id = '';
let scrollEnd = true;
let messagesContainerElement = null;
+ let chatInputElement = null;
let top = false;
let channel = null;
let messages = null;
+ let replyToMessage = null;
let threadId = null;
let typingUsers = [];
@@ -140,20 +143,24 @@
return;
}
- const res = await sendMessage(localStorage.token, id, { content: content, data: data }).catch(
- (error) => {
- toast.error(`${error}`);
- return null;
- }
- );
+ const res = await sendMessage(localStorage.token, id, {
+ content: content,
+ data: data,
+ reply_to_id: replyToMessage?.id ?? null
+ }).catch((error) => {
+ toast.error(`${error}`);
+ return null;
+ });
if (res) {
messagesContainerElement.scrollTop = messagesContainerElement.scrollHeight;
}
+
+ replyToMessage = null;
};
const onChange = async () => {
- $socket?.emit('channel-events', {
+ $socket?.emit('events:channel', {
channel_id: id,
message_id: null,
data: {
@@ -173,7 +180,7 @@
chatId.set('');
}
- $socket?.on('channel-events', channelEventHandler);
+ $socket?.on('events:channel', channelEventHandler);
mediaQuery = window.matchMedia('(min-width: 1024px)');
@@ -190,7 +197,7 @@
});
onDestroy(() => {
- $socket?.off('channel-events', channelEventHandler);
+ $socket?.off('events:channel', channelEventHandler);
});
@@ -221,8 +228,14 @@
{#key id}
{
+ replyToMessage = message;
+ await tick();
+ chatInputElement?.focus();
+ }}
onThread={(id) => {
threadId = id;
}}
@@ -249,7 +262,15 @@
-
-
-
+
diff --git a/src/lib/components/channel/MessageInput.svelte b/src/lib/components/channel/MessageInput.svelte
index f9fbc32f6c..02323a5f20 100644
--- a/src/lib/components/channel/MessageInput.svelte
+++ b/src/lib/components/channel/MessageInput.svelte
@@ -23,21 +23,25 @@
import { getSessionUser } from '$lib/apis/auths';
+ import { uploadFile } from '$lib/apis/files';
+ import { WEBUI_API_BASE_URL } from '$lib/constants';
+
+ import { getSuggestionRenderer } from '../common/RichTextInput/suggestions';
+ import CommandSuggestionList from '../chat/MessageInput/CommandSuggestionList.svelte';
+
+ import InputMenu from './MessageInput/InputMenu.svelte';
import Tooltip from '../common/Tooltip.svelte';
import RichTextInput from '../common/RichTextInput.svelte';
import VoiceRecording from '../chat/MessageInput/VoiceRecording.svelte';
- import InputMenu from './MessageInput/InputMenu.svelte';
- import { uploadFile } from '$lib/apis/files';
- import { WEBUI_API_BASE_URL } from '$lib/constants';
import FileItem from '../common/FileItem.svelte';
import Image from '../common/Image.svelte';
import FilesOverlay from '../chat/MessageInput/FilesOverlay.svelte';
import InputVariablesModal from '../chat/MessageInput/InputVariablesModal.svelte';
- import { getSuggestionRenderer } from '../common/RichTextInput/suggestions';
- import CommandSuggestionList from '../chat/MessageInput/CommandSuggestionList.svelte';
import MentionList from './MessageInput/MentionList.svelte';
+ import Skeleton from '../chat/Messages/Skeleton.svelte';
+ import XMark from '../icons/XMark.svelte';
- export let placeholder = $i18n.t('Send a Message');
+ export let placeholder = $i18n.t('Type here...');
export let id = null;
export let chatInputElement;
@@ -52,9 +56,17 @@
export let scrollEnd = true;
export let scrollToBottom: Function = () => {};
+ export let disabled = false;
export let acceptFiles = true;
export let showFormattingToolbar = true;
+ export let userSuggestions = false;
+ export let channelSuggestions = false;
+
+ export let replyToMessage = null;
+
+ export let typingUsersClassName = 'from-white dark:from-gray-900';
+
let loaded = false;
let draggedOver = false;
@@ -223,12 +235,17 @@
const chatInput = document.getElementById('chat-input');
if (chatInput) {
- text = await textVariableHandler(text || '');
+ if (text !== '') {
+ text = await textVariableHandler(text || '');
+ }
chatInputElement?.setText(text);
chatInputElement?.focus();
- text = await inputVariableHandler(text);
+ if (text !== '') {
+ text = await inputVariableHandler(text);
+ }
+
await tick();
if (cb) await cb(text);
}
@@ -555,9 +572,24 @@
{
char: '@',
render: getSuggestionRenderer(MentionList, {
- i18n
+ i18n,
+ triggerChar: '@',
+ modelSuggestions: true,
+ userSuggestions
})
},
+ ...(channelSuggestions
+ ? [
+ {
+ char: '#',
+ render: getSuggestionRenderer(MentionList, {
+ i18n,
+ triggerChar: '#',
+ channelSuggestions
+ })
+ }
+ ]
+ : []),
{
char: '/',
render: getSuggestionRenderer(CommandSuggestionList, {
@@ -652,11 +684,7 @@
/>
-
+
@@ -690,22 +718,28 @@
{/if}
-
-
- {#if typingUsers.length > 0}
-
+ {#if typingUsers.length > 0}
+
+
+
+
+
{typingUsers.map((user) => user.name).join(', ')}
{$i18n.t('is typing...')}
- {/if}
+
-
+ {/if}
-
+
{#if recording}
+ {#if replyToMessage !== null}
+
+
+
+
+ {$i18n.t('Replying to {{NAME}}', {
+ NAME: replyToMessage?.meta?.model_name ?? replyToMessage.user.name
+ })}
+
+
+
+
+
+
+
+ {/if}
+
{#if files.length > 0}
{#each files as file, fileIdx}
@@ -802,7 +863,7 @@
{#key $settings?.richTextInput}
0 ||
- navigator.msMaxTouchPoints > 0
- ))}
+ !$mobile &&
+ !(
+ 'ontouchstart' in window ||
+ navigator.maxTouchPoints > 0 ||
+ navigator.msMaxTouchPoints > 0
+ )}
largeTextAsFile={$settings?.largeTextAsFile ?? false}
floatingMenuPlacement={'top-start'}
{suggestions}
@@ -858,11 +921,42 @@
if (e.key === 'Escape') {
console.info('Escape');
+ replyToMessage = null;
}
}}
on:paste={async (e) => {
e = e.detail.event;
- console.info(e);
+ console.log(e);
+
+ const clipboardData = e.clipboardData || window.clipboardData;
+
+ if (clipboardData && clipboardData.items) {
+ for (const item of clipboardData.items) {
+ if (item.type.indexOf('image') !== -1) {
+ const blob = item.getAsFile();
+ const reader = new FileReader();
+
+ reader.onload = function (e) {
+ files = [
+ ...files,
+ {
+ type: 'image',
+ url: `${e.target.result}`
+ }
+ ];
+ };
+
+ reader.readAsDataURL(blob);
+ } else if (item?.kind === 'file') {
+ const file = item.getAsFile();
+ if (file) {
+ const _files = [file];
+ await inputFilesHandler(_files);
+ e.preventDefault();
+ }
+ }
+ }
+ }
}}
/>
{/key}
@@ -880,6 +974,7 @@
}}
>
diff --git a/src/lib/components/channel/MessageInput/MentionList.svelte b/src/lib/components/channel/MessageInput/MentionList.svelte
index 9f6526852a..30ba8f7513 100644
--- a/src/lib/components/channel/MessageInput/MentionList.svelte
+++ b/src/lib/components/channel/MessageInput/MentionList.svelte
@@ -1,40 +1,88 @@
{#if filteredItems.length}
|