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

Merge pull request #421 from matrix-org/dbkr/fix_mute_to_all_messages 

Only try to delete room rule if it exists
pull/21833/head
David Baker 2016-08-18 17:11:57 +01:00 committed by GitHub
parent e29be619c9 5495cfaca9
commit d23ed642a0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/RoomNotifs.js
View File

@ -100,7 +100,10 @@ function setRoomNotifsStateUnmuted(roomId, newState) {
} }
if (newState == 'all_messages') { if (newState == 'all_messages') {
promises.push(cli.deletePushRule('global', 'room', roomId)); const roomRule = cli.getRoomPushRule('global', roomId);
if (roomRule) {
promises.push(cli.deletePushRule('global', 'room', roomRule.rule_id));
}
} else if (newState == 'mentions_only') { } else if (newState == 'mentions_only') {
promises.push(cli.addPushRule('global', 'room', roomId, { promises.push(cli.addPushRule('global', 'room', roomId, {
actions: [ actions: [