LogalDeveloper/owncast
0
Fork 0
Code Activity

Make testing for moderator state centralized in User class

Browse Source
This commit is contained in:
Gabe Kangas
2023-03-03 21:54:01 -08:00
parent e5dee5d258
commit c4f057eded
6 changed files with 59 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web/components/chat/ChatContainer/ChatContainer.tsx
View File

@@ -17,6 +17,7 @@ import { ScrollToBotBtn } from './ScrollToBotBtn';
import { ChatActionMessage } from '../ChatActionMessage/ChatActionMessage';
import { ChatSocialMessage } from '../ChatSocialMessage/ChatSocialMessage';
import { ChatNameChangeMessage } from '../ChatNameChangeMessage/ChatNameChangeMessage';
import { User } from '../../../interfaces/user.model';
export type ChatContainerProps = {
messages: ChatMessage[];
@@ -75,15 +76,11 @@ function shouldCollapseMessages(
}
function checkIsModerator(message: ChatMessage | ConnectedClientInfoEvent) {
const {
user: { scopes },
} = message;
const { user } = message;
if (!scopes || scopes.length === 0) {
return false;
}
const u = new User(user);
return scopes.includes('MODERATOR');
return u.isModerator();
}
export const ChatContainer: FC<ChatContainerProps> = ({