mirrors/owncast
1
0
Fork 0
mirror of https://github.com/owncast/owncast.git synced 2024-11-21 20:28:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

rebase

Browse source
This commit is contained in:
Gabe Kangas 2023-06-05 16:04:13 -07:00
parent 95c9239814
commit ed41990200
No known key found for this signature in database
GPG key ID: 4345B2060657F330
2 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/components/chat/ChatTextField/ChatTextField.tsx
View file

@ -2,7 +2,7 @@
import { Popover, Select } from 'antd'; import { Popover, Select } from 'antd';
import React, { FC, useCallback, useMemo, useRef, useState } from 'react'; import React, { FC, useCallback, useMemo, useRef, useState } from 'react';
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { Transforms, createEditor, BaseEditor, Text, Descendant, Editor } from 'slate'; import { Transforms, createEditor, BaseEditor, Text, Descendant, Editor, Range } from 'slate';
import { import {
Slate, Slate,
DefaultPlaceholder, DefaultPlaceholder,
@ -186,7 +186,7 @@ export const ChatTextField: FC<ChatTextFieldProps> = ({
const editor = useMemo(() => withReact(withMentions(withImages(createEditor()))), []); const editor = useMemo(() => withReact(withMentions(withImages(createEditor()))), []);
const inputRef = useRef<HTMLDivElement>(null); const inputRef = useRef<HTMLDivElement>(null);
const [search, setSearch] = useState(''); const [search, _setSearch] = useState('');
const chatUserNames = knownChatUserDisplayNames const chatUserNames = knownChatUserDisplayNames
?.filter(c => c.toLowerCase().startsWith(search.toLowerCase())) ?.filter(c => c.toLowerCase().startsWith(search.toLowerCase()))

13
web/components/ui/Content/Content.tsx
View file

@ -17,11 +17,7 @@ import {
isOnlineSelector, isOnlineSelector,
isMobileAtom, isMobileAtom,
serverStatusState, serverStatusState,
<<<<<<< HEAD
isChatAvailableSelector, isChatAvailableSelector,
=======
knownChatUserDisplayNamesAtom,
>>>>>>> 490f5dc79 (WIP chat user auto complete)
} from '../../stores/ClientConfigStore'; } from '../../stores/ClientConfigStore';
import { ClientConfig } from '../../../interfaces/client-config.model'; import { ClientConfig } from '../../../interfaces/client-config.model';
@ -102,11 +98,7 @@ export const Content: FC = () => {
const [isMobile, setIsMobile] = useRecoilState<boolean | undefined>(isMobileAtom); const [isMobile, setIsMobile] = useRecoilState<boolean | undefined>(isMobileAtom);
const messages = useRecoilValue<ChatMessage[]>(chatMessagesAtom); const messages = useRecoilValue<ChatMessage[]>(chatMessagesAtom);
const online = useRecoilValue<boolean>(isOnlineSelector); const online = useRecoilValue<boolean>(isOnlineSelector);
<<<<<<< HEAD
const isChatAvailable = useRecoilValue<boolean>(isChatAvailableSelector); const isChatAvailable = useRecoilValue<boolean>(isChatAvailableSelector);
=======
const knownChatUserDisplayNames = useRecoilValue(knownChatUserDisplayNamesAtom);
>>>>>>> 490f5dc79 (WIP chat user auto complete)
const { viewerCount, lastConnectTime, lastDisconnectTime, streamTitle } = const { viewerCount, lastConnectTime, lastDisconnectTime, streamTitle } =
useRecoilValue<ServerStatus>(serverStatusState); useRecoilValue<ServerStatus>(serverStatusState);
@ -276,12 +268,7 @@ export const Content: FC = () => {
extraPageContent={extraPageContent} extraPageContent={extraPageContent}
setShowFollowModal={setShowFollowModal} setShowFollowModal={setShowFollowModal}
supportFediverseFeatures={supportFediverseFeatures} supportFediverseFeatures={supportFediverseFeatures}
<<<<<<< HEAD
online={online} online={online}
=======
chatEnabled={isChatAvailable}
knownChatUserDisplayNames={knownChatUserDisplayNames}
>>>>>>> 490f5dc79 (WIP chat user auto complete)
/> />
) : ( ) : (
<Col span={24} style={{ paddingRight: dynamicPadding }}> <Col span={24} style={{ paddingRight: dynamicPadding }}>