diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js
index a2c807b3f0..6fd77c4f29 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -353,6 +353,30 @@ angular.module('eventHandlerService', [])
},
/**
+ * Return the last message event of a room
+ * @param {String} room_id the room id
+ * @param {Boolean} filterFake true to not take into account fake messages
+ * @returns {undefined | Event} the last message event if available
+ */
+ getLastMessage: function(room_id, filterEcho) {
+ var lastMessage;
+
+ var room = $rootScope.events.rooms[room_id];
+ if (room) {
+ for (var i = room.messages.length - 1; i >= 0; i--) {
+ var message = room.messages[i];
+
+ if (!filterEcho || undefined === message.echo_msg_state) {
+ lastMessage = message;
+ break;
+ }
+ }
+ }
+
+ return lastMessage;
+ },
+
+ /**
* 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
diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js
index 2006f13a57..ee8a41c366 100644
--- a/webclient/recents/recents-controller.js
+++ b/webclient/recents/recents-controller.js
@@ -17,8 +17,11 @@
'use strict';
angular.module('RecentsController', ['matrixService', 'matrixFilter'])
-.controller('RecentsController', ['$rootScope',
- function($rootScope) {
+.controller('RecentsController', ['$rootScope', '$scope', 'eventHandlerService',
+ function($rootScope, $scope, eventHandlerService) {
+
+ // Expose the service to the view
+ $scope.eventHandlerService = eventHandlerService;
// $rootScope of the parent where the recents component is included can override this value
// in order to highlight a specific room in the list
diff --git a/webclient/recents/recents-filter.js b/webclient/recents/recents-filter.js
index e8a706a5d5..67fe49d4b6 100644
--- a/webclient/recents/recents-filter.js
+++ b/webclient/recents/recents-filter.js
@@ -35,14 +35,9 @@ angular.module('RecentsController')
// And time sort them
// The room with the lastest message at first
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];
- }
+ var lastMsgRoomA = eventHandlerService.getLastMessage(roomA.room_id, true);
+ var lastMsgRoomB = eventHandlerService.getLastMessage(roomB.room_id, true);
// Invite message does not have a body message nor ts
// Puth them at the top of the list
diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html
index eb9e269a4b..789ffc9d20 100644
--- a/webclient/recents/recents.html
+++ b/webclient/recents/recents.html
@@ -16,7 +16,7 @@
<td class="recentsRoomSummaryTS">
<!-- 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 = eventHandlerService.getLastMessage(room.room_id, true);"" }}
{{ (lastMsg.ts) | date:'MMM d HH:mm' }}
</td>
|
