From 9a5f224931bee9366d41715d13cbbdcfecde5537 Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <manu@Emmanuels-MacBook-Pro.local>
Date: Mon, 8 Sep 2014 18:21:41 +0200
Subject: [PATCH] matrixService.rooms must be renamed matrixService.initialSync
now
---
webclient/components/matrix/event-stream-service.js | 2 +-
webclient/components/matrix/matrix-service.js | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/webclient/components/matrix/event-stream-service.js b/webclient/components/matrix/event-stream-service.js
index 28422c4cb9..4c0091dedb 100644
--- a/webclient/components/matrix/event-stream-service.js
+++ b/webclient/components/matrix/event-stream-service.js
@@ -105,7 +105,7 @@ angular.module('eventStreamService', [])
var deferred = $q.defer();
// FIXME: We are discarding all the messages.
- matrixService.rooms(1, false).then(
+ matrixService.initialSync(1, false).then(
function(response) {
var rooms = response.data.rooms;
for (var i = 0; i < rooms.length; ++i) {
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js
index 3c28c52fbe..6864726ba4 100644
--- a/webclient/components/matrix/matrix-service.js
+++ b/webclient/components/matrix/matrix-service.js
@@ -130,8 +130,9 @@ angular.module('matrixService', [])
return doRequest("POST", path, undefined, req);
},
- // List all rooms joined or been invited to
- rooms: function(limit, feedback) {
+ // Get the user's current state: his presence, the list of his rooms with
+ // the last {limit} events
+ initialSync: function(limit, feedback) {
// The REST path spec
var path = "/initialSync";
--
GitLab