mirror of
https://github.com/vector-im/element-web.git
synced 2024-11-17 05:55:00 +08:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
1b167b32f0
@ -28,6 +28,8 @@ module.exports = {
|
|||||||
return false;
|
return false;
|
||||||
} else if (ev.getType() == 'm.room.member') {
|
} else if (ev.getType() == 'm.room.member') {
|
||||||
return false;
|
return false;
|
||||||
|
} else if (ev.getType() == 'm.room.third_party_invite') {
|
||||||
|
return false;
|
||||||
} else if (ev.getType() == 'm.call.answer' || ev.getType() == 'm.call.hangup') {
|
} else if (ev.getType() == 'm.call.answer' || ev.getType() == 'm.call.hangup') {
|
||||||
return false;
|
return false;
|
||||||
} else if (ev.getType == 'm.room.message' && ev.getContent().msgtype == 'm.notify') {
|
} else if (ev.getType == 'm.room.message' && ev.getContent().msgtype == 'm.notify') {
|
||||||
|
Loading…
Reference in New Issue
Block a user