OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

null checks added

pull/21833/head
nurjinn jafar 2020-10-26 16:37:45 +01:00
parent 674060ed93
commit 19395f3c3c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/structures/RoomView.tsx
View File

@ -831,14 +831,14 @@ export default class RoomView extends React.Component<IProps, IState> {
};
private handleEffects = (ev) => {
if (this.state.room.getUnreadNotificationCount() === 0) return;
if (this.state.matrixClientIsReady) {
effects.forEach(effect => {
if (containsEmoji(ev.getContent(), effect.emojis) || ev.getContent().msgtype === effect.msgType) {
dis.dispatch({action: `effects.${effect.command}`});
}
})
}
if (!this.state.room ||
!this.state.matrixClientIsReady ||
this.state.room.getUnreadNotificationCount() === 0) return;
effects.forEach(effect => {
if (containsEmoji(ev.getContent(), effect.emojis) || ev.getContent().msgtype === effect.msgType) {
dis.dispatch({action: `effects.${effect.command}`});
}
})
};
private onRoomName = (room: Room) => {

2
src/components/views/elements/effects/effectUtilities.ts
View File

@ -4,5 +4,5 @@
* @param {Array<string>} emojis The list of emojis to check for
*/
export const containsEmoji = (content: { msgtype: string, body: string }, emojis: Array<string>): boolean => {
return emojis.some((emoji) => content.body.includes(emoji));
return emojis.some((emoji) => content.body && content.body.includes(emoji));
}