Browse Source

Keep list of renderable message types and check against them

pull/1546/head
Gabe Kangas 4 years ago
parent
commit
040c838881
  1. 9
      webroot/js/components/chat/chat.js

9
webroot/js/components/chat/chat.js

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

Loading…
Cancel
Save