LogalDeveloper/owncast
0
Fork 0
Code Activity

Keep list of renderable message types and check against them

Browse Source
This commit is contained in:
Gabe Kangas
2021-11-17 17:19:55 -08:00
parent 9316e2ebc0
commit 040c838881
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webroot/js/components/chat/chat.js
View File

@@ -15,6 +15,7 @@ import {
MESSAGE_JUMPTOBOTTOM_BUFFER, MESSAGE_JUMPTOBOTTOM_BUFFER,
} from '../../utils/constants.js'; } from '../../utils/constants.js';
const renderableChatStyleMessages = ['CHAT', 'SYSTEM', 'USER_JOINED'];
export default class Chat extends Component { export default class Chat extends Component {
constructor(props, context) { constructor(props, context) {
super(props, context); super(props, context);
@@ -218,14 +219,13 @@ export default class Chat extends Component {
}); });
this.forceRender = true; this.forceRender = true;
} else if ( } else if (
messageType === 'CHAT' && renderableChatStyleMessages.includes(messageType) &&
existingIndex === -1 && existingIndex === -1 &&
messageVisible messageVisible
) { ) {
// insert message at timestamp // insert message at timestamp
const convertedMessage = { const convertedMessage = {
...message, ...message,
type: 'CHAT',
}; };
const insertAtIndex = curMessages.findIndex((item, index) => { const insertAtIndex = curMessages.findIndex((item, index) => {
const time = item.timestamp || messageTimestamp; const time = item.timestamp || messageTimestamp;
@@ -247,7 +247,10 @@ export default class Chat extends Component {
this.setState({ this.setState({
messages: updatedMessageList, messages: updatedMessageList,
}); });
} else if (messageType === 'CHAT' && existingIndex === -1) { } else if (
renderableChatStyleMessages.includes(messageType) &&
existingIndex === -1
) {
// else if message doesn't exist, add it and extra username // else if message doesn't exist, add it and extra username
const newState = { const newState = {
messages: [...curMessages, message], messages: [...curMessages, message],