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

Merge pull request #1602 from matrix-org/dbkr/nullcheck_atroom_rule 

Don't crash if there isn't a room notif rule
pull/21833/head
David Baker 2017-11-10 11:57:43 +00:00 committed by GitHub
parent 981ca458ec ff5e00d244
commit d2549b621c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/messages/TextualBody.js
View File

@ -224,7 +224,7 @@ module.exports = React.createClass({
if (roomNotifTextNodes.length > 0) { if (roomNotifTextNodes.length > 0) {
const pushProcessor = new PushProcessor(MatrixClientPeg.get()); const pushProcessor = new PushProcessor(MatrixClientPeg.get());
const atRoomRule = pushProcessor.getPushRuleById(".m.rule.roomnotif"); const atRoomRule = pushProcessor.getPushRuleById(".m.rule.roomnotif");
if (pushProcessor.ruleMatchesEvent(atRoomRule, this.props.mxEvent)) { if (atRoomRule && pushProcessor.ruleMatchesEvent(atRoomRule, this.props.mxEvent)) {
// Now replace all those nodes with Pills // Now replace all those nodes with Pills
for (const roomNotifTextNode of roomNotifTextNodes) { for (const roomNotifTextNode of roomNotifTextNodes) {
const pillContainer = document.createElement('span'); const pillContainer = document.createElement('span');