summary refs log tree commit diff
path: root/syweb/webclient/recents
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-11-06 14:52:22 +0000
committerKegan Dougal <kegan@matrix.org>2014-11-06 14:52:22 +0000
commite3c3f5a6d04bfbc0256010e9fb4dad7616ebbcc5 (patch)
tree25716cfbd85da66da6af8732d858780c82f56401 /syweb/webclient/recents
parentUse mRoomName on join notifications as well. (diff)
downloadsynapse-e3c3f5a6d04bfbc0256010e9fb4dad7616ebbcc5.tar.xz
Swap from using raw m.room.member events for room members to using actual RoomMember objects, so User objects can be tacked on. Update tests.
Diffstat (limited to 'syweb/webclient/recents')
-rw-r--r--syweb/webclient/recents/recents-filter.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/syweb/webclient/recents/recents-filter.js b/syweb/webclient/recents/recents-filter.js
index 39c2359967..cfbc6f4bd8 100644
--- a/syweb/webclient/recents/recents-filter.js
+++ b/syweb/webclient/recents/recents-filter.js
@@ -30,6 +30,9 @@ angular.module('RecentsController')
             // Show the room only if the user has joined it or has been invited
             // (ie, do not show it if he has been banned)
             var member = modelService.getMember(room_id, user_id);
+            if (member) {
+                member = member.event;
+            }
             room.recent.me = member;
             if (member && ("invite" === member.content.membership || "join" === member.content.membership)) {
                 if ("invite" === member.content.membership) {