Skip to content
Snippets Groups Projects
Commit 42f5b0a6 authored by Emmanuel ROHEE's avatar Emmanuel ROHEE
Browse files

Recents uses data directly from $rootscope.events

parent 76217890
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
webclient/components/matrix/event-handler-service.js
+ 35
− 8
View file @ 42f5b0a6
...@@ -63,13 +63,14 @@ angular.module('eventHandlerService', []) ...@@ -63,13 +63,14 @@ angular.module('eventHandlerService', [])
var initRoom = function(room_id) { var initRoom = function(room_id) {
if (!(room_id in $rootScope.events.rooms)) { if (!(room_id in $rootScope.events.rooms)) {
console.log("Creating new handler entry for " + room_id); console.log("Creating new handler entry for " + room_id);
$rootScope.events.rooms[room_id] = {}; $rootScope.events.rooms[room_id] = {
$rootScope.events.rooms[room_id].messages = []; room_id: room_id,
$rootScope.events.rooms[room_id].members = {}; messages: [],
members: {},
// Pagination information // Pagination information
$rootScope.events.rooms[room_id].pagination = { pagination: {
earliest_token: "END" // how far back we've paginated earliest_token: "END" // how far back we've paginated
}
}; };
} }
}; };
...@@ -257,7 +258,9 @@ angular.module('eventHandlerService', []) ...@@ -257,7 +258,9 @@ angular.module('eventHandlerService', [])
// FIXME: /initialSync on a particular room is not yet available // FIXME: /initialSync on a particular room is not yet available
// So initRoom on a new room is not called. Make sure the room data is initialised here // So initRoom on a new room is not called. Make sure the room data is initialised here
initRoom(event.room_id); if (event.room_id) {
initRoom(event.room_id);
}
// Avoid duplicated events // Avoid duplicated events
// Needed for rooms where initialSync has not been done. // Needed for rooms where initialSync has not been done.
...@@ -347,6 +350,30 @@ angular.module('eventHandlerService', []) ...@@ -347,6 +350,30 @@ angular.module('eventHandlerService', [])
resetRoomMessages: function(room_id) { resetRoomMessages: function(room_id) {
resetRoomMessages(room_id); resetRoomMessages(room_id);
},
/**
* Compute the room users number, ie the number of members who has joined the room.
* @param {String} room_id the room id
* @returns {undefined | Number} the room users number if available
*/
getUsersCountInRoom: function(room_id) {
var memberCount;
var room = $rootScope.events.rooms[room_id];
if (room) {
memberCount = 0;
for (var i in room.members) {
var member = room.members[i];
if ("join" === member.membership) {
memberCount = memberCount + 1;
}
}
}
return memberCount;
} }
}; };
}]); }]);
webclient/recents/recents-controller.js
+ 3
− 124
View file @ 42f5b0a6
...@@ -16,134 +16,13 @@ ...@@ -16,134 +16,13 @@
'use strict'; 'use strict';
angular.module('RecentsController', ['matrixService', 'matrixFilter', 'eventHandlerService']) angular.module('RecentsController', ['matrixService', 'matrixFilter'])
.controller('RecentsController', ['$rootScope', '$scope', 'matrixService', 'eventHandlerService', .controller('RecentsController', ['$rootScope',
function($rootScope, $scope, matrixService, eventHandlerService) { function($rootScope) {
// FIXME: Angularjs reloads the controller (and resets its $scope) each time
// the page URL changes, use $rootScope to avoid to have to reload data
$rootScope.rooms;
// $rootScope of the parent where the recents component is included can override this value // $rootScope of the parent where the recents component is included can override this value
// in order to highlight a specific room in the list // in order to highlight a specific room in the list
$rootScope.recentsSelectedRoomID; $rootScope.recentsSelectedRoomID;
var listenToEventStream = function() {
// Refresh the list on matrix invitation and message event
$rootScope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) {
if (isLive) {
if (!$rootScope.rooms[event.room_id]) {
// The user has joined a new room, which we do not have data yet. The reason is that
// the room has appeared in the scope of the user rooms after the global initialSync
// FIXME: an initialSync on this specific room should be done
$rootScope.rooms[event.room_id] = {
room_id:event.room_id
};
}
else if (event.state_key === matrixService.config().user_id && "invite" !== event.membership && "join" !== event.membership) {
// The user has been kicked or banned from the room, remove this room from the recents
delete $rootScope.rooms[event.room_id];
}
if ($rootScope.rooms[event.room_id]) {
$rootScope.rooms[event.room_id].lastMsg = event;
}
// Update room users count
$rootScope.rooms[event.room_id].numUsersInRoom = getUsersCountInRoom(event.room_id);
}
});
$rootScope.$on(eventHandlerService.MSG_EVENT, function(ngEvent, event, isLive) {
if (isLive) {
$rootScope.rooms[event.room_id].lastMsg = event;
}
});
$rootScope.$on(eventHandlerService.CALL_EVENT, function(ngEvent, event, isLive) {
if (isLive) {
$rootScope.rooms[event.room_id].lastMsg = event;
}
});
$rootScope.$on(eventHandlerService.ROOM_CREATE_EVENT, function(ngEvent, event, isLive) {
if (isLive) {
$rootScope.rooms[event.room_id] = event;
}
});
$rootScope.$on(eventHandlerService.NAME_EVENT, function(ngEvent, event, isLive) {
if (isLive) {
$rootScope.rooms[event.room_id].lastMsg = event;
}
});
$rootScope.$on(eventHandlerService.TOPIC_EVENT, function(ngEvent, event, isLive) {
if (isLive) {
$rootScope.rooms[event.room_id].lastMsg = event;
}
});
};
/**
* Compute the room users number, ie the number of members who has joined the room.
* @param {String} room_id the room id
* @returns {undefined | Number} the room users number if available
*/
var getUsersCountInRoom = function(room_id) {
var memberCount;
var room = $rootScope.events.rooms[room_id];
if (room) {
memberCount = 0;
for (var i in room.members) {
var member = room.members[i];
if ("join" === member.membership) {
memberCount = memberCount + 1;
}
}
}
return memberCount;
};
$scope.onInit = function() {
// Init recents list only once
if ($rootScope.rooms) {
return;
}
$rootScope.rooms = {};
// Use initialSync data to init the recents list
eventHandlerService.waitForInitialSyncCompletion().then(
function(initialSyncData) {
var rooms = initialSyncData.data.rooms;
for (var i=0; i<rooms.length; i++) {
var room = rooms[i];
// Add room_alias & room_display_name members
$rootScope.rooms[room.room_id] = angular.extend(room, matrixService.getRoomAliasAndDisplayName(room));
// Create a shortcut for the last message of this room
if (room.messages && room.messages.chunk && room.messages.chunk[0]) {
$rootScope.rooms[room.room_id].lastMsg = room.messages.chunk[0];
}
$rootScope.rooms[room.room_id].numUsersInRoom = getUsersCountInRoom(room.room_id);
}
// From now, update recents from the stream
listenToEventStream();
},
function(error) {
$rootScope.feedback = "Failure: " + error.data;
}
);
};
// Clean data when user logs out
$scope.$on(eventHandlerService.RESET_EVENT, function() {
delete $rootScope.rooms;
});
}]); }]);
webclient/recents/recents-filter.js
+ 22
− 8
View file @ 42f5b0a6
...@@ -17,31 +17,45 @@ ...@@ -17,31 +17,45 @@
'use strict'; 'use strict';
angular.module('RecentsController') angular.module('RecentsController')
.filter('orderRecents', function() { .filter('orderRecents', ["eventHandlerService", function(eventHandlerService) {
return function(rooms) { return function(rooms) {
// Transform the dict into an array // Transform the dict into an array
// The key, room_id, is already in value objects // The key, room_id, is already in value objects
var filtered = []; var filtered = [];
angular.forEach(rooms, function(value, key) { angular.forEach(rooms, function(room, room_id) {
filtered.push( value );
// Count users here
// TODO: Compute it directly in eventHandlerService
room.numUsersInRoom = eventHandlerService.getUsersCountInRoom(room_id);
filtered.push(room);
}); });
// And time sort them // And time sort them
// The room with the lastest message at first // The room with the lastest message at first
filtered.sort(function (a, b) { filtered.sort(function (roomA, roomB) {
var lastMsgRoomA, lastMsgRoomB;
if (roomA.messages && 0 < roomA.messages.length) {
lastMsgRoomA = roomA.messages[roomA.messages.length - 1];
}
if (roomB.messages && 0 < roomB.messages.length) {
lastMsgRoomB = roomB.messages[roomB.messages.length - 1];
}
// Invite message does not have a body message nor ts // Invite message does not have a body message nor ts
// Puth them at the top of the list // Puth them at the top of the list
if (undefined === a.lastMsg) { if (undefined === lastMsgRoomA) {
return -1; return -1;
} }
else if (undefined === b.lastMsg) { else if (undefined === lastMsgRoomB) {
return 1; return 1;
} }
else { else {
return b.lastMsg.ts - a.lastMsg.ts; return lastMsgRoomB.ts - lastMsgRoomA.ts;
} }
}); });
return filtered; return filtered;
}; };
}); }]);
\ No newline at end of file \ No newline at end of file
webclient/recents/recents.html
+ 35
− 31
View file @ 42f5b0a6
<div ng-controller="RecentsController" data-ng-init="onInit()"> <div ng-controller="RecentsController">
<table class="recentsTable"> <table class="recentsTable">
<tbody ng-repeat="(rm_id, room) in rooms | orderRecents" <tbody ng-repeat="(index, room) in events.rooms | orderRecents"
ng-click="goToPage('room/' + (room.room_alias ? room.room_alias : room.room_id) )" ng-click="goToPage('room/' + (room.room_alias ? room.room_alias : room.room_id) )"
class ="recentsRoom" class ="recentsRoom"
ng-class="{'recentsRoomSelected': (room.room_id === recentsSelectedRoomID)}"> ng-class="{'recentsRoomSelected': (room.room_id === recentsSelectedRoomID)}">
<tr> <tr>
<td class="recentsRoomName"> <td class="recentsRoomName">
{{ room.room_id | mRoomName }} {{ room.room_id | mRoomName }}
...@@ -14,7 +14,11 @@ ...@@ -14,7 +14,11 @@
</span> </span>
</td> </td>
<td class="recentsRoomSummaryTS"> <td class="recentsRoomSummaryTS">
{{ (room.lastMsg.ts) | date:'MMM d HH:mm' }} <!-- Use a temp var as alias to the last room message.
Declaring it in this way ensures the data-binding -->
{{lastMsg = room.messages[room.messages.length - 1];""}}
{{ (lastMsg.ts) | date:'MMM d HH:mm' }}
</td> </td>
</tr> </tr>
...@@ -25,67 +29,67 @@ ...@@ -25,67 +29,67 @@
{{ room.inviter | mUserDisplayName: room.room_id }} invited you {{ room.inviter | mUserDisplayName: room.room_id }} invited you
</div> </div>
<div ng-hide="room.membership === 'invite'" ng-switch="room.lastMsg.type"> <div ng-hide="room.membership === 'invite'" ng-switch="lastMsg.type">
<div ng-switch-when="m.room.member"> <div ng-switch-when="m.room.member">
<span ng-if="'join' === room.lastMsg.content.membership"> <span ng-if="'join' === lastMsg.content.membership">
{{ room.lastMsg.state_key | mUserDisplayName: room.room_id}} joined {{ lastMsg.state_key | mUserDisplayName: room.room_id}} joined
</span> </span>
<span ng-if="'leave' === room.lastMsg.content.membership"> <span ng-if="'leave' === lastMsg.content.membership">
<span ng-if="room.lastMsg.user_id === room.lastMsg.state_key"> <span ng-if="lastMsg.user_id === lastMsg.state_key">
{{room.lastMsg.state_key | mUserDisplayName: room.room_id }} left {{lastMsg.state_key | mUserDisplayName: room.room_id }} left
</span> </span>
<span ng-if="room.lastMsg.user_id !== room.lastMsg.state_key"> <span ng-if="lastMsg.user_id !== lastMsg.state_key">
{{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} {{ lastMsg.user_id | mUserDisplayName: room.room_id }}
{{ {"join": "kicked", "ban": "unbanned"}[room.lastMsg.content.prev] }} {{ {"join": "kicked", "ban": "unbanned"}[lastMsg.content.prev] }}
{{ room.lastMsg.state_key | mUserDisplayName: room.room_id }} {{ lastMsg.state_key | mUserDisplayName: room.room_id }}
</span> </span>
<span ng-if="'join' === room.lastMsg.content.prev && room.lastMsg.content.reason"> <span ng-if="'join' === lastMsg.content.prev && lastMsg.content.reason">
: {{ room.lastMsg.content.reason }} : {{ lastMsg.content.reason }}
</span> </span>
</span> </span>
<span ng-if="'invite' === room.lastMsg.content.membership || 'ban' === room.lastMsg.content.membership"> <span ng-if="'invite' === lastMsg.content.membership || 'ban' === lastMsg.content.membership">
{{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} {{ lastMsg.user_id | mUserDisplayName: room.room_id }}
{{ {"invite": "invited", "ban": "banned"}[room.lastMsg.content.membership] }} {{ {"invite": "invited", "ban": "banned"}[lastMsg.content.membership] }}
{{ room.lastMsg.state_key | mUserDisplayName: room.room_id }} {{ lastMsg.state_key | mUserDisplayName: room.room_id }}
<span ng-if="'ban' === room.lastMsg.content.prev && room.lastMsg.content.reason"> <span ng-if="'ban' === lastMsg.content.prev && lastMsg.content.reason">
: {{ room.lastMsg.content.reason }} : {{ lastMsg.content.reason }}
</span> </span>
</span> </span>
</div> </div>
<div ng-switch-when="m.room.message"> <div ng-switch-when="m.room.message">
<div ng-switch="room.lastMsg.content.msgtype"> <div ng-switch="lastMsg.content.msgtype">
<div ng-switch-when="m.text"> <div ng-switch-when="m.text">
{{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} : {{ lastMsg.user_id | mUserDisplayName: room.room_id }} :
<span ng-bind-html="(room.lastMsg.content.body) | linky:'_blank'"> <span ng-bind-html="(lastMsg.content.body) | linky:'_blank'">
</span> </span>
</div> </div>
<div ng-switch-when="m.image"> <div ng-switch-when="m.image">
{{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} sent an image {{ lastMsg.user_id | mUserDisplayName: room.room_id }} sent an image
</div> </div>
<div ng-switch-when="m.emote"> <div ng-switch-when="m.emote">
<span ng-bind-html="'* ' + (room.lastMsg.user_id | mUserDisplayName: room.room_id) + ' ' + room.lastMsg.content.body | linky:'_blank'"> <span ng-bind-html="'* ' + (lastMsg.user_id | mUserDisplayName: room.room_id) + ' ' + lastMsg.content.body | linky:'_blank'">
</span> </span>
</div> </div>
<div ng-switch-default> <div ng-switch-default>
{{ room.lastMsg.content }} {{ lastMsg.content }}
</div> </div>
</div> </div>
</div> </div>
<div ng-switch-when="m.room.topic"> <div ng-switch-when="m.room.topic">
{{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} changed the topic to: {{ room.lastMsg.content.topic }} {{ lastMsg.user_id | mUserDisplayName: room.room_id }} changed the topic to: {{ lastMsg.content.topic }}
</div> </div>
<div ng-switch-when="m.room.name"> <div ng-switch-when="m.room.name">
{{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} changed the room name to: {{ room.lastMsg.content.name }} {{ lastMsg.user_id | mUserDisplayName: room.room_id }} changed the room name to: {{ lastMsg.content.name }}
</div> </div>
<div ng-switch-default> <div ng-switch-default>
<div ng-if="room.lastMsg.type.indexOf('m.call.') === 0"> <div ng-if="lastMsg.type.indexOf('m.call.') === 0">
Call Call
</div> </div>
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment