mirrors/owncast
1
0
Fork 0
mirror of https://github.com/owncast/owncast.git synced 2024-10-24 13:35:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Show moderation menu for moderators. Closes #1864

Browse source
This commit is contained in:
Gabe Kangas 2022-08-22 19:23:06 -07:00
parent 1def26f1ba
commit c2bd9436ba
No known key found for this signature in database
GPG key ID: 9A56337728BC81EA
7 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
web/components/chat/ChatContainer/ChatContainer.tsx
View file

@ -17,15 +17,13 @@ import ChatJoinMessage from '../ChatJoinMessage/ChatJoinMessage';
interface Props { interface Props {
messages: ChatMessage[]; messages: ChatMessage[];
// loading: boolean;
usernameToHighlight: string; usernameToHighlight: string;
chatUserId: string; chatUserId: string;
isModerator: boolean; isModerator: boolean;
isMobile: boolean | undefined;
} }
export default function ChatContainer(props: Props) { export default function ChatContainer(props: Props) {
const { messages, usernameToHighlight, chatUserId, isModerator, isMobile } = props; const { messages, usernameToHighlight, chatUserId, isModerator } = props;
const [atBottom, setAtBottom] = useState(false); const [atBottom, setAtBottom] = useState(false);
// const [showButton, setShowButton] = useState(false); // const [showButton, setShowButton] = useState(false);
@ -146,7 +144,7 @@ export default function ChatContainer(props: Props) {
)} )}
</> </>
), ),
[messages, usernameToHighlight, chatUserId, isModerator, atBottom, isMobile], [messages, usernameToHighlight, chatUserId, isModerator, atBottom],
); );
return ( return (

1
web/components/chat/ChatModerationActionMenu/ChatModerationActionMenu.tsx
View file

@ -12,7 +12,6 @@ import ChatModeration from '../../../services/moderation-service';
const { confirm } = Modal; const { confirm } = Modal;
/* eslint-disable @typescript-eslint/no-unused-vars */
interface Props { interface Props {
accessToken: string; accessToken: string;
messageID: string; messageID: string;

4
web/components/stores/ClientConfigStore.tsx
View file

@ -339,8 +339,8 @@ export function ClientConfigStore() {
const metadata = mergeMeta(state.meta) as AppStateOptions; const metadata = mergeMeta(state.meta) as AppStateOptions;
console.debug('--- APP STATE: ', state.value); // console.debug('--- APP STATE: ', state.value);
console.debug('--- APP META: ', metadata); // console.debug('--- APP META: ', metadata);
setAppState(metadata); setAppState(metadata);
}); });

2
web/components/stores/eventhandlers/connected-client-info-handler.ts
View file

@ -13,6 +13,6 @@ export default function handleConnectedClientInfoMessage(
setChatDisplayName(displayName); setChatDisplayName(displayName);
setChatDisplayColor(displayColor); setChatDisplayColor(displayColor);
setChatUserId(id); setChatUserId(id);
setIsChatModerator(scopes?.includes('moderator')); setIsChatModerator(scopes?.includes('MODERATOR'));
setChatAuthenticated(authenticated); setChatAuthenticated(authenticated);
} }

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

@ -172,7 +172,6 @@ export default function ContentComponent() {
usernameToHighlight={chatDisplayName} usernameToHighlight={chatDisplayName}
chatUserId={chatUserId} chatUserId={chatUserId}
isModerator={false} isModerator={false}
isMobile={isMobile}
/> />
</div> </div>
</div> </div>

5
web/components/ui/Sidebar/Sidebar.tsx
View file

@ -8,12 +8,14 @@ import {
chatMessagesAtom, chatMessagesAtom,
chatDisplayNameAtom, chatDisplayNameAtom,
chatUserIdAtom, chatUserIdAtom,
isChatModeratorAtom,
} from '../../stores/ClientConfigStore'; } from '../../stores/ClientConfigStore';
export default function Sidebar() { export default function Sidebar() {
const messages = useRecoilValue<ChatMessage[]>(chatMessagesAtom); const messages = useRecoilValue<ChatMessage[]>(chatMessagesAtom);
const chatDisplayName = useRecoilValue<string>(chatDisplayNameAtom); const chatDisplayName = useRecoilValue<string>(chatDisplayNameAtom);
const chatUserId = useRecoilValue<string>(chatUserIdAtom); const chatUserId = useRecoilValue<string>(chatUserIdAtom);
const isChatModerator = useRecoilValue<boolean>(isChatModeratorAtom);
return ( return (
<Sider className={s.root} collapsedWidth={0} width={320}> <Sider className={s.root} collapsedWidth={0} width={320}>
@ -21,8 +23,7 @@ export default function Sidebar() {
messages={messages} messages={messages}
usernameToHighlight={chatDisplayName} usernameToHighlight={chatDisplayName}
chatUserId={chatUserId} chatUserId={chatUserId}
isModerator={false} isModerator={isChatModerator}
isMobile={false}
/> />
</Sider> </Sider>
); );

1
web/stories/ChatContainer.stories.tsx
View file

@ -38,7 +38,6 @@ const AddMessagesChatExample = args => {
usernameToHighlight="testuser" usernameToHighlight="testuser"
chatUserId="testuser" chatUserId="testuser"
isModerator={false} isModerator={false}
isMobile={false}
/> />
</RecoilRoot> </RecoilRoot>
); );