Show display name changes in the message list.
2 files changed, 30 insertions, 8 deletions
diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js
index 98003e97bf..21066e3d9f 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -253,12 +253,30 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
// Exception: Do not do this if the event is a room state event because such events already come
// as room messages events. Moreover, when they come as room messages events, they are relatively ordered
// with other other room messages
- if (event.content.prev !== event.content.membership && !isStateEvent) {
- if (isLiveEvent) {
- $rootScope.events.rooms[event.room_id].messages.push(event);
+ if (!isStateEvent) {
+ // could be a membership change, display name change, etc.
+ // Find out which one.
+ var memberChanges = undefined;
+ if (event.content.prev !== event.content.membership) {
+ memberChanges = "membership";
}
- else {
- $rootScope.events.rooms[event.room_id].messages.unshift(event);
+ else if (event.prev_content.displayname !==
+ event.content.displayname) {
+ memberChanges = "displayname";
+ }
+
+ // mark the key which changed
+ event.changedKey = memberChanges;
+
+ // If there was a change we want to display, dump it in the message
+ // list.
+ if (memberChanges) {
+ if (isLiveEvent) {
+ $rootScope.events.rooms[event.room_id].messages.push(event);
+ }
+ else {
+ $rootScope.events.rooms[event.room_id].messages.unshift(event);
+ }
}
}
diff --git a/webclient/room/room.html b/webclient/room/room.html
index db3aa193c5..c807e2afe1 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -77,10 +77,10 @@
</td>
<td ng-class="(!msg.content.membership && ('m.room.topic' !== msg.type && 'm.room.name' !== msg.type))? (msg.content.msgtype === 'm.emote' ? 'emote text' : 'text') : 'membership text'">
<div class="bubble">
- <span ng-if="'join' === msg.content.membership">
+ <span ng-if="'join' === msg.content.membership && msg.changedKey === 'membership'">
{{ members[msg.state_key].displayname || msg.state_key }} joined
</span>
- <span ng-if="'leave' === msg.content.membership">
+ <span ng-if="'leave' === msg.content.membership && msg.changedKey === 'membership'">
<span ng-if="msg.user_id === msg.state_key">
{{ members[msg.state_key].displayname || msg.state_key }} left
</span>
@@ -93,7 +93,8 @@
</span>
</span>
</span>
- <span ng-if="'invite' === msg.content.membership || 'ban' === msg.content.membership">
+ <span ng-if="'invite' === msg.content.membership && msg.changedKey === 'membership' ||
+ 'ban' === msg.content.membership && msg.changedKey === 'membership'">
{{ members[msg.user_id].displayname || msg.user_id }}
{{ {"invite": "invited", "ban": "banned"}[msg.content.membership] }}
{{ members[msg.state_key].displayname || msg.state_key }}
@@ -101,6 +102,9 @@
: {{ msg.content.reason }}
</span>
</span>
+ <span ng-if="msg.changedKey === 'displayname'">
+ {{ msg.user_id }} changed their display name from {{ msg.prev_content.displayname }} to {{ msg.content.displayname }}
+ </span>
<span ng-show='msg.content.msgtype === "m.emote"'
ng-class="msg.echo_msg_state"
|
