summary refs log tree commit diff
path: root/webclient/room
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-16 16:23:20 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-16 16:23:20 +0100
commit95e171e19a323bd92da5f20d651a52517b47ce03 (patch)
tree69fb72c85dcf8a47870b93e2ff2887640bff5cb7 /webclient/room
parentAdded basic RegExp support. (diff)
downloadsynapse-95e171e19a323bd92da5f20d651a52517b47ce03.tar.xz
Don't bing for sent messages. Handle cases where the member is unknown rather than erroring out.
Diffstat (limited to '')
-rw-r--r--webclient/room/room.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html
index 86ec2e51ca..886c2afe64 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -105,7 +105,7 @@
                         
                         <span ng-show='msg.content.msgtype === "m.text"' 
                               class="message"
-                              ng-class="containsBingWord(msg.content.body) ? msg.echo_msg_state + ' messageBing' : msg.echo_msg_state"
+                              ng-class="containsBingWord(msg.content.body) && msg.user_id != state.user_id ? msg.echo_msg_state + ' messageBing' : msg.echo_msg_state"
                               ng-bind-html="((msg.content.msgtype === 'm.text') ? msg.content.body : '') | linky:'_blank'"/>
 
                         <span ng-show='msg.type === "m.call.invite" && msg.user_id == state.user_id'>Outgoing Call</span>