2 files changed, 23 insertions, 23 deletions
diff --git a/syweb/webclient/components/matrix/event-handler-service.js b/syweb/webclient/components/matrix/event-handler-service.js
index a41aaa5778..20ed89f161 100644
--- a/syweb/webclient/components/matrix/event-handler-service.js
+++ b/syweb/webclient/components/matrix/event-handler-service.js
@@ -501,30 +501,7 @@ function(matrixService, $rootScope, $q, $timeout, $filter, mPresence, notificati
eventContainsBingWord: function(event) {
return containsBingWord(event);
- },
-
- /**
- * 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 events = modelService.getRoom(room_id).events;
- for (var i = events.length - 1; i >= 0; i--) {
- var message = events[i];
-
- if (!filterEcho || undefined === message.echo_msg_state) {
- lastMessage = message;
- break;
- }
- }
-
- return lastMessage;
}
-
};
}]);
diff --git a/syweb/webclient/components/matrix/model-service.js b/syweb/webclient/components/matrix/model-service.js
index 4f5d888b05..d34981a9ff 100644
--- a/syweb/webclient/components/matrix/model-service.js
+++ b/syweb/webclient/components/matrix/model-service.js
@@ -307,6 +307,29 @@ angular.module('modelService', [])
}
return memberCount;
+ },
+
+ /**
+ * 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 events = this.getRoom(room_id).events;
+ for (var i = events.length - 1; i >= 0; i--) {
+ var message = events[i];
+
+ // TODO: define a better marker than echo_msg_state
+ if (!filterEcho || undefined === message.echo_msg_state) {
+ lastMessage = message;
+ break;
+ }
+ }
+
+ return lastMessage;
}
};
|
