matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code 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
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) => { private handleEffects = (ev) => {
if (this.state.room.getUnreadNotificationCount() === 0) return; if (!this.state.room ||
if (this.state.matrixClientIsReady) { !this.state.matrixClientIsReady ||
effects.forEach(effect => { this.state.room.getUnreadNotificationCount() === 0) return;
if (containsEmoji(ev.getContent(), effect.emojis) || ev.getContent().msgtype === effect.msgType) { effects.forEach(effect => {
dis.dispatch({action: `effects.${effect.command}`}); if (containsEmoji(ev.getContent(), effect.emojis) || ev.getContent().msgtype === effect.msgType) {
} 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));
} }