mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-14 05:03:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

null checks added

Browse source
This commit is contained in:
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

6
src/components/structures/RoomView.tsx
View file

@ -831,14 +831,14 @@ export default class RoomView extends React.Component<IProps, IState> {
}; };
private handleEffects = (ev) => { private handleEffects = (ev) => {
if (this.state.room.getUnreadNotificationCount() === 0) return; if (!this.state.room ||
if (this.state.matrixClientIsReady) { !this.state.matrixClientIsReady ||
this.state.room.getUnreadNotificationCount() === 0) return;
effects.forEach(effect => { effects.forEach(effect => {
if (containsEmoji(ev.getContent(), effect.emojis) || ev.getContent().msgtype === effect.msgType) { if (containsEmoji(ev.getContent(), effect.emojis) || ev.getContent().msgtype === effect.msgType) {
dis.dispatch({action: `effects.${effect.command}`}); dis.dispatch({action: `effects.${effect.command}`});
} }
}) })
}
}; };
private onRoomName = (room: Room) => { 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 * @param {Array<string>} emojis The list of emojis to check for
*/ */
export const containsEmoji = (content: { msgtype: string, body: string }, emojis: Array<string>): boolean => { 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));
} }