From 2aa79f4fbe64b8fe88dae5414cc7f81a851fbb23 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 31 Oct 2014 14:26:51 +0000 Subject: [PATCH 01/53] Added model-service.js to store model data. --- webclient/app.js | 1 + .../matrix/event-handler-service.js | 4 +- webclient/components/matrix/model-service.js | 98 +++++++++++++++++++ webclient/index.html | 1 + 4 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 webclient/components/matrix/model-service.js diff --git a/webclient/app.js b/webclient/app.js index c091f8c6cf..17b2bb6e8f 100644 --- a/webclient/app.js +++ b/webclient/app.js @@ -31,6 +31,7 @@ var matrixWebClient = angular.module('matrixWebClient', [ 'eventStreamService', 'eventHandlerService', 'notificationService', + 'modelService', 'infinite-scroll', 'ui.bootstrap', 'monospaced.elastic' diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index e63584510b..84b2a220e7 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -27,8 +27,8 @@ Typically, this service will store events or broadcast them to any listeners if typically all the $on method would do is update its own $scope. */ angular.module('eventHandlerService', []) -.factory('eventHandlerService', ['matrixService', '$rootScope', '$q', '$timeout', 'mPresence', 'notificationService', -function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService) { +.factory('eventHandlerService', ['matrixService', '$rootScope', '$q', '$timeout', 'mPresence', 'notificationService', 'modelService', +function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService, modelService) { var ROOM_CREATE_EVENT = "ROOM_CREATE_EVENT"; var MSG_EVENT = "MSG_EVENT"; var MEMBER_EVENT = "MEMBER_EVENT"; diff --git a/webclient/components/matrix/model-service.js b/webclient/components/matrix/model-service.js new file mode 100644 index 0000000000..c10e5185ad --- /dev/null +++ b/webclient/components/matrix/model-service.js @@ -0,0 +1,98 @@ +/* +Copyright 2014 OpenMarket Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +'use strict'; + +/* +This service serves as the entry point for all models in the app. If access to +underlying data in a room is required, then this service should be used as the +dependency. +*/ +// NB: This is more explicit than linking top-level models to $rootScope +// in that by adding this service as a dep you are clearly saying "this X +// needs access to the underlying data store", rather than polluting the +// $rootScope. +angular.module('modelService', []) +.factory('modelService', ['matrixService', function(matrixService) { + + /***** Room Object *****/ + var Room = function Room(room_id) { + this.room_id = room_id; + this.old_room_state = RoomState(); + this.current_room_state = RoomState(); + }; + Room.prototype = { + leave: function leave() { + return matrixService.leave(this.room_id); + } + }; + + /***** Room State Object *****/ + var RoomState = function RoomState() { + // list of RoomMember + this.members = []; + // state events, the key is a compound of event type + state_key + this.state_events = {}; + // earliest token + this.pagination_token = ""; + }; + RoomState.prototype = { + // get a state event for this room from this.state_events. State events + // are unique per type+state_key tuple, with a lot of events using 0-len + // state keys. To make it not Really Annoying to access, this method is + // provided which can just be given the type and it will return the + // 0-len event by default. + state: function state(type, state_key) { + if (!state_key) { + return this.state_events[type]; + } + return this.state_events[type + state_key]; + }, + + storeState: function storeState(event) { + this.state_events[event.type + event.state_key] = event; + } + }; + + /***** Room Member Object *****/ + var RoomMember = function RoomMember() { + this.event = {}; // the m.room.member event representing the RoomMember. + this.user = undefined; // the User + }; + + /***** User Object *****/ + var User = function User() { + this.event = {}; // the m.presence event representing the User. + }; + + // rooms are stored here when they come in. + var rooms = { + // roomid: + }; + + console.log("Models inited."); + + return { + + getRoom: function(roomId) { + if(!rooms[roomId]) { + rooms[roomId] = new Room(roomId); + } + return rooms[roomId]; + } + + }; +}]); diff --git a/webclient/index.html b/webclient/index.html index bc011a6c72..965981f7de 100644 --- a/webclient/index.html +++ b/webclient/index.html @@ -42,6 +42,7 @@ + From 394f77c3ff2d849b4ec69595f40ebfcc84ed1d31 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 31 Oct 2014 14:50:31 +0000 Subject: [PATCH 02/53] Parse /initialSync data and populate the new data structures. --- .../matrix/event-handler-service.js | 12 +++++++++ webclient/components/matrix/model-service.js | 25 ++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index 84b2a220e7..a8d89834ae 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -86,6 +86,18 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService } $rootScope.events.rooms[room_id].membership = room.membership; } + + // ========================================= + var __room = modelService.getRoom(room_id); + if (room) { // /initialSync data + __room.current_room_state.storeStateEvents(room.state); + __room.current_room_state.pagination_token = room.messages.end; + + __room.old_room_state.storeStateEvents(room.state); + __room.old_room_state.pagination_token = room.messages.start; + + __room.addMessages(room.messages.chunk); + } }; var resetRoomMessages = function(room_id) { diff --git a/webclient/components/matrix/model-service.js b/webclient/components/matrix/model-service.js index c10e5185ad..0ba23cb76a 100644 --- a/webclient/components/matrix/model-service.js +++ b/webclient/components/matrix/model-service.js @@ -31,10 +31,22 @@ angular.module('modelService', []) /***** Room Object *****/ var Room = function Room(room_id) { this.room_id = room_id; - this.old_room_state = RoomState(); - this.current_room_state = RoomState(); + this.old_room_state = new RoomState(); + this.current_room_state = new RoomState(); + this.messages = []; // events which can be displayed on the UI. TODO move? }; Room.prototype = { + addMessages: function addMessages(events, toFront) { + for (var i=0; i Date: Fri, 31 Oct 2014 15:16:43 +0000 Subject: [PATCH 03/53] Hook into more of event-handler-service and mimic its functions for now. --- .../matrix/event-handler-service.js | 164 +++++++++++------- webclient/components/matrix/model-service.js | 34 +++- 2 files changed, 130 insertions(+), 68 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index a8d89834ae..589554ec08 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -96,7 +96,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService __room.old_room_state.storeStateEvents(room.state); __room.old_room_state.pagination_token = room.messages.start; - __room.addMessages(room.messages.chunk); + __room.addMessageEvents(room.messages.chunk); } }; @@ -108,6 +108,26 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // Generic method to handle events data var handleRoomDateEvent = function(event, isLiveEvent, addToRoomMessages) { + var __room = modelService.getRoom(event.room_id); + if (addToRoomMessages) { + __room.addMessageEvent(event, !isLiveEvent); + } + if (isLiveEvent) { + __room.current_room_state.storeStateEvent(event); + } + else { + var eventTs = event.origin_server_ts; + var storedEvent = __room.current_room_state.getStateEvent(event.type, event.state_key); + if (storedEvent) { + if (storedEvent.origin_server_ts < eventTs) { + // the incoming event is newer, use it. + __room.current_room_state.storeStateEvent(event); + } + } + } + + // ===================================== + // Add topic changes as if they were a room message if (addToRoomMessages) { if (isLiveEvent) { @@ -144,6 +164,70 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService var handleRoomAliases = function(event, isLiveEvent) { matrixService.createRoomIdToAliasMapping(event.room_id, event.content.aliases[0]); }; + + var displayNotification = function(event) { + if (window.Notification && event.user_id != matrixService.config().user_id) { + var shouldBing = notificationService.containsBingWord( + matrixService.config().user_id, + matrixService.config().display_name, + matrixService.config().bingWords, + event.content.body + ); + + // Ideally we would notify only when the window is hidden (i.e. document.hidden = true). + // + // However, Chrome on Linux and OSX currently returns document.hidden = false unless the window is + // explicitly showing a different tab. So we need another metric to determine hiddenness - we + // simply use idle time. If the user has been idle enough that their presence goes to idle, then + // we also display notifs when things happen. + // + // This is far far better than notifying whenever anything happens anyway, otherwise you get spammed + // to death with notifications when the window is in the foreground, which is horrible UX (especially + // if you have not defined any bingers and so get notified for everything). + var isIdle = (document.hidden || matrixService.presence.unavailable === mPresence.getState()); + + // We need a way to let people get notifications for everything, if they so desire. The way to do this + // is to specify zero bingwords. + var bingWords = matrixService.config().bingWords; + if (bingWords === undefined || bingWords.length === 0) { + shouldBing = true; + } + + if (shouldBing && isIdle) { + console.log("Displaying notification for "+JSON.stringify(event)); + var member = getMember(event.room_id, event.user_id); + var displayname = getUserDisplayName(event.room_id, event.user_id); + + var message = event.content.body; + if (event.content.msgtype === "m.emote") { + message = "* " + displayname + " " + message; + } + else if (event.content.msgtype === "m.image") { + message = displayname + " sent an image."; + } + + var roomTitle = matrixService.getRoomIdToAliasMapping(event.room_id); + var theRoom = $rootScope.events.rooms[event.room_id]; + if (!roomTitle && theRoom && theRoom["m.room.name"] && theRoom["m.room.name"].content) { + roomTitle = theRoom["m.room.name"].content.name; + } + + if (!roomTitle) { + roomTitle = event.room_id; + } + + notificationService.showNotification( + displayname + " (" + roomTitle + ")", + message, + member ? member.avatar_url : undefined, + function() { + console.log("notification.onclick() room=" + event.room_id); + $rootScope.goToPage('room/' + event.room_id); + } + ); + } + } + }; var handleMessage = function(event, isLiveEvent) { // Check for empty event content @@ -156,6 +240,21 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // empty json object is a redacted event, so ignore. return; } + + // ======================= + + var __room = modelService.getRoom(event.room_id); + + if (event.user_id !== matrixService.config().user_id) { + __room.addMessageEvent(event, !isLiveEvent); + } + else { + // we may have locally echoed this, so we should replace the event + // instead of just adding. + __room.addOrReplaceMessageEvent(event, !isLiveEvent); + } + + // ======================= if (isLiveEvent) { if (event.user_id === matrixService.config().user_id && @@ -172,69 +271,10 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService } else { $rootScope.events.rooms[event.room_id].messages.push(event); + displayNotification(event); } - if (window.Notification && event.user_id != matrixService.config().user_id) { - var shouldBing = notificationService.containsBingWord( - matrixService.config().user_id, - matrixService.config().display_name, - matrixService.config().bingWords, - event.content.body - ); - - // Ideally we would notify only when the window is hidden (i.e. document.hidden = true). - // - // However, Chrome on Linux and OSX currently returns document.hidden = false unless the window is - // explicitly showing a different tab. So we need another metric to determine hiddenness - we - // simply use idle time. If the user has been idle enough that their presence goes to idle, then - // we also display notifs when things happen. - // - // This is far far better than notifying whenever anything happens anyway, otherwise you get spammed - // to death with notifications when the window is in the foreground, which is horrible UX (especially - // if you have not defined any bingers and so get notified for everything). - var isIdle = (document.hidden || matrixService.presence.unavailable === mPresence.getState()); - - // We need a way to let people get notifications for everything, if they so desire. The way to do this - // is to specify zero bingwords. - var bingWords = matrixService.config().bingWords; - if (bingWords === undefined || bingWords.length === 0) { - shouldBing = true; - } - - if (shouldBing && isIdle) { - console.log("Displaying notification for "+JSON.stringify(event)); - var member = getMember(event.room_id, event.user_id); - var displayname = getUserDisplayName(event.room_id, event.user_id); - - var message = event.content.body; - if (event.content.msgtype === "m.emote") { - message = "* " + displayname + " " + message; - } - else if (event.content.msgtype === "m.image") { - message = displayname + " sent an image."; - } - - var roomTitle = matrixService.getRoomIdToAliasMapping(event.room_id); - var theRoom = $rootScope.events.rooms[event.room_id]; - if (!roomTitle && theRoom && theRoom["m.room.name"] && theRoom["m.room.name"].content) { - roomTitle = theRoom["m.room.name"].content.name; - } - - if (!roomTitle) { - roomTitle = event.room_id; - } - - notificationService.showNotification( - displayname + " (" + roomTitle + ")", - message, - member ? member.avatar_url : undefined, - function() { - console.log("notification.onclick() room=" + event.room_id); - $rootScope.goToPage('room/' + event.room_id); - } - ); - } - } + } else { $rootScope.events.rooms[event.room_id].messages.unshift(event); diff --git a/webclient/components/matrix/model-service.js b/webclient/components/matrix/model-service.js index 0ba23cb76a..6e1576cd62 100644 --- a/webclient/components/matrix/model-service.js +++ b/webclient/components/matrix/model-service.js @@ -36,15 +36,33 @@ angular.module('modelService', []) this.messages = []; // events which can be displayed on the UI. TODO move? }; Room.prototype = { - addMessages: function addMessages(events, toFront) { + addMessageEvents: function addMessageEvents(events, toFront) { for (var i=0; i= 0; i--) { + var storedEvent = this.messages[i]; + if (storedEvent.event_id === event.event_id) { + // It's clobbering time! + this.messages[i] = event; + return; } } + this.addMessageEvent(event, toFront); }, leave: function leave() { @@ -81,6 +99,10 @@ angular.module('modelService', []) for (var i=0; i Date: Fri, 31 Oct 2014 16:22:15 +0000 Subject: [PATCH 04/53] room.html now displays messages from model-service. Add debugging fields. Hook up the room member *at the time* to the message so it can display the right historical member info. --- .../components/matrix/event-handler-service.js | 9 ++++++++- webclient/components/matrix/model-service.js | 16 ++++++++++------ webclient/index.html | 2 +- webclient/room/room-controller.js | 11 +++++++---- webclient/room/room.html | 10 +++++----- 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index 589554ec08..a511b394b8 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -96,7 +96,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService __room.old_room_state.storeStateEvents(room.state); __room.old_room_state.pagination_token = room.messages.start; - __room.addMessageEvents(room.messages.chunk); + $rootScope["debug_"+room_id] = __room; } }; @@ -589,6 +589,10 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // Store how far back we've paginated $rootScope.events.rooms[room_id].pagination.earliest_token = messages.end; + + var __room = modelService.getRoom(room_id); + __room.old_room_state.pagination_token = messages.end; + } else { // InitialSync returns messages in chronological order @@ -597,6 +601,9 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService } // Store where to start pagination $rootScope.events.rooms[room_id].pagination.earliest_token = messages.start; + + var __room = modelService.getRoom(room_id); + __room.old_room_state.pagination_token = messages.start; } }, diff --git a/webclient/components/matrix/model-service.js b/webclient/components/matrix/model-service.js index 6e1576cd62..d47ac6b2a9 100644 --- a/webclient/components/matrix/model-service.js +++ b/webclient/components/matrix/model-service.js @@ -33,7 +33,7 @@ angular.module('modelService', []) this.room_id = room_id; this.old_room_state = new RoomState(); this.current_room_state = new RoomState(); - this.messages = []; // events which can be displayed on the UI. TODO move? + this.events = []; // events which can be displayed on the UI. TODO move? }; Room.prototype = { addMessageEvents: function addMessageEvents(events, toFront) { @@ -43,22 +43,26 @@ angular.module('modelService', []) }, addMessageEvent: function addMessageEvent(event, toFront) { + // every message must reference the RoomMember which made it *at + // that time* so things like display names display correctly. if (toFront) { - this.messages.unshift(event); + event.room_member = this.old_room_state.getStateEvent("m.room.member", event.user_id); + this.events.unshift(event); } else { - this.messages.push(event); + event.room_member = this.current_room_state.getStateEvent("m.room.member", event.user_id); + this.events.push(event); } }, addOrReplaceMessageEvent: function addOrReplaceMessageEvent(event, toFront) { // Start looking from the tail since the first goal of this function // is to find a message among the latest ones - for (var i = this.messages.length - 1; i >= 0; i--) { - var storedEvent = this.messages[i]; + for (var i = this.events.length - 1; i >= 0; i--) { + var storedEvent = this.events[i]; if (storedEvent.event_id === event.event_id) { // It's clobbering time! - this.messages[i] = event; + this.events[i] = event; return; } } diff --git a/webclient/index.html b/webclient/index.html index 965981f7de..3ed968a5ea 100644 --- a/webclient/index.html +++ b/webclient/index.html @@ -13,7 +13,7 @@ - + diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index 486ead0da9..7125c98e02 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -15,8 +15,8 @@ limitations under the License. */ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) -.controller('RoomController', ['$modal', '$filter', '$scope', '$timeout', '$routeParams', '$location', '$rootScope', 'matrixService', 'mPresence', 'eventHandlerService', 'mFileUpload', 'matrixPhoneService', 'MatrixCall', 'notificationService', - function($modal, $filter, $scope, $timeout, $routeParams, $location, $rootScope, matrixService, mPresence, eventHandlerService, mFileUpload, matrixPhoneService, MatrixCall, notificationService) { +.controller('RoomController', ['$modal', '$filter', '$scope', '$timeout', '$routeParams', '$location', '$rootScope', 'matrixService', 'mPresence', 'eventHandlerService', 'mFileUpload', 'matrixPhoneService', 'MatrixCall', 'notificationService', 'modelService', + function($modal, $filter, $scope, $timeout, $routeParams, $location, $rootScope, matrixService, mPresence, eventHandlerService, mFileUpload, matrixPhoneService, MatrixCall, notificationService, modelService) { 'use strict'; var MESSAGES_PER_PAGINATION = 30; var THUMBNAIL_SIZE = 320; @@ -254,11 +254,11 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) $scope.state.paginating = true; } - console.log("paginateBackMessages from " + $rootScope.events.rooms[$scope.room_id].pagination.earliest_token + " for " + numItems); + console.log("paginateBackMessages from " + $scope.room.old_room_state.pagination_token + " for " + numItems); var originalTopRow = $("#messageTable>tbody>tr:first")[0]; // Paginate events from the point in cache - matrixService.paginateBackMessages($scope.room_id, $rootScope.events.rooms[$scope.room_id].pagination.earliest_token, numItems).then( + matrixService.paginateBackMessages($scope.room_id, $scope.room.old_room_state.pagination_token, numItems).then( function(response) { eventHandlerService.handleRoomMessages($scope.room_id, response.data, false, 'b'); @@ -717,6 +717,9 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) var onInit2 = function() { console.log("onInit2"); + // ============================= + $scope.room = modelService.getRoom($scope.room_id); + // ============================= // Scroll down as soon as possible so that we point to the last message // if it already exists in memory diff --git a/webclient/room/room.html b/webclient/room/room.html index 5265f42dd8..8c1e45dfd4 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -123,10 +123,10 @@ ng-style="{ 'visibility': state.messages_visibility }" keep-scroll> - +
-
{{ msg.user_id | mUserDisplayName: room_id }}
+
{{ msg.user_id | mUserDisplayName: room_id }}
{{ (msg.origin_server_ts) | date:'MMM d HH:mm' }} @@ -134,7 +134,7 @@
+ ng-hide="room.events[$index - 1].user_id === msg.user_id || msg.user_id === state.user_id"/>
@@ -204,7 +204,7 @@
+ ng-hide="room.events[$index - 1].user_id === msg.user_id || msg.user_id !== state.user_id"/>
From f21960ec9d346d53a21369b8179cc30365654517 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 31 Oct 2014 17:13:27 +0000 Subject: [PATCH 05/53] Replace lots of .events.rooms[room_id] with .room --- .../matrix/event-handler-service.js | 6 ++++++ webclient/components/matrix/model-service.js | 2 +- webclient/room/room-controller.js | 19 +++++++++---------- webclient/room/room.html | 11 ++++++----- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index a511b394b8..f8a91ee0ac 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -289,6 +289,8 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService }; var handleRoomMember = function(event, isLiveEvent, isStateEvent) { + var __room = modelService.getRoom(event.room_id); + // add membership changes as if they were a room message if something interesting changed // Exception: Do not do this if the event is a room state event because such events already come @@ -317,6 +319,9 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService else { $rootScope.events.rooms[event.room_id].messages.unshift(event); } + // ============ + + __room.addMessageEvent(event, !isLiveEvent); } } @@ -324,6 +329,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // Do not care of events that come when paginating back if (isStateEvent || isLiveEvent) { $rootScope.events.rooms[event.room_id].members[event.state_key] = event; + __room.current_room_state.members[event.state_key] = event; } $rootScope.$broadcast(MEMBER_EVENT, event, isLiveEvent, isStateEvent); diff --git a/webclient/components/matrix/model-service.js b/webclient/components/matrix/model-service.js index d47ac6b2a9..6167a84c62 100644 --- a/webclient/components/matrix/model-service.js +++ b/webclient/components/matrix/model-service.js @@ -77,7 +77,7 @@ angular.module('modelService', []) /***** Room State Object *****/ var RoomState = function RoomState() { // list of RoomMember - this.members = []; + this.members = {}; // state events, the key is a compound of event type + state_key this.state_events = {}; this.pagination_token = ""; diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index 7125c98e02..b5f2b60419 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -64,7 +64,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) return; }; - var nameEvent = $rootScope.events.rooms[$scope.room_id]['m.room.name']; + var nameEvent = $scope.room.current_room_state.state_events['m.room.name']; if (nameEvent) { $scope.name.newNameText = nameEvent.content.name; } @@ -105,7 +105,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) console.log("Warning: Already editing topic."); return; } - var topicEvent = $rootScope.events.rooms[$scope.room_id]['m.room.topic']; + var topicEvent = $scope.room.current_room_state.state_events['m.room.topic']; if (topicEvent) { $scope.topic.newTopicText = topicEvent.content.topic; } @@ -492,7 +492,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) var room_id = matrixService.getAliasToRoomIdMapping(room_alias); console.log("joining " + room_alias + " id=" + room_id); - if ($rootScope.events.rooms[room_id]) { + if ($scope.room) { // TODO actually check that you = join // don't send a join event for a room you're already in. $location.url("room/" + room_alias); } @@ -629,7 +629,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) }; $('#mainInput').val(''); - $rootScope.events.rooms[$scope.room_id].messages.push(echoMessage); + $scope.room.addMessageEvent(echoMessage); scrollToBottom(); } @@ -732,9 +732,9 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) var needsToJoin = true; // The room members is available in the data fetched by initialSync - if ($rootScope.events.rooms[$scope.room_id]) { + if ($scope.room) { - var messages = $rootScope.events.rooms[$scope.room_id].messages; + var messages = $scope.room.events; if (0 === messages.length || (1 === messages.length && "m.room.member" === messages[0].type && "invite" === messages[0].content.membership && $scope.state.user_id === messages[0].state_key)) { @@ -746,7 +746,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) $scope.state.first_pagination = false; } - var members = $rootScope.events.rooms[$scope.room_id].members; + var members = $scope.room.current_room_state.members; // Update the member list for (var i in members) { @@ -1042,8 +1042,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) state_key: "" }; - var stateFilter = $filter("stateEventsFilter"); - var stateEvents = stateFilter($scope.events.rooms[$scope.room_id]); + var stateEvents = $scope.room.current_room_state.state_events; // The modal dialog will 2-way bind this field, so we MUST make a deep // copy of the state events else we will be *actually adjusing our view // of the world* when fiddling with the JSON!! Apparently parse/stringify @@ -1062,7 +1061,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) console.log("Displaying modal dialog for >>>> " + JSON.stringify($scope.event_selected)); $scope.redact = function() { console.log("User level = "+$scope.pow($scope.room_id, $scope.state.user_id)+ - " Redact level = "+$scope.events.rooms[$scope.room_id]["m.room.ops_levels"].content.redact_level); + " Redact level = "+$scope.room.current_room_state.state_events["m.room.ops_levels"].content.redact_level); console.log("Redact event >> " + JSON.stringify($scope.event_selected)); $modalInstance.close("redact"); }; diff --git a/webclient/room/room.html b/webclient/room/room.html index 8c1e45dfd4..1cec8ac70b 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -6,7 +6,7 @@
@@ -18,7 +18,8 @@
- {{ key }} + {{ event.type }} + ({{event.state_key}})
{{ (event.origin_server_ts) | date:'MMM d HH:mm' }}
@@ -68,13 +69,13 @@
- -
+
- {{ events.rooms[room_id]['m.room.topic'].content.topic | limitTo: 200}} + {{ room.current_room_state.state_events['m.room.topic'].content.topic | limitTo: 200}}
From 5ab9929cbb3dd7b908011888e79fdb7bf54a5296 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 09:44:20 +0000 Subject: [PATCH 06/53] Prevent EventStreamService from knowing too much about the EventHandlerService by changing the contract to just be a single initialSync response callback. Leave it up the handler to deal with splitting out information from /initialSync. --- .../matrix/event-handler-service.js | 22 +++++++++++++++++-- .../components/matrix/event-stream-service.js | 19 ---------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index f8a91ee0ac..c11391a6da 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -613,9 +613,27 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService } }, - handleInitialSyncDone: function(initialSyncData) { + handleInitialSyncDone: function(response) { console.log("# handleInitialSyncDone"); - initialSyncDeferred.resolve(initialSyncData); + + var rooms = response.data.rooms; + for (var i = 0; i < rooms.length; ++i) { + var room = rooms[i]; + + this.initRoom(room); + + if ("messages" in room) { + this.handleRoomMessages(room.room_id, room.messages, false); + } + + if ("state" in room) { + this.handleEvents(room.state, false, true); + } + } + var presence = response.data.presence; + this.handleEvents(presence, false); + + initialSyncDeferred.resolve(response); }, // Returns a promise that resolves when the initialSync request has been processed diff --git a/webclient/components/matrix/event-stream-service.js b/webclient/components/matrix/event-stream-service.js index 05469a3ded..c03f0b953b 100644 --- a/webclient/components/matrix/event-stream-service.js +++ b/webclient/components/matrix/event-stream-service.js @@ -109,25 +109,6 @@ angular.module('eventStreamService', []) // without requiring to make an additional request matrixService.initialSync(30, false).then( function(response) { - var rooms = response.data.rooms; - for (var i = 0; i < rooms.length; ++i) { - var room = rooms[i]; - - eventHandlerService.initRoom(room); - - if ("messages" in room) { - eventHandlerService.handleRoomMessages(room.room_id, room.messages, false); - } - - if ("state" in room) { - eventHandlerService.handleEvents(room.state, false, true); - } - } - - var presence = response.data.presence; - eventHandlerService.handleEvents(presence, false); - - // Initial sync is done eventHandlerService.handleInitialSyncDone(response); // Start event streaming from that point From 395bb64b2677465cdb6bd2dc2d659dd59f583e8a Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 10:23:14 +0000 Subject: [PATCH 07/53] Keep matrixService stateless and make matrixFilter use modelService. --- .../matrix/event-handler-service.js | 21 +++++++ webclient/components/matrix/matrix-filter.js | 15 ++--- webclient/components/matrix/matrix-service.js | 57 +++++-------------- webclient/components/matrix/model-service.js | 5 +- webclient/room/room-controller.js | 10 ++-- 5 files changed, 54 insertions(+), 54 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index c11391a6da..dc00d83f33 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -705,6 +705,27 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService return getMember(room_id, user_id); }, + /** + * Return the power level of an user in a particular room + * @param {String} room_id the room id + * @param {String} user_id the user id + * @returns {Number} a value between 0 and 10 + */ + getUserPowerLevel: function(room_id, user_id) { + var powerLevel = 0; + var room = $rootScope.events.rooms[room_id]; + if (room && room["m.room.power_levels"]) { + if (user_id in room["m.room.power_levels"].content) { + powerLevel = room["m.room.power_levels"].content[user_id]; + } + else { + // Use the room default user power + powerLevel = room["m.room.power_levels"].content["default"]; + } + } + return powerLevel; + }, + /** * Return the display name of an user acccording to data already downloaded * @param {String} room_id the room id diff --git a/webclient/components/matrix/matrix-filter.js b/webclient/components/matrix/matrix-filter.js index 3d64a569a1..e4b42a2edb 100644 --- a/webclient/components/matrix/matrix-filter.js +++ b/webclient/components/matrix/matrix-filter.js @@ -19,23 +19,24 @@ angular.module('matrixFilter', []) // Compute the room name according to information we have -.filter('mRoomName', ['$rootScope', 'matrixService', 'eventHandlerService', function($rootScope, matrixService, eventHandlerService) { +.filter('mRoomName', ['$rootScope', 'matrixService', 'eventHandlerService', 'modelService', +function($rootScope, matrixService, eventHandlerService, modelService) { return function(room_id) { var roomName; // If there is an alias, use it // TODO: only one alias is managed for now var alias = matrixService.getRoomIdToAliasMapping(room_id); - - var room = $rootScope.events.rooms[room_id]; + var room = modelService.getRoom(room_id).current_room_state; + if (room) { // Get name from room state date - var room_name_event = room["m.room.name"]; + var room_name_event = room.state("m.room.name"); // Determine if it is a public room var isPublicRoom = false; - if (room["m.room.join_rules"] && room["m.room.join_rules"].content) { - isPublicRoom = ("public" === room["m.room.join_rules"].content.join_rule); + if (room.state("m.room.join_rules") && room.state("m.room.join_rules").content) { + isPublicRoom = ("public" === room.state("m.room.join_rules").content.join_rule); } if (room_name_event) { @@ -44,7 +45,7 @@ angular.module('matrixFilter', []) else if (alias) { roomName = alias; } - else if (room.members && !isPublicRoom) { // Do not rename public room + else if (room.members.length > 0 && !isPublicRoom) { // Do not rename public room var user_id = matrixService.config().user_id; // Else, build the name from its users diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js index 1840cf46c0..d089bf601c 100644 --- a/webclient/components/matrix/matrix-service.js +++ b/webclient/components/matrix/matrix-service.js @@ -724,57 +724,30 @@ angular.module('matrixService', []) //console.log("looking for roomId for " + alias + "; found: " + roomId); return roomId; }, - - /****** Power levels management ******/ - - /** - * Return the power level of an user in a particular room - * @param {String} room_id the room id - * @param {String} user_id the user id - * @returns {Number} a value between 0 and 10 - */ - getUserPowerLevel: function(room_id, user_id) { - var powerLevel = 0; - var room = $rootScope.events.rooms[room_id]; - if (room && room["m.room.power_levels"]) { - if (user_id in room["m.room.power_levels"].content) { - powerLevel = room["m.room.power_levels"].content[user_id]; - } - else { - // Use the room default user power - powerLevel = room["m.room.power_levels"].content["default"]; - } - } - return powerLevel; - }, /** * Change or reset the power level of a user * @param {String} room_id the room id * @param {String} user_id the user id - * @param {Number} powerLevel a value between 0 and 10 + * @param {Number} powerLevel The desired power level. * If undefined, the user power level will be reset, ie he will use the default room user power level + * @param event The existing m.room.power_levels event if one exists. * @returns {promise} an $http promise */ - setUserPowerLevel: function(room_id, user_id, powerLevel) { - - // Hack: currently, there is no home server API so do it by hand by updating - // the current m.room.power_levels of the room and send it to the server - var room = $rootScope.events.rooms[room_id]; - if (room && room["m.room.power_levels"]) { - var content = angular.copy(room["m.room.power_levels"].content); - content[user_id] = powerLevel; - - var path = "/rooms/$room_id/state/m.room.power_levels"; - path = path.replace("$room_id", encodeURIComponent(room_id)); - - return doRequest("PUT", path, undefined, content); + setUserPowerLevel: function(room_id, user_id, powerLevel, event) { + var content = {}; + if (event) { + // if there is an existing event, copy the content as it contains + // the power level values for other members which we do not want + // to modify. + content = angular.copy(event.content); } - - // The room does not exist or does not contain power_levels data - var deferred = $q.defer(); - deferred.reject({data:{error: "Invalid room: " + room_id}}); - return deferred.promise; + content[user_id] = powerLevel; + + var path = "/rooms/$room_id/state/m.room.power_levels"; + path = path.replace("$room_id", encodeURIComponent(room_id)); + + return doRequest("PUT", path, undefined, content); }, getTurnServer: function() { diff --git a/webclient/components/matrix/model-service.js b/webclient/components/matrix/model-service.js index 6167a84c62..26349f1461 100644 --- a/webclient/components/matrix/model-service.js +++ b/webclient/components/matrix/model-service.js @@ -89,8 +89,11 @@ angular.module('modelService', []) // provided which can just be given the type and it will return the // 0-len event by default. state: function state(type, state_key) { + if (!type) { + return undefined; // event type MUST be specified + } if (!state_key) { - return this.state_events[type]; + return this.state_events[type]; // treat as 0-len state key } return this.state_events[type + state_key]; }, diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index b5f2b60419..38158ffc74 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -404,7 +404,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) var updateUserPowerLevel = function(user_id) { var member = $scope.members[user_id]; if (member) { - member.powerLevel = matrixService.getUserPowerLevel($scope.room_id, user_id); + member.powerLevel = eventHandlerService.getUserPowerLevel($scope.room_id, user_id); normaliseMembersPowerLevels(); } @@ -576,7 +576,8 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) powerLevel = parseInt(matches[3]); } if (powerLevel !== NaN) { - promise = matrixService.setUserPowerLevel($scope.room_id, user_id, powerLevel); + var powerLevelEvent = $scope.room.current_room_state.state("m.room.power_levels"); + promise = matrixService.setUserPowerLevel($scope.room_id, user_id, powerLevel, powerLevelEvent); } } } @@ -591,7 +592,8 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) if (args) { var matches = args.match(/^(\S+)$/); if (matches) { - promise = matrixService.setUserPowerLevel($scope.room_id, args, undefined); + var powerLevelEvent = $scope.room.current_room_state.state("m.room.power_levels"); + promise = matrixService.setUserPowerLevel($scope.room_id, args, undefined, powerLevelEvent); } } @@ -1005,7 +1007,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) $scope.event_selected = content; // scope this so the template can check power levels and enable/disable // buttons - $scope.pow = matrixService.getUserPowerLevel; + $scope.pow = eventHandlerService.getUserPowerLevel; var modalInstance = $modal.open({ templateUrl: 'eventInfoTemplate.html', From 53da1099d132e96f9b4933a3eab1d34ba62c47d4 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 10:33:38 +0000 Subject: [PATCH 08/53] Make call stuff use modelService. --- webclient/app-controller.js | 6 +++--- webclient/components/matrix/matrix-call.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webclient/app-controller.js b/webclient/app-controller.js index e4b7cd286f..2d82a42cf8 100644 --- a/webclient/app-controller.js +++ b/webclient/app-controller.js @@ -21,8 +21,8 @@ limitations under the License. 'use strict'; angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'eventStreamService']) -.controller('MatrixWebClientController', ['$scope', '$location', '$rootScope', '$timeout', '$animate', 'matrixService', 'mPresence', 'eventStreamService', 'eventHandlerService', 'matrixPhoneService', - function($scope, $location, $rootScope, $timeout, $animate, matrixService, mPresence, eventStreamService, eventHandlerService, matrixPhoneService) { +.controller('MatrixWebClientController', ['$scope', '$location', '$rootScope', '$timeout', '$animate', 'matrixService', 'mPresence', 'eventStreamService', 'eventHandlerService', 'matrixPhoneService', 'modelService', + function($scope, $location, $rootScope, $timeout, $animate, matrixService, mPresence, eventStreamService, eventHandlerService, matrixPhoneService, modelService) { // Check current URL to avoid to display the logout button on the login page $scope.location = $location.path(); @@ -117,7 +117,7 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even return; } - var roomMembers = angular.copy($rootScope.events.rooms[$rootScope.currentCall.room_id].members); + var roomMembers = angular.copy(modelService.getRoom($rootScope.currentCall.room_id).current_room_state.members); delete roomMembers[matrixService.config().user_id]; $rootScope.currentCall.user_id = Object.keys(roomMembers)[0]; diff --git a/webclient/components/matrix/matrix-call.js b/webclient/components/matrix/matrix-call.js index 3e8811e5fc..5a2807c755 100644 --- a/webclient/components/matrix/matrix-call.js +++ b/webclient/components/matrix/matrix-call.js @@ -46,7 +46,7 @@ var isWebRTCSupported = function () { }; angular.module('MatrixCall', []) -.factory('MatrixCall', ['matrixService', 'matrixPhoneService', '$rootScope', '$timeout', function MatrixCallFactory(matrixService, matrixPhoneService, $rootScope, $timeout) { +.factory('MatrixCall', ['matrixService', 'matrixPhoneService', 'modelService', '$rootScope', '$timeout', function MatrixCallFactory(matrixService, matrixPhoneService, modelService, $rootScope, $timeout) { $rootScope.isWebRTCSupported = isWebRTCSupported(); var MatrixCall = function(room_id) { @@ -213,7 +213,7 @@ angular.module('MatrixCall', []) var self = this; - var roomMembers = $rootScope.events.rooms[this.room_id].members; + var roomMembers = modelService.getRoom(this.room_id).current_room_state.members; if (roomMembers[matrixService.config().user_id].membership != 'join') { console.log("We need to join the room before we can accept this call"); matrixService.join(this.room_id).then(function() { From 6bc1dc40208fd1c49591dbc8cb2b9a341b96f576 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 11:44:39 +0000 Subject: [PATCH 09/53] Make recents[controller/filter/html] use modelService. This breaks functionality whilst both events.rooms and modelService are in use. --- .../matrix/event-handler-service.js | 46 +++++++++++++------ webclient/components/matrix/model-service.js | 10 ++++ webclient/recents/recents-controller.js | 7 ++- webclient/recents/recents-filter.js | 16 +++++-- webclient/recents/recents.html | 12 ++--- 5 files changed, 66 insertions(+), 25 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index dc00d83f33..9d33b6715e 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -86,18 +86,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService } $rootScope.events.rooms[room_id].membership = room.membership; } - - // ========================================= - var __room = modelService.getRoom(room_id); - if (room) { // /initialSync data - __room.current_room_state.storeStateEvents(room.state); - __room.current_room_state.pagination_token = room.messages.end; - - __room.old_room_state.storeStateEvents(room.state); - __room.old_room_state.pagination_token = room.messages.start; - - $rootScope["debug_"+room_id] = __room; - } }; var resetRoomMessages = function(room_id) { @@ -621,12 +609,44 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService var room = rooms[i]; this.initRoom(room); + + // FIXME: This is ming: the HS should be sending down the m.room.member + // event for the invite in .state but it isn't, so fudge it for now. + if (room.inviter && room.membership === "invite") { + var me = matrixService.config().user_id; + var fakeEvent = { + event_id: "__FAKE__" + room.room_id, + user_id: room.inviter, + origin_server_ts: 0, + room_id: room.room_id, + state_key: me, + type: "m.room.member", + content: { + membership: "invite" + } + }; + if (!room.state) { + room.state = []; + } + room.state.push(fakeEvent); + console.log("RECV /initialSync invite >> "+JSON.stringify(fakeEvent)); + } + + // ========================================= + var __room = modelService.getRoom(room.room_id); + __room.current_room_state.storeStateEvents(room.state); + __room.old_room_state.storeStateEvents(room.state); + + + if ("messages" in room) { this.handleRoomMessages(room.room_id, room.messages, false); + __room.current_room_state.pagination_token = room.messages.end; + __room.old_room_state.pagination_token = room.messages.start; } - if ("state" in room) { + if ("state" in room) { // TODO FIXME remove this. this.handleEvents(room.state, false, true); } } diff --git a/webclient/components/matrix/model-service.js b/webclient/components/matrix/model-service.js index 26349f1461..ff6abfe422 100644 --- a/webclient/components/matrix/model-service.js +++ b/webclient/components/matrix/model-service.js @@ -100,9 +100,15 @@ angular.module('modelService', []) storeStateEvent: function storeState(event) { this.state_events[event.type + event.state_key] = event; + if (event.type === "m.room.member") { + this.members[event.state_key] = event; + } }, storeStateEvents: function storeState(events) { + if (!events) { + return; + } for (var i=0; i - - From 92e2ff49853922a5e81ac67ccf1a95f2278d5415 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 13:48:08 +0000 Subject: [PATCH 12/53] Fix bug which prevented room name invites appearing correctly. --- .../matrix/event-handler-service.js | 4 +- webclient/components/matrix/matrix-filter.js | 125 ++++++------------ webclient/recents/recents.html | 2 +- 3 files changed, 46 insertions(+), 85 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index 953ce839ea..a872e3f435 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -408,7 +408,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService } } console.log("Unable to handle event type " + event.type); - console.log(JSON.stringify(event, undefined, 4)); + // console.log(JSON.stringify(event, undefined, 4)); break; } } @@ -475,7 +475,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService room.state = []; } room.state.push(fakeEvent); - console.log("RECV /initialSync invite >> "+JSON.stringify(fakeEvent)); + console.log("RECV /initialSync invite >> "+room.room_id); } // ========================================= diff --git a/webclient/components/matrix/matrix-filter.js b/webclient/components/matrix/matrix-filter.js index e4b42a2edb..4d264e93f3 100644 --- a/webclient/components/matrix/matrix-filter.js +++ b/webclient/components/matrix/matrix-filter.js @@ -19,6 +19,8 @@ angular.module('matrixFilter', []) // Compute the room name according to information we have +// TODO: It would be nice if this was stateless and had no dependencies. That would +// make the business logic here a lot easier to see. .filter('mRoomName', ['$rootScope', 'matrixService', 'eventHandlerService', 'modelService', function($rootScope, matrixService, eventHandlerService, modelService) { return function(room_id) { @@ -29,93 +31,60 @@ function($rootScope, matrixService, eventHandlerService, modelService) { var alias = matrixService.getRoomIdToAliasMapping(room_id); var room = modelService.getRoom(room_id).current_room_state; - if (room) { - // Get name from room state date - var room_name_event = room.state("m.room.name"); + var room_name_event = room.state("m.room.name"); - // Determine if it is a public room - var isPublicRoom = false; - if (room.state("m.room.join_rules") && room.state("m.room.join_rules").content) { - isPublicRoom = ("public" === room.state("m.room.join_rules").content.join_rule); - } + // Determine if it is a public room + var isPublicRoom = false; + if (room.state("m.room.join_rules") && room.state("m.room.join_rules").content) { + isPublicRoom = ("public" === room.state("m.room.join_rules").content.join_rule); + } - if (room_name_event) { - roomName = room_name_event.content.name; - } - else if (alias) { - roomName = alias; - } - else if (room.members.length > 0 && !isPublicRoom) { // Do not rename public room + if (room_name_event) { + roomName = room_name_event.content.name; + } + else if (alias) { + roomName = alias; + } + else if (Object.keys(room.members).length > 0 && !isPublicRoom) { // Do not rename public room + var user_id = matrixService.config().user_id; - var user_id = matrixService.config().user_id; - // Else, build the name from its users - // Limit the room renaming to 1:1 room - if (2 === Object.keys(room.members).length) { - for (var i in room.members) { - if (!room.members.hasOwnProperty(i)) continue; + // this is a "one to one" room and should have the name of the other user. + if (Object.keys(room.members).length === 2) { + for (var i in room.members) { + if (!room.members.hasOwnProperty(i)) continue; - var member = room.members[i]; - if (member.state_key !== user_id) { - roomName = eventHandlerService.getUserDisplayName(room_id, member.state_key); - break; - } + var member = room.members[i]; + if (member.state_key !== user_id) { + roomName = eventHandlerService.getUserDisplayName(room_id, member.state_key); + break; } } - else if (Object.keys(room.members).length <= 1) { - - var otherUserId; - - if (Object.keys(room.members)[0]) { - otherUserId = Object.keys(room.members)[0]; - // this could be an invite event (from event stream) - if (otherUserId === user_id && - room.members[user_id].content.membership === "invite") { - // this is us being invited to this room, so the - // *user_id* is the other user ID and not the state - // key. - otherUserId = room.members[user_id].user_id; - } + } + else if (Object.keys(room.members).length === 1) { + // this could be just us (self-chat) or could be the other person + // in a room if they have invited us to the room. Find out which. + var otherUserId = Object.keys(room.members)[0]; + if (otherUserId === user_id) { + // it's us, we may have been invited to this room or it could + // be a self chat. + if (room.members[otherUserId].content.membership === "invite") { + // someone invited us, use the right ID. + roomName = eventHandlerService.getUserDisplayName(room_id, room.members[otherUserId].user_id); } else { - // it's got to be an invite, or failing that a self-chat; - otherUserId = room.inviter || user_id; -/* - // XXX: This should all be unnecessary now thanks to using the /rooms//roomid API - - // The other member may be in the invite list, get all invited users - var invitedUserIDs = []; - - // XXX: *SURELY* we shouldn't have to trawl through the whole messages list to - // find invite - surely the other user should be in room.members with state invited? :/ --Matthew - for (var i in room.messages) { - var message = room.messages[i]; - if ("m.room.member" === message.type && "invite" === message.content.membership) { - // Filter out the current user - var member_id = message.state_key; - if (member_id === user_id) { - member_id = message.user_id; - } - if (member_id !== user_id) { - // Make sure there is no duplicate user - if (-1 === invitedUserIDs.indexOf(member_id)) { - invitedUserIDs.push(member_id); - } - } - } - } - - // For now, only 1:1 room needs to be renamed. It means only 1 invited user - if (1 === invitedUserIDs.length) { - otherUserId = invitedUserIDs[0]; - } -*/ + roomName = eventHandlerService.getUserDisplayName(room_id, otherUserId); } - - // Get the user display name + } + else { // it isn't us, so use their name if we know it. roomName = eventHandlerService.getUserDisplayName(room_id, otherUserId); } } + else if (Object.keys(room.members).length === 0) { + // this shouldn't be possible + console.error("0 members in room >> " + room_id); + } } + // Always show the alias in the room displayed name if (roomName && alias && alias !== roomName) { @@ -125,14 +94,6 @@ function($rootScope, matrixService, eventHandlerService, modelService) { if (undefined === roomName) { // By default, use the room ID roomName = room_id; - - // XXX: this is *INCREDIBLY* heavy logging for a function that calls every single - // time any kind of digest runs which refreshes a room name... - // commenting it out for now. - - // Log some information that lead to this leak - // console.log("Room ID leak for " + room_id); - // console.log("room object: " + JSON.stringify(room, undefined, 4)); } return roomName; diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html index a11e6be532..7297e23703 100644 --- a/webclient/recents/recents.html +++ b/webclient/recents/recents.html @@ -27,7 +27,7 @@
+ {{ room.room_id | mRoomName }} - {{ room.numUsersInRoom || '1' }} {{ room.numUsersInRoom == 1 ? 'user' : 'users' }} + {{ room.recent.numUsersInRoom || '1' }} {{ room.recent.numUsersInRoom == 1 ? 'user' : 'users' }} @@ -27,11 +27,11 @@
-
- {{ room.inviter | mUserDisplayName: room.room_id }} invited you +
+ {{ room.recent.inviter | mUserDisplayName: room.room_id }} invited you
-
+
From fd535183eed4b2262109f90a9f29fe9e49b4b9a0 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 12:18:22 +0000 Subject: [PATCH 10/53] Remove events.rooms[room_id] entirely from event-handler-service. Everything now uses modelService, but there are still one or two minor teething problems to fix. --- .../matrix/event-handler-service.js | 275 +++--------------- webclient/components/matrix/model-service.js | 11 + webclient/home/home-controller.js | 1 - webclient/recents/recents-filter.js | 4 +- 4 files changed, 59 insertions(+), 232 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index 9d33b6715e..00e3edf184 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -50,57 +50,28 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService var reset = function() { initialSyncDeferred = $q.defer(); - - $rootScope.events = { - rooms: {} // will contain roomId: { messages:[], members:{userid1: event} } - }; - + $rootScope.presence = {}; eventMap = {}; }; reset(); - var initRoom = function(room_id, room) { - if (!(room_id in $rootScope.events.rooms)) { - console.log("Creating new rooms entry for " + room_id); - $rootScope.events.rooms[room_id] = { - room_id: room_id, - messages: [], - members: {}, - // Pagination information - pagination: { - earliest_token: "END" // how far back we've paginated - } - }; - } - - if (room) { // we got an existing room object from initialsync, seemingly. - // Report all other metadata of the room object (membership, inviter, visibility, ...) - for (var field in room) { - if (!room.hasOwnProperty(field)) continue; - - if (-1 === ["room_id", "messages", "state"].indexOf(field)) { // why indexOf - why not ===? --Matthew - $rootScope.events.rooms[room_id][field] = room[field]; - } - } - $rootScope.events.rooms[room_id].membership = room.membership; - } - }; - var resetRoomMessages = function(room_id) { - if ($rootScope.events.rooms[room_id]) { - $rootScope.events.rooms[room_id].messages = []; - } + var room = modelService.getRoom(room_id); + room.events = []; }; // Generic method to handle events data - var handleRoomDateEvent = function(event, isLiveEvent, addToRoomMessages) { + var handleRoomStateEvent = function(event, isLiveEvent, addToRoomMessages) { var __room = modelService.getRoom(event.room_id); if (addToRoomMessages) { + // some state events are displayed as messages, so add them. __room.addMessageEvent(event, !isLiveEvent); } + if (isLiveEvent) { + // update the current room state with the latest state __room.current_room_state.storeStateEvent(event); } else { @@ -113,39 +84,10 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService } } } - - // ===================================== - - // Add topic changes as if they were a room message - if (addToRoomMessages) { - if (isLiveEvent) { - $rootScope.events.rooms[event.room_id].messages.push(event); - } - else { - $rootScope.events.rooms[event.room_id].messages.unshift(event); - } - } - - // live events always update, but non-live events only update if the - // ts is later. - var latestData = true; - if (!isLiveEvent) { - var eventTs = event.origin_server_ts; - var storedEvent = $rootScope.events.rooms[event.room_id][event.type]; - if (storedEvent) { - if (storedEvent.origin_server_ts > eventTs) { - // ignore it, we have a newer one already. - latestData = false; - } - } - } - if (latestData) { - $rootScope.events.rooms[event.room_id][event.type] = event; - } + // TODO: handle old_room_state }; var handleRoomCreate = function(event, isLiveEvent) { - // For now, we do not use the event data. Simply signal it to the app controllers $rootScope.$broadcast(ROOM_CREATE_EVENT, event, isLiveEvent); }; @@ -183,7 +125,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService if (shouldBing && isIdle) { console.log("Displaying notification for "+JSON.stringify(event)); - var member = getMember(event.room_id, event.user_id); + var member = modelService.getMember(event.room_id, event.user_id); var displayname = getUserDisplayName(event.room_id, event.user_id); var message = event.content.body; @@ -195,9 +137,9 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService } var roomTitle = matrixService.getRoomIdToAliasMapping(event.room_id); - var theRoom = $rootScope.events.rooms[event.room_id]; - if (!roomTitle && theRoom && theRoom["m.room.name"] && theRoom["m.room.name"].content) { - roomTitle = theRoom["m.room.name"].content.name; + var theRoom = modelService.getRoom(event.room_id); + if (!roomTitle && theRoom.current_room_state.state("m.room.name") && theRoom.current_room_state.state("m.room.name").content) { + roomTitle = theRoom.current_room_state.state("m.room.name").content.name; } if (!roomTitle) { @@ -235,6 +177,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService if (event.user_id !== matrixService.config().user_id) { __room.addMessageEvent(event, !isLiveEvent); + displayNotification(event); } else { // we may have locally echoed this, so we should replace the event @@ -242,37 +185,8 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService __room.addOrReplaceMessageEvent(event, !isLiveEvent); } - // ======================= - - if (isLiveEvent) { - if (event.user_id === matrixService.config().user_id && - (event.content.msgtype === "m.text" || event.content.msgtype === "m.emote") ) { - // Assume we've already echoed it. So, there is a fake event in the messages list of the room - // Replace this fake event by the true one - var index = getRoomEventIndex(event.room_id, event.event_id); - if (index) { - $rootScope.events.rooms[event.room_id].messages[index] = event; - } - else { - $rootScope.events.rooms[event.room_id].messages.push(event); - } - } - else { - $rootScope.events.rooms[event.room_id].messages.push(event); - displayNotification(event); - } - - - } - else { - $rootScope.events.rooms[event.room_id].messages.unshift(event); - } - // TODO send delivery receipt if isLiveEvent - // $broadcast this, as controllers may want to do funky things such as - // scroll to the bottom, etc which cannot be expressed via simple $scope - // updates. $rootScope.$broadcast(MSG_EVENT, event, isLiveEvent); }; @@ -284,6 +198,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // Exception: Do not do this if the event is a room state event because such events already come // as room messages events. Moreover, when they come as room messages events, they are relatively ordered // with other other room messages + // FIXME this isn't true anymore, work out what this is doing. if (!isStateEvent) { // could be a membership change, display name change, etc. // Find out which one. @@ -301,14 +216,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // If there was a change we want to display, dump it in the message // list. if (memberChanges) { - if (isLiveEvent) { - $rootScope.events.rooms[event.room_id].messages.push(event); - } - else { - $rootScope.events.rooms[event.room_id].messages.unshift(event); - } - // ============ - __room.addMessageEvent(event, !isLiveEvent); } } @@ -316,7 +223,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // Use data from state event or the latest data from the stream. // Do not care of events that come when paginating back if (isStateEvent || isLiveEvent) { - $rootScope.events.rooms[event.room_id].members[event.state_key] = event; __room.current_room_state.members[event.state_key] = event; } @@ -329,30 +235,28 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService }; var handlePowerLevels = function(event, isLiveEvent) { - // Keep the latest data. Do not care of events that come when paginating back - if (!$rootScope.events.rooms[event.room_id][event.type] || isLiveEvent) { - $rootScope.events.rooms[event.room_id][event.type] = event; - $rootScope.$broadcast(POWERLEVEL_EVENT, event, isLiveEvent); - } + handleRoomStateEvent(event, isLiveEvent); + $rootScope.$broadcast(POWERLEVEL_EVENT, event, isLiveEvent); }; var handleRoomName = function(event, isLiveEvent, isStateEvent) { console.log("handleRoomName room_id: " + event.room_id + " - isLiveEvent: " + isLiveEvent + " - name: " + event.content.name); - handleRoomDateEvent(event, isLiveEvent, !isStateEvent); + handleRoomStateEvent(event, isLiveEvent, !isStateEvent); $rootScope.$broadcast(NAME_EVENT, event, isLiveEvent); }; var handleRoomTopic = function(event, isLiveEvent, isStateEvent) { console.log("handleRoomTopic room_id: " + event.room_id + " - isLiveEvent: " + isLiveEvent + " - topic: " + event.content.topic); - handleRoomDateEvent(event, isLiveEvent, !isStateEvent); + handleRoomStateEvent(event, isLiveEvent, !isStateEvent); $rootScope.$broadcast(TOPIC_EVENT, event, isLiveEvent); }; var handleCallEvent = function(event, isLiveEvent) { $rootScope.$broadcast(CALL_EVENT, event, isLiveEvent); if (event.type === 'm.call.invite') { - $rootScope.events.rooms[event.room_id].messages.push(event); + var __room = modelService.getRoom(event.room_id); + __room.addMessageEvent(event, !isLiveEvent); } }; @@ -366,8 +270,9 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // we need to remove something possibly: do we know the redacted // event ID? if (eventMap[event.redacts]) { + var __room = modelService.getRoom(event.room_id); // remove event from list of messages in this room. - var eventList = $rootScope.events.rooms[event.room_id].messages; + var eventList = __room.events; for (var i=0; i 0; i--) { - var message = room.messages[i]; - if (event_id === message.event_id) { - index = i; - break; - } - } - } - return index; - }; - - /** - * Get the member object of a room member - * @param {String} room_id the room id - * @param {String} user_id the id of the user - * @returns {undefined | Object} the member object of this user in this room if he is part of the room - */ - var getMember = function(room_id, user_id) { - var member; - - var room = $rootScope.events.rooms[room_id]; - if (room) { - member = room.members[user_id]; - } - return member; - }; /** * Return the display name of an user acccording to data already downloaded @@ -431,17 +295,17 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService var displayName; // Get the user display name from the member list of the room - var member = getMember(room_id, user_id); + var member = modelService.getMember(room_id, user_id); if (member && member.content.displayname) { // Do not consider null displayname displayName = member.content.displayname; // Disambiguate users who have the same displayname in the room if (user_id !== matrixService.config().user_id) { - var room = $rootScope.events.rooms[room_id]; + var room = modelService.getRoom(room_id); - for (var member_id in room.members) { - if (room.members.hasOwnProperty(member_id) && member_id !== user_id) { - var member2 = room.members[member_id]; + for (var member_id in room.current_room_state.members) { + if (room.current_room_state.members.hasOwnProperty(member_id) && member_id !== user_id) { + var member2 = room.current_room_state.members[member_id]; if (member2.content.displayname && member2.content.displayname === displayName) { displayName = displayName + " (" + user_id + ")"; break; @@ -479,19 +343,9 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService reset(); $rootScope.$broadcast(RESET_EVENT); }, - - initRoom: function(room) { - initRoom(room.room_id, room); - }, handleEvent: function(event, isLiveEvent, isStateEvent) { - // 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 - if (event.room_id) { - initRoom(event.room_id); - } - // Avoid duplicated events // Needed for rooms where initialSync has not been done. // In this case, we do not know where to start pagination. So, it starts from the END @@ -550,7 +404,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // displays on the Room Info screen. if (typeof(event.state_key) === "string") { // incls. 0-len strings if (event.room_id) { - handleRoomDateEvent(event, isLiveEvent, false); + handleRoomStateEvent(event, isLiveEvent, false); } } console.log("Unable to handle event type " + event.type); @@ -570,8 +424,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // Handle messages from /initialSync or /messages handleRoomMessages: function(room_id, messages, isLiveEvents, dir) { - initRoom(room_id); - var events = messages.chunk; // Handles messages according to their time order @@ -582,8 +434,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService } // Store how far back we've paginated - $rootScope.events.rooms[room_id].pagination.earliest_token = messages.end; - var __room = modelService.getRoom(room_id); __room.old_room_state.pagination_token = messages.end; @@ -594,8 +444,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService this.handleEvent(events[i], isLiveEvents, isLiveEvents); } // Store where to start pagination - $rootScope.events.rooms[room_id].pagination.earliest_token = messages.start; - var __room = modelService.getRoom(room_id); __room.old_room_state.pagination_token = messages.start; } @@ -607,8 +455,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService var rooms = response.data.rooms; for (var i = 0; i < rooms.length; ++i) { var room = rooms[i]; - - this.initRoom(room); // FIXME: This is ming: the HS should be sending down the m.room.member // event for the invite in .state but it isn't, so fudge it for now. @@ -636,9 +482,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService var __room = modelService.getRoom(room.room_id); __room.current_room_state.storeStateEvents(room.state); __room.old_room_state.storeStateEvents(room.state); - - - if ("messages" in room) { this.handleRoomMessages(room.room_id, room.messages, false); @@ -674,15 +517,13 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService 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]; + 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; - } + if (!filterEcho || undefined === message.echo_msg_state) { + lastMessage = message; + break; } } @@ -697,34 +538,22 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService getUsersCountInRoom: function(room_id) { var memberCount; - var room = $rootScope.events.rooms[room_id]; - if (room) { - memberCount = 0; + var room = modelService.getRoom(room_id); + memberCount = 0; - for (var i in room.members) { - if (!room.members.hasOwnProperty(i)) continue; + for (var i in room.current_room_state.members) { + if (!room.current_room_state.members.hasOwnProperty(i)) continue; - var member = room.members[i]; + var member = room.current_room_state.members[i]; - if ("join" === member.membership) { - memberCount = memberCount + 1; - } + if ("join" === member.membership) { + memberCount = memberCount + 1; } } return memberCount; }, - /** - * Get the member object of a room member - * @param {String} room_id the room id - * @param {String} user_id the id of the user - * @returns {undefined | Object} the member object of this user in this room if he is part of the room - */ - getMember: function(room_id, user_id) { - return getMember(room_id, user_id); - }, - /** * Return the power level of an user in a particular room * @param {String} room_id the room id @@ -733,14 +562,14 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService */ getUserPowerLevel: function(room_id, user_id) { var powerLevel = 0; - var room = $rootScope.events.rooms[room_id]; - if (room && room["m.room.power_levels"]) { - if (user_id in room["m.room.power_levels"].content) { - powerLevel = room["m.room.power_levels"].content[user_id]; + var room = modelService.getRoom(room_id).current_room_state; + if (room.state("m.room.power_levels")) { + if (user_id in room.state("m.room.power_levels").content) { + powerLevel = room.state("m.room.power_levels").content[user_id]; } else { // Use the room default user power - powerLevel = room["m.room.power_levels"].content["default"]; + powerLevel = room.state("m.room.power_levels").content["default"]; } } return powerLevel; @@ -754,18 +583,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService */ getUserDisplayName: function(room_id, user_id) { return getUserDisplayName(room_id, user_id); - }, - - setRoomVisibility: function(room_id, visible) { - if (!visible) { - return; - } - initRoom(room_id); - - var room = $rootScope.events.rooms[room_id]; - if (room) { - room.visibility = visible; - } } }; }]); diff --git a/webclient/components/matrix/model-service.js b/webclient/components/matrix/model-service.js index ff6abfe422..d5acd7eda9 100644 --- a/webclient/components/matrix/model-service.js +++ b/webclient/components/matrix/model-service.js @@ -148,6 +148,17 @@ angular.module('modelService', []) getRooms: function() { return rooms; + }, + + /** + * Get the member object of a room member + * @param {String} room_id the room id + * @param {String} user_id the id of the user + * @returns {undefined | Object} the member object of this user in this room if he is part of the room + */ + getMember: function(room_id, user_id) { + var room = this.getRoom(room_id); + return room.current_room_state.members[user_id]; } }; diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js index f1295560ef..3a48e64ab4 100644 --- a/webclient/home/home-controller.js +++ b/webclient/home/home-controller.js @@ -58,7 +58,6 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen // Add room_alias & room_display_name members angular.extend(room, matrixService.getRoomAliasAndDisplayName(room)); - eventHandlerService.setRoomVisibility(room.room_id, "public"); } } ); diff --git a/webclient/recents/recents-filter.js b/webclient/recents/recents-filter.js index cf0f53f37d..acd9f86ece 100644 --- a/webclient/recents/recents-filter.js +++ b/webclient/recents/recents-filter.js @@ -17,7 +17,7 @@ 'use strict'; angular.module('RecentsController') -.filter('orderRecents', ["matrixService", "eventHandlerService", function(matrixService, eventHandlerService) { +.filter('orderRecents', ["matrixService", "eventHandlerService", "modelService", function(matrixService, eventHandlerService, modelService) { return function(rooms) { var user_id = matrixService.config().user_id; @@ -29,7 +29,7 @@ angular.module('RecentsController') var meEvent = room.current_room_state.state("m.room.member", user_id); // 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 = eventHandlerService.getMember(room_id, user_id); + var member = modelService.getMember(room_id, user_id); room.recent.me = member; if (member && ("invite" === member.membership || "join" === member.membership)) { if ("invite" === member.membership) { From 9b1ca64a75160b44106d5a7b4ddc96a009f56012 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 13:26:50 +0000 Subject: [PATCH 11/53] Fix bug which prevented the number of users being visible on the recents view. --- webclient/components/matrix/event-handler-service.js | 3 +-- webclient/recents/recents-filter.js | 4 ++-- webclient/recents/recents.html | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index 00e3edf184..953ce839ea 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -540,13 +540,12 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService var room = modelService.getRoom(room_id); memberCount = 0; - for (var i in room.current_room_state.members) { if (!room.current_room_state.members.hasOwnProperty(i)) continue; var member = room.current_room_state.members[i]; - if ("join" === member.membership) { + if ("join" === member.content.membership) { memberCount = memberCount + 1; } } diff --git a/webclient/recents/recents-filter.js b/webclient/recents/recents-filter.js index acd9f86ece..db7fc5e4ee 100644 --- a/webclient/recents/recents-filter.js +++ b/webclient/recents/recents-filter.js @@ -31,8 +31,8 @@ angular.module('RecentsController') // (ie, do not show it if he has been banned) var member = modelService.getMember(room_id, user_id); room.recent.me = member; - if (member && ("invite" === member.membership || "join" === member.membership)) { - if ("invite" === member.membership) { + if (member && ("invite" === member.content.membership || "join" === member.content.membership)) { + if ("invite" === member.content.membership) { room.recent.inviter = member.user_id; } // Count users here diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html index 2a633ebe24..a11e6be532 100644 --- a/webclient/recents/recents.html +++ b/webclient/recents/recents.html @@ -9,7 +9,7 @@ {{ room.room_id | mRoomName }}
- + {{ room.recent.numUsersInRoom || '1' }} {{ room.recent.numUsersInRoom == 1 ? 'user' : 'users' }}
-
+
{{ room.recent.inviter | mUserDisplayName: room.room_id }} invited you
From f4e50079dea15f25a6d1ce03c5bf9f0608ecd45d Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 14:22:09 +0000 Subject: [PATCH 13/53] Fix bug which prevented pagination from bumping the list down, causing infini-pagination. --- webclient/room/room.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webclient/room/room.html b/webclient/room/room.html index 1cec8ac70b..8b5be66cf5 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -124,7 +124,7 @@ ng-style="{ 'visibility': state.messages_visibility }" keep-scroll> -
{{ msg.user_id | mUserDisplayName: room_id }}
From 7614d8f87a445aae48ea7869f72070796218bcee Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 15:02:16 +0000 Subject: [PATCH 14/53] Fix hidden event keys being incorrectly shown in the even info dialog. --- webclient/room/room-controller.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index 38158ffc74..0bcc33ab4f 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -1004,7 +1004,11 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) }; $scope.openJson = function(content) { - $scope.event_selected = content; + $scope.event_selected = angular.copy(content); + + // FIXME: Pre-calculated event data should be stripped in a nicer way. + $scope.event_selected.room_member = undefined; + // scope this so the template can check power levels and enable/disable // buttons $scope.pow = eventHandlerService.getUserPowerLevel; From 1071d063ab92a882eaacf71dfe05f580c65f6b75 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 15:05:35 +0000 Subject: [PATCH 15/53] Fix broken redact enable logic. --- webclient/room/room.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webclient/room/room.html b/webclient/room/room.html index 8b5be66cf5..3f4c4c57b6 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -6,7 +6,7 @@
From f3dbcdc7b31f693096407f9bfad0f7c2aa9b66c5 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 15:17:32 +0000 Subject: [PATCH 16/53] Variable renaming, general cleanup. Don't feed state events from /initialSync twice. --- .../matrix/event-handler-service.js | 61 +++++++++---------- webclient/recents/recents-filter.js | 6 +- 2 files changed, 29 insertions(+), 38 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index a872e3f435..7f53429754 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -22,9 +22,8 @@ not care where the event came from, it only needs enough context to be able to process them. Events may be coming from the event stream, the REST API (via direct GETs or via a pagination stream API), etc. -Typically, this service will store events or broadcast them to any listeners -(e.g. controllers) via $broadcast. Alternatively, it may update the $rootScope -if typically all the $on method would do is update its own $scope. +Typically, this service will store events and broadcast them to any listeners +(e.g. controllers) via $broadcast. */ angular.module('eventHandlerService', []) .factory('eventHandlerService', ['matrixService', '$rootScope', '$q', '$timeout', 'mPresence', 'notificationService', 'modelService', @@ -44,6 +43,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // of the app, given we never try to reap memory yet) var eventMap = {}; + // TODO: Remove this and replace with modelService.User objects. $rootScope.presence = {}; var initialSyncDeferred; @@ -64,23 +64,23 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // Generic method to handle events data var handleRoomStateEvent = function(event, isLiveEvent, addToRoomMessages) { - var __room = modelService.getRoom(event.room_id); + var room = modelService.getRoom(event.room_id); if (addToRoomMessages) { // some state events are displayed as messages, so add them. - __room.addMessageEvent(event, !isLiveEvent); + room.addMessageEvent(event, !isLiveEvent); } if (isLiveEvent) { // update the current room state with the latest state - __room.current_room_state.storeStateEvent(event); + room.current_room_state.storeStateEvent(event); } else { var eventTs = event.origin_server_ts; - var storedEvent = __room.current_room_state.getStateEvent(event.type, event.state_key); + var storedEvent = room.current_room_state.getStateEvent(event.type, event.state_key); if (storedEvent) { if (storedEvent.origin_server_ts < eventTs) { // the incoming event is newer, use it. - __room.current_room_state.storeStateEvent(event); + room.current_room_state.storeStateEvent(event); } } } @@ -173,16 +173,16 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // ======================= - var __room = modelService.getRoom(event.room_id); + var room = modelService.getRoom(event.room_id); if (event.user_id !== matrixService.config().user_id) { - __room.addMessageEvent(event, !isLiveEvent); + room.addMessageEvent(event, !isLiveEvent); displayNotification(event); } else { // we may have locally echoed this, so we should replace the event // instead of just adding. - __room.addOrReplaceMessageEvent(event, !isLiveEvent); + room.addOrReplaceMessageEvent(event, !isLiveEvent); } // TODO send delivery receipt if isLiveEvent @@ -191,7 +191,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService }; var handleRoomMember = function(event, isLiveEvent, isStateEvent) { - var __room = modelService.getRoom(event.room_id); + var room = modelService.getRoom(event.room_id); // add membership changes as if they were a room message if something interesting changed @@ -216,14 +216,14 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // If there was a change we want to display, dump it in the message // list. if (memberChanges) { - __room.addMessageEvent(event, !isLiveEvent); + room.addMessageEvent(event, !isLiveEvent); } } // Use data from state event or the latest data from the stream. // Do not care of events that come when paginating back if (isStateEvent || isLiveEvent) { - __room.current_room_state.members[event.state_key] = event; + room.current_room_state.members[event.state_key] = event; } $rootScope.$broadcast(MEMBER_EVENT, event, isLiveEvent, isStateEvent); @@ -255,8 +255,8 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService var handleCallEvent = function(event, isLiveEvent) { $rootScope.$broadcast(CALL_EVENT, event, isLiveEvent); if (event.type === 'm.call.invite') { - var __room = modelService.getRoom(event.room_id); - __room.addMessageEvent(event, !isLiveEvent); + var room = modelService.getRoom(event.room_id); + room.addMessageEvent(event, !isLiveEvent); } }; @@ -270,9 +270,9 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // we need to remove something possibly: do we know the redacted // event ID? if (eventMap[event.redacts]) { - var __room = modelService.getRoom(event.room_id); + var room = modelService.getRoom(event.room_id); // remove event from list of messages in this room. - var eventList = __room.events; + var eventList = room.events; for (var i=0; i> "+room.room_id); } - // ========================================= - var __room = modelService.getRoom(room.room_id); - __room.current_room_state.storeStateEvents(room.state); - __room.old_room_state.storeStateEvents(room.state); + var newRoom = modelService.getRoom(room.room_id); + newRoom.current_room_state.storeStateEvents(room.state); + newRoom.old_room_state.storeStateEvents(room.state); if ("messages" in room) { this.handleRoomMessages(room.room_id, room.messages, false); - __room.current_room_state.pagination_token = room.messages.end; - __room.old_room_state.pagination_token = room.messages.start; - } - - if ("state" in room) { // TODO FIXME remove this. - this.handleEvents(room.state, false, true); + newRoom.current_room_state.pagination_token = room.messages.end; + newRoom.old_room_state.pagination_token = room.messages.start; } } var presence = response.data.presence; diff --git a/webclient/recents/recents-filter.js b/webclient/recents/recents-filter.js index db7fc5e4ee..39c2359967 100644 --- a/webclient/recents/recents-filter.js +++ b/webclient/recents/recents-filter.js @@ -45,14 +45,10 @@ angular.module('RecentsController') // The only information we have about the room is that the user has been invited filtered.push(room); } - else { - console.error("Dropping "+room.room_id); - } - }); // And time sort them - // The room with the lastest message at first + // The room with the latest message at first filtered.sort(function (roomA, roomB) { var lastMsgRoomA = eventHandlerService.getLastMessage(roomA.room_id, true); From 4b3f74388570f104ebd3cae8543f1aaca1572127 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 17:44:14 +0000 Subject: [PATCH 17/53] Reference the room_member key on messages which adjusts for current vs old_room_state. This displays names for historical users correctly, but is off by one (referencing content not prev_content). --- .../matrix/event-handler-service.js | 22 ++++++++++++++----- webclient/room/room.html | 4 ++-- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index 7f53429754..eff8674e04 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -193,6 +193,17 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService var handleRoomMember = function(event, isLiveEvent, isStateEvent) { var room = modelService.getRoom(event.room_id); + // modify state before adding the message so it points to the right thing. + // The events are copied to avoid referencing the same event when adding + // the message (circular json structures) + if (isStateEvent || isLiveEvent) { + room.current_room_state.storeStateEvent(angular.copy(event)); + } + else if (!isLiveEvent) { + // mutate the old room state + room.old_room_state.storeStateEvent(angular.copy(event)); + } + // add membership changes as if they were a room message if something interesting changed // Exception: Do not do this if the event is a room state event because such events already come @@ -220,11 +231,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService } } - // Use data from state event or the latest data from the stream. - // Do not care of events that come when paginating back - if (isStateEvent || isLiveEvent) { - room.current_room_state.members[event.state_key] = event; - } + $rootScope.$broadcast(MEMBER_EVENT, event, isLiveEvent, isStateEvent); }; @@ -439,7 +446,8 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService } else { - // InitialSync returns messages in chronological order + // InitialSync returns messages in chronological order, so invert + // it to get most recent > oldest for (var i=events.length - 1; i>=0; i--) { this.handleEvent(events[i], isLiveEvents, isLiveEvents); } @@ -482,6 +490,8 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService newRoom.current_room_state.storeStateEvents(room.state); newRoom.old_room_state.storeStateEvents(room.state); + // this should be done AFTER storing state events since these + // messages may make the old_room_state diverge. if ("messages" in room) { this.handleRoomMessages(room.room_id, room.messages, false); newRoom.current_room_state.pagination_token = room.messages.end; diff --git a/webclient/room/room.html b/webclient/room/room.html index 3f4c4c57b6..cd2a5e9c23 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -127,14 +127,14 @@
-
{{ msg.user_id | mUserDisplayName: room_id }}
+
{{ msg.room_member.content.displayname || msg.user_id | mUserDisplayName: room_id }}
{{ (msg.origin_server_ts) | date:'MMM d HH:mm' }}
- From efb0f6e23b3dfc8e6f239f9dddc01b8bdd221e64 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 17:49:09 +0000 Subject: [PATCH 18/53] Backwards compat for old-style avatar_urls --- webclient/room/room.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webclient/room/room.html b/webclient/room/room.html index cd2a5e9c23..60b875f17b 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -134,7 +134,8 @@ - + From 2438b8b66b8dc08d0fe77447b0a3cdb39e9a8f95 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 17:52:41 +0000 Subject: [PATCH 19/53] Fix off-by-one bug when displaying display names / avatar urls when paginating. --- webclient/components/matrix/event-handler-service.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index eff8674e04..1b9a99eaa4 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -201,6 +201,13 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService } else if (!isLiveEvent) { // mutate the old room state + var oldEvent = angular.copy(event); + if (event.prev_content) { + // the m.room.member event we are handling is the NEW event. When + // we keep going back in time, we want the PREVIOUS value for displaying + // names/etc, hence the clobber here. + event.content = event.prev_content; + } room.old_room_state.storeStateEvent(angular.copy(event)); } From 43e7ad1b1c2ed2b23e928175d29dfcd8a2b00c76 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 3 Nov 2014 17:58:11 +0000 Subject: [PATCH 20/53] Rejig order of checks/state updates/message insertions for m.room.member. Mark known issue. --- .../matrix/event-handler-service.js | 49 +++++++++---------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index 1b9a99eaa4..bba24cfaa9 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -193,6 +193,22 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService var handleRoomMember = function(event, isLiveEvent, isStateEvent) { var room = modelService.getRoom(event.room_id); + // did something change? + var memberChanges = undefined; + if (!isStateEvent) { + // could be a membership change, display name change, etc. + // Find out which one. + if ((event.prev_content === undefined && event.content.membership) || (event.prev_content && (event.prev_content.membership !== event.content.membership))) { + memberChanges = "membership"; + } + else if (event.prev_content && (event.prev_content.displayname !== event.content.displayname)) { + memberChanges = "displayname"; + } + // mark the key which changed + event.changedKey = memberChanges; + } + + // modify state before adding the message so it points to the right thing. // The events are copied to avoid referencing the same event when adding // the message (circular json structures) @@ -206,36 +222,17 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // the m.room.member event we are handling is the NEW event. When // we keep going back in time, we want the PREVIOUS value for displaying // names/etc, hence the clobber here. + // FIXME TODO: We can't be doing this, we should have separate keys for + // avatar_url and displayname. event.content = event.prev_content; } - room.old_room_state.storeStateEvent(angular.copy(event)); + room.old_room_state.storeStateEvent(oldEvent); } - - // add membership changes as if they were a room message if something interesting changed - // Exception: Do not do this if the event is a room state event because such events already come - // as room messages events. Moreover, when they come as room messages events, they are relatively ordered - // with other other room messages - // FIXME this isn't true anymore, work out what this is doing. - if (!isStateEvent) { - // could be a membership change, display name change, etc. - // Find out which one. - var memberChanges = undefined; - if ((event.prev_content === undefined && event.content.membership) || (event.prev_content && (event.prev_content.membership !== event.content.membership))) { - memberChanges = "membership"; - } - else if (event.prev_content && (event.prev_content.displayname !== event.content.displayname)) { - memberChanges = "displayname"; - } - - // mark the key which changed - event.changedKey = memberChanges; - - // If there was a change we want to display, dump it in the message - // list. - if (memberChanges) { - room.addMessageEvent(event, !isLiveEvent); - } + // If there was a change we want to display, dump it in the message + // list. This has to be done after room state is updated. + if (memberChanges) { + room.addMessageEvent(event, !isLiveEvent); } From 1c86ec5b8dcdfaf72259b63d2c588014707c70de Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 4 Nov 2014 10:18:46 +0000 Subject: [PATCH 21/53] Rejig display names when paginating to lie less. --- .../components/matrix/event-handler-service.js | 11 ++++++++--- webclient/components/matrix/model-service.js | 9 +++++++-- webclient/room/room.html | 17 +++++++++-------- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index bba24cfaa9..226db0798b 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -218,14 +218,19 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService else if (!isLiveEvent) { // mutate the old room state var oldEvent = angular.copy(event); + oldEvent.cnt = event.content; if (event.prev_content) { // the m.room.member event we are handling is the NEW event. When // we keep going back in time, we want the PREVIOUS value for displaying // names/etc, hence the clobber here. - // FIXME TODO: We can't be doing this, we should have separate keys for - // avatar_url and displayname. - event.content = event.prev_content; + oldEvent.cnt = event.prev_content; } + + if (event.changedKey === "membership" && event.content.membership === "join") { + // join has a prev_content but it doesn't contain all the info unlike the join, so use that. + oldEvent.cnt = event.content; + } + room.old_room_state.storeStateEvent(oldEvent); } diff --git a/webclient/components/matrix/model-service.js b/webclient/components/matrix/model-service.js index d5acd7eda9..7277ae347b 100644 --- a/webclient/components/matrix/model-service.js +++ b/webclient/components/matrix/model-service.js @@ -45,12 +45,17 @@ angular.module('modelService', []) addMessageEvent: function addMessageEvent(event, toFront) { // every message must reference the RoomMember which made it *at // that time* so things like display names display correctly. + var stateAtTheTime = toFront ? this.old_room_state : this.current_room_state; + event.room_member = stateAtTheTime.getStateEvent("m.room.member", event.user_id); + if (event.type === "m.room.member" && event.content.membership === "invite") { + // give information on both the inviter and invitee + event.__target_room_member = stateAtTheTime.getStateEvent("m.room.member", event.state_key); + } + if (toFront) { - event.room_member = this.old_room_state.getStateEvent("m.room.member", event.user_id); this.events.unshift(event); } else { - event.room_member = this.current_room_state.getStateEvent("m.room.member", event.user_id); this.events.push(event); } }, diff --git a/webclient/room/room.html b/webclient/room/room.html index 60b875f17b..332a9928d1 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -127,7 +127,7 @@
-
{{ msg.room_member.content.displayname || msg.user_id | mUserDisplayName: room_id }}
+
{{ msg.room_member.cnt.displayname || msg.user_id | mUserDisplayName: room_id }}
{{ (msg.origin_server_ts) | date:'MMM d HH:mm' }} @@ -135,22 +135,23 @@
-
- {{ members[msg.state_key].displayname || msg.state_key }} joined + {{ msg.content.displayname || members[msg.state_key].displayname || msg.state_key }} joined - {{ members[msg.state_key].displayname || msg.state_key }} left + + {{ msg.room_member.cnt.displayname || members[msg.state_key].displayname || msg.state_key }} left - {{ members[msg.user_id].displayname || msg.user_id }} + {{ msg.content.displayname || members[msg.user_id].displayname || msg.user_id }} {{ {"invite": "kicked", "join": "kicked", "ban": "unbanned"}[msg.prev_content.membership] }} - {{ members[msg.state_key].displayname || msg.state_key }} + {{ msg.__target_room_member.content.displayname || msg.state_key }} : {{ msg.content.reason }} @@ -158,9 +159,9 @@ - {{ members[msg.user_id].displayname || msg.user_id }} + {{ msg.content.displayname || members[msg.user_id].displayname || msg.user_id }} {{ {"invite": "invited", "ban": "banned"}[msg.content.membership] }} - {{ members[msg.state_key].displayname || msg.state_key }} + {{ msg.__target_room_member.displayname || msg.state_key }} : {{ msg.content.reason }} From 5949571fe75eecefc9ff2433d9de46dfa5b80902 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 4 Nov 2014 10:30:34 +0000 Subject: [PATCH 22/53] SYWEB-116: Implement historical display name support. This works for both live and paginated events. Each 'message' event has an associated '__room_member' key which points to the state of the sender at that point in time. Invites have an additional key '__target_room_member' which point to the state of the invitee at that point in time. This obviates the need for mapping user_ids to *current* displaynames in the message list, though this is still required for the user/presence list. --- webclient/components/matrix/event-handler-service.js | 4 +++- webclient/components/matrix/model-service.js | 2 +- webclient/room/room-controller.js | 3 ++- webclient/room/room.html | 12 ++++++------ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index 226db0798b..027c80a1b6 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -213,7 +213,9 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService // The events are copied to avoid referencing the same event when adding // the message (circular json structures) if (isStateEvent || isLiveEvent) { - room.current_room_state.storeStateEvent(angular.copy(event)); + var newEvent = angular.copy(event); + newEvent.cnt = event.content; + room.current_room_state.storeStateEvent(newEvent); } else if (!isLiveEvent) { // mutate the old room state diff --git a/webclient/components/matrix/model-service.js b/webclient/components/matrix/model-service.js index 7277ae347b..8b2ee877b1 100644 --- a/webclient/components/matrix/model-service.js +++ b/webclient/components/matrix/model-service.js @@ -46,7 +46,7 @@ angular.module('modelService', []) // every message must reference the RoomMember which made it *at // that time* so things like display names display correctly. var stateAtTheTime = toFront ? this.old_room_state : this.current_room_state; - event.room_member = stateAtTheTime.getStateEvent("m.room.member", event.user_id); + event.__room_member = stateAtTheTime.getStateEvent("m.room.member", event.user_id); if (event.type === "m.room.member" && event.content.membership === "invite") { // give information on both the inviter and invitee event.__target_room_member = stateAtTheTime.getStateEvent("m.room.member", event.state_key); diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index 0bcc33ab4f..2e0f5faff0 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -1007,7 +1007,8 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) $scope.event_selected = angular.copy(content); // FIXME: Pre-calculated event data should be stripped in a nicer way. - $scope.event_selected.room_member = undefined; + $scope.event_selected.__room_member = undefined; + $scope.event_selected.__target_room_member = undefined; // scope this so the template can check power levels and enable/disable // buttons diff --git a/webclient/room/room.html b/webclient/room/room.html index 332a9928d1..407daf56ff 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -127,15 +127,15 @@
-
{{ msg.room_member.cnt.displayname || msg.user_id | mUserDisplayName: room_id }}
+
{{ msg.__room_member.cnt.displayname || msg.user_id | mUserDisplayName: room_id }}
{{ (msg.origin_server_ts) | date:'MMM d HH:mm' }}
- - + @@ -146,7 +146,7 @@ - {{ msg.room_member.cnt.displayname || members[msg.state_key].displayname || msg.state_key }} left + {{ msg.__room_member.cnt.displayname || members[msg.state_key].displayname || msg.state_key }} left {{ msg.content.displayname || members[msg.user_id].displayname || msg.user_id }} @@ -159,9 +159,9 @@ - {{ msg.content.displayname || members[msg.user_id].displayname || msg.user_id }} + {{ msg.__room_member.cnt.displayname || msg.user_id }} {{ {"invite": "invited", "ban": "banned"}[msg.content.membership] }} - {{ msg.__target_room_member.displayname || msg.state_key }} + {{ msg.__target_room_member.cnt.displayname || msg.state_key }} : {{ msg.content.reason }} From 1ac1cd6c14275d535f7edcbeeba37b32b6cb056e Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 4 Nov 2014 11:06:31 +0000 Subject: [PATCH 23/53] SYWEB-133: JSON dialog now appears on dblclick to allow users to highlight text. --- webclient/room/room.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webclient/room/room.html b/webclient/room/room.html index 5265f42dd8..b9147b1dce 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -137,7 +137,7 @@ ng-hide="events.rooms[room_id].messages[$index - 1].user_id === msg.user_id || msg.user_id === state.user_id"/> -
+
{{ members[msg.state_key].displayname || msg.state_key }} joined From f7cf978f68cddc66c2548e25ddeef468b7f25435 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 4 Nov 2014 11:26:03 +0000 Subject: [PATCH 24/53] SYWEB-136: Send m.images according to the spec. --- webclient/components/fileUpload/file-upload-service.js | 7 ++++--- webclient/components/matrix/matrix-service.js | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/webclient/components/fileUpload/file-upload-service.js b/webclient/components/fileUpload/file-upload-service.js index e0f67b2c6c..b544e29509 100644 --- a/webclient/components/fileUpload/file-upload-service.js +++ b/webclient/components/fileUpload/file-upload-service.js @@ -64,7 +64,8 @@ angular.module('mFileUpload', ['matrixService', 'mUtilities']) var imageMessage = { msgtype: "m.image", url: undefined, - body: { + body: "Image", + info: { size: undefined, w: undefined, h: undefined, @@ -90,7 +91,7 @@ angular.module('mFileUpload', ['matrixService', 'mUtilities']) function(url) { // Update message metadata imageMessage.url = url; - imageMessage.body = { + imageMessage.info = { size: imageFile.size, w: size.width, h: size.height, @@ -101,7 +102,7 @@ angular.module('mFileUpload', ['matrixService', 'mUtilities']) // reuse the original image info for thumbnail data if (!imageMessage.thumbnail_url) { imageMessage.thumbnail_url = imageMessage.url; - imageMessage.thumbnail_info = imageMessage.body; + imageMessage.thumbnail_info = imageMessage.info; } // We are done diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js index 1840cf46c0..06a1ad4cfa 100644 --- a/webclient/components/matrix/matrix-service.js +++ b/webclient/components/matrix/matrix-service.js @@ -422,7 +422,8 @@ angular.module('matrixService', []) var content = { msgtype: "m.image", url: image_url, - body: image_body + info: image_body, + body: "Image" }; return this.sendMessage(room_id, msg_id, content); From 29b54d663803c73f5521a484ffba0182b24b3f89 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 4 Nov 2014 14:01:25 +0000 Subject: [PATCH 25/53] Update karma.conf.js to A: actually run the tests, and B: generate JUnit XML. --- webclient/test/karma.conf.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/webclient/test/karma.conf.js b/webclient/test/karma.conf.js index 22c4eaaafa..df63ae8267 100644 --- a/webclient/test/karma.conf.js +++ b/webclient/test/karma.conf.js @@ -23,6 +23,8 @@ module.exports = function(config) { '../js/angular-animate.js', '../js/angular-sanitize.js', '../js/ng-infinite-scroll-matrix.js', + '../js/ui-bootstrap*', + '../js/elastic.js', '../login/**/*.*', '../room/**/*.*', '../components/**/*.*', @@ -35,6 +37,11 @@ module.exports = function(config) { './unit/**/*.js' ], + plugins: [ + 'karma-*', + require('./node_modules/karma-junit-reporter') + ], + // list of files to exclude exclude: [ @@ -50,8 +57,11 @@ module.exports = function(config) { // test results reporter to use // possible values: 'dots', 'progress' // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['progress'], - + reporters: ['progress', 'junit'], + junitReporter: { + outputFile: 'test-results.xml', + suite: '' + }, // web server port port: 9876, @@ -77,6 +87,6 @@ module.exports = function(config) { // Continuous Integration mode // if true, Karma captures browsers, runs the tests and exits - singleRun: false + singleRun: true }); }; From ae48e75ad70cfc45d01647a4172a6c7f7659a6c0 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 4 Nov 2014 14:38:45 +0000 Subject: [PATCH 26/53] Use phantomjs as the default browser and not chrome. --- webclient/test/README | 32 +++++++++++++++++++++++++------- webclient/test/karma.conf.js | 2 +- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/webclient/test/README b/webclient/test/README index 1a7bc832c7..e7ed4eaa87 100644 --- a/webclient/test/README +++ b/webclient/test/README @@ -1,13 +1,31 @@ -Requires: - - nodejs/npm - - npm install karma - - npm install jasmine - - npm install protractor (e2e testing) +Testing is done using Karma. -Setting up continuous integration / run the unit tests (make sure you're in -this directory so it can find the config file): + +UNIT TESTING +============ + +Requires the following: + - npm/nodejs + - phantomjs + +Requires the following node packages: + - npm install jasmine + - npm install karma + - npm install karma-jasmine + - npm install karma-phantomjs-launcher + - npm install karma-junit-reporter + +Make sure you're in this directory so it can find the config file and run: karma start +You should see all the tests pass. + + +E2E TESTING +=========== + +npm install protractor + Setting up e2e tests (only if you don't have a selenium server to run the tests on. If you do, edit the config to point to that url): diff --git a/webclient/test/karma.conf.js b/webclient/test/karma.conf.js index df63ae8267..83c9dca579 100644 --- a/webclient/test/karma.conf.js +++ b/webclient/test/karma.conf.js @@ -82,7 +82,7 @@ module.exports = function(config) { // start these browsers // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['Chrome'], + browsers: ['PhantomJS'], // Continuous Integration mode From 402d08099002f19a882f76ca7d2baeb1a29868e7 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Tue, 4 Nov 2014 15:08:00 +0000 Subject: [PATCH 27/53] Fix installation instructions in README --- MANIFEST.in | 3 ++- README.rst | 57 +++++++++++++++++++++++++++++------------------------ 2 files changed, 33 insertions(+), 27 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 73e0eff6e4..e1043fb57c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ recursive-include docs * recursive-include tests *.py -recursive-include synapse/persistence/schema *.sql +recursive-include synapse/storage/schema *.sql +recursive-include webclient * diff --git a/README.rst b/README.rst index f40492b8a0..b3b2a94dbf 100644 --- a/README.rst +++ b/README.rst @@ -122,12 +122,12 @@ Thanks for trying Matrix! [2] End-to-end encryption is currently in development - Homeserver Installation ======================= -First, the dependencies need to be installed. Start by installing -'python2.7-dev' and the various tools of the compiler toolchain. +Synapse is written in python but some of the libraries is uses are written in +C. So before we can install synapse itself we need a working C compiler and the +header files for python C extensions. Installing prerequisites on Ubuntu:: @@ -137,30 +137,35 @@ Installing prerequisites on Mac OS X:: $ xcode-select --install +Synapse uses NaCl (http://nacl.cr.yp.to/) for encryption and digital +signatures. Unfortunately PyNACL currently has a few issues +(https://github.com/pyca/pynacl/issues/53) and +(https://github.com/pyca/pynacl/issues/79) that mean it may not install +correctly. To fix try re-installing from PyPI or directly from (https://github.com/pyca/pynacl):: + + $ # Install from PyPI + $ pip install --user --upgrade --force pynacl + $ # Install from github + $ pip install --user https://github.com/pyca/pynacl/tarball/master + +On OSX, if you encounter ``clang: error: unknown argument: '-mno-fused-madd'`` +you will need to ``export CFLAGS=-Qunused-arguments``. + +To install the synapse homeserver run:: + + $ pip install --user --process-dependency-links https://github.com/matrix-org/synapse/tarball/master + +This installs synapse, along with the libraries it uses, into +``$HOME/.local/lib/``. + +Homeserver Development +====================== + The homeserver has a number of external dependencies, that are easiest to install by making setup.py do so, in --user mode:: $ python setup.py develop --user -You'll need a version of setuptools new enough to know about git, so you -may need to also run:: - - $ sudo apt-get install python-pip - $ sudo pip install --upgrade setuptools - -If you don't have access to github, then you may need to install ``syutil`` -manually by checking it out and running ``python setup.py develop --user`` on -it too. - -If you get errors about ``sodium.h`` being missing, you may also need to -manually install a newer PyNaCl via pip as setuptools installs an old one. Or -you can check PyNaCl out of git directly (https://github.com/pyca/pynacl) and -installing it. Installing PyNaCl using pip may also work (remember to remove -any other versions installed by setuputils in, for example, ~/.local/lib). - -On OSX, if you encounter ``clang: error: unknown argument: '-mno-fused-madd'`` -you will need to ``export CFLAGS=-Qunused-arguments``. - This will run a process of downloading and installing into your user's .local/lib directory all of the required dependencies that are missing. @@ -204,11 +209,11 @@ IDs: For the first form, simply pass the required hostname (of the machine) as the --host parameter:: - $ python synapse/app/homeserver.py \ + $ python -m synapse.app.homeserver \ --server-name machine.my.domain.name \ --config-path homeserver.config \ --generate-config - $ python synapse/app/homeserver.py --config-path homeserver.config + $ python -m synapse.app.homeserver --config-path homeserver.config Alternatively, you can run synapse via synctl - running ``synctl start`` to generate a homeserver.yaml config file, where you can then edit server-name to @@ -226,12 +231,12 @@ record would then look something like:: At this point, you should then run the homeserver with the hostname of this SRV record, as that is the name other machines will expect it to have:: - $ python synapse/app/homeserver.py \ + $ python -m synapse.app.homeserver \ --server-name YOURDOMAIN \ --bind-port 8448 \ --config-path homeserver.config \ --generate-config - $ python synapse/app/homeserver.py --config-path homeserver.config + $ python -m synapse.app.homeserver --config-path homeserver.config You may additionally want to pass one or more "-v" options, in order to From 4a73c366faad6c64c062545bef6734414bf3dae4 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Tue, 4 Nov 2014 15:18:43 +0000 Subject: [PATCH 28/53] exclude tests --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 660efd5b89..0cb56c400f 100755 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ def read(fname): setup( name="SynapseHomeServer", version="0.0.1", - packages=find_packages(exclude=["tests"]), + packages=find_packages(exclude=["tests", "tests.*"]), description="Reference Synapse Home Server", install_requires=[ "syutil==0.0.2", From 1273023ac350328f15569702255caa4345e1368a Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 4 Nov 2014 15:35:25 +0000 Subject: [PATCH 29/53] Don't need this; should be on -g path. --- webclient/test/karma.conf.js | 1 - 1 file changed, 1 deletion(-) diff --git a/webclient/test/karma.conf.js b/webclient/test/karma.conf.js index 83c9dca579..083c7c7200 100644 --- a/webclient/test/karma.conf.js +++ b/webclient/test/karma.conf.js @@ -39,7 +39,6 @@ module.exports = function(config) { plugins: [ 'karma-*', - require('./node_modules/karma-junit-reporter') ], From 89ba802b23bf1fd22afbc5e9a4b3b732264e3c18 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Tue, 4 Nov 2014 15:57:23 +0000 Subject: [PATCH 30/53] Move webclient to a python module so that it can be installed --- MANIFEST.in | 2 +- syweb/__init__.py | 0 {webclient => syweb/webclient}/CAPTCHA_SETUP | 0 {webclient => syweb/webclient}/README | 0 {webclient => syweb/webclient}/app-controller.js | 0 {webclient => syweb/webclient}/app-directive.js | 0 {webclient => syweb/webclient}/app-filter.js | 0 {webclient => syweb/webclient}/app.css | 0 {webclient => syweb/webclient}/app.js | 0 {webclient => syweb/webclient}/bootstrap.css | 0 .../components/fileInput/file-input-directive.js | 0 .../components/fileUpload/file-upload-service.js | 0 .../components/matrix/event-handler-service.js | 0 .../components/matrix/event-stream-service.js | 0 .../webclient}/components/matrix/matrix-call.js | 0 .../webclient}/components/matrix/matrix-filter.js | 0 .../components/matrix/matrix-phone-service.js | 0 .../webclient}/components/matrix/matrix-service.js | 0 .../webclient}/components/matrix/model-service.js | 0 .../components/matrix/notification-service.js | 0 .../components/matrix/presence-service.js | 0 .../components/utilities/utilities-service.js | 0 {webclient => syweb/webclient}/favicon.ico | Bin .../webclient}/home/home-controller.js | 0 {webclient => syweb/webclient}/home/home.html | 0 {webclient => syweb/webclient}/img/close.png | Bin .../webclient}/img/default-profile.png | Bin {webclient => syweb/webclient}/img/gradient.png | Bin {webclient => syweb/webclient}/img/green_phone.png | Bin {webclient => syweb/webclient}/img/logo-small.png | Bin {webclient => syweb/webclient}/img/logo.png | Bin {webclient => syweb/webclient}/img/red_phone.png | Bin {webclient => syweb/webclient}/index.html | 0 .../webclient}/js/angular-animate.js | 0 .../webclient}/js/angular-animate.min.js | 0 {webclient => syweb/webclient}/js/angular-mocks.js | 0 {webclient => syweb/webclient}/js/angular-route.js | 0 .../webclient}/js/angular-route.min.js | 0 .../webclient}/js/angular-sanitize.js | 0 .../webclient}/js/angular-sanitize.min.js | 0 {webclient => syweb/webclient}/js/angular.js | 0 {webclient => syweb/webclient}/js/angular.min.js | 0 {webclient => syweb/webclient}/js/autofill-event.js | 0 {webclient => syweb/webclient}/js/elastic.js | 0 .../webclient}/js/jquery-1.8.3.min.js | 0 .../webclient}/js/ng-infinite-scroll-matrix.js | 0 .../webclient}/js/ui-bootstrap-tpls-0.11.2.js | 0 .../webclient}/login/login-controller.js | 0 {webclient => syweb/webclient}/login/login.html | 0 .../webclient}/login/register-controller.js | 0 {webclient => syweb/webclient}/login/register.html | 0 {webclient => syweb/webclient}/media/busy.mp3 | Bin {webclient => syweb/webclient}/media/busy.ogg | Bin {webclient => syweb/webclient}/media/callend.mp3 | Bin {webclient => syweb/webclient}/media/callend.ogg | Bin {webclient => syweb/webclient}/media/ring.mp3 | Bin {webclient => syweb/webclient}/media/ring.ogg | Bin {webclient => syweb/webclient}/media/ringback.mp3 | Bin {webclient => syweb/webclient}/media/ringback.ogg | Bin {webclient => syweb/webclient}/mobile.css | 0 .../webclient}/recents/recents-controller.js | 0 .../webclient}/recents/recents-filter.js | 0 {webclient => syweb/webclient}/recents/recents.html | 0 .../webclient}/room/room-controller.js | 0 .../webclient}/room/room-directive.js | 0 {webclient => syweb/webclient}/room/room.html | 0 .../webclient}/settings/settings-controller.js | 0 .../webclient}/settings/settings.html | 0 {webclient => syweb/webclient}/test/README | 0 .../webclient}/test/e2e/home.spec.js | 0 {webclient => syweb/webclient}/test/karma.conf.js | 0 .../webclient}/test/protractor.conf.js | 0 .../webclient}/test/unit/user-controller.spec.js | 0 .../webclient}/user/user-controller.js | 0 {webclient => syweb/webclient}/user/user.html | 0 75 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 syweb/__init__.py rename {webclient => syweb/webclient}/CAPTCHA_SETUP (100%) rename {webclient => syweb/webclient}/README (100%) rename {webclient => syweb/webclient}/app-controller.js (100%) rename {webclient => syweb/webclient}/app-directive.js (100%) rename {webclient => syweb/webclient}/app-filter.js (100%) rename {webclient => syweb/webclient}/app.css (100%) rename {webclient => syweb/webclient}/app.js (100%) rename {webclient => syweb/webclient}/bootstrap.css (100%) rename {webclient => syweb/webclient}/components/fileInput/file-input-directive.js (100%) rename {webclient => syweb/webclient}/components/fileUpload/file-upload-service.js (100%) rename {webclient => syweb/webclient}/components/matrix/event-handler-service.js (100%) rename {webclient => syweb/webclient}/components/matrix/event-stream-service.js (100%) rename {webclient => syweb/webclient}/components/matrix/matrix-call.js (100%) rename {webclient => syweb/webclient}/components/matrix/matrix-filter.js (100%) rename {webclient => syweb/webclient}/components/matrix/matrix-phone-service.js (100%) rename {webclient => syweb/webclient}/components/matrix/matrix-service.js (100%) rename {webclient => syweb/webclient}/components/matrix/model-service.js (100%) rename {webclient => syweb/webclient}/components/matrix/notification-service.js (100%) rename {webclient => syweb/webclient}/components/matrix/presence-service.js (100%) rename {webclient => syweb/webclient}/components/utilities/utilities-service.js (100%) rename {webclient => syweb/webclient}/favicon.ico (100%) rename {webclient => syweb/webclient}/home/home-controller.js (100%) rename {webclient => syweb/webclient}/home/home.html (100%) rename {webclient => syweb/webclient}/img/close.png (100%) rename {webclient => syweb/webclient}/img/default-profile.png (100%) rename {webclient => syweb/webclient}/img/gradient.png (100%) rename {webclient => syweb/webclient}/img/green_phone.png (100%) rename {webclient => syweb/webclient}/img/logo-small.png (100%) rename {webclient => syweb/webclient}/img/logo.png (100%) rename {webclient => syweb/webclient}/img/red_phone.png (100%) rename {webclient => syweb/webclient}/index.html (100%) rename {webclient => syweb/webclient}/js/angular-animate.js (100%) rename {webclient => syweb/webclient}/js/angular-animate.min.js (100%) rename {webclient => syweb/webclient}/js/angular-mocks.js (100%) rename {webclient => syweb/webclient}/js/angular-route.js (100%) rename {webclient => syweb/webclient}/js/angular-route.min.js (100%) rename {webclient => syweb/webclient}/js/angular-sanitize.js (100%) rename {webclient => syweb/webclient}/js/angular-sanitize.min.js (100%) rename {webclient => syweb/webclient}/js/angular.js (100%) rename {webclient => syweb/webclient}/js/angular.min.js (100%) rename {webclient => syweb/webclient}/js/autofill-event.js (100%) rename {webclient => syweb/webclient}/js/elastic.js (100%) rename {webclient => syweb/webclient}/js/jquery-1.8.3.min.js (100%) rename {webclient => syweb/webclient}/js/ng-infinite-scroll-matrix.js (100%) rename {webclient => syweb/webclient}/js/ui-bootstrap-tpls-0.11.2.js (100%) rename {webclient => syweb/webclient}/login/login-controller.js (100%) rename {webclient => syweb/webclient}/login/login.html (100%) rename {webclient => syweb/webclient}/login/register-controller.js (100%) rename {webclient => syweb/webclient}/login/register.html (100%) rename {webclient => syweb/webclient}/media/busy.mp3 (100%) rename {webclient => syweb/webclient}/media/busy.ogg (100%) rename {webclient => syweb/webclient}/media/callend.mp3 (100%) rename {webclient => syweb/webclient}/media/callend.ogg (100%) rename {webclient => syweb/webclient}/media/ring.mp3 (100%) rename {webclient => syweb/webclient}/media/ring.ogg (100%) rename {webclient => syweb/webclient}/media/ringback.mp3 (100%) rename {webclient => syweb/webclient}/media/ringback.ogg (100%) rename {webclient => syweb/webclient}/mobile.css (100%) rename {webclient => syweb/webclient}/recents/recents-controller.js (100%) rename {webclient => syweb/webclient}/recents/recents-filter.js (100%) rename {webclient => syweb/webclient}/recents/recents.html (100%) rename {webclient => syweb/webclient}/room/room-controller.js (100%) rename {webclient => syweb/webclient}/room/room-directive.js (100%) rename {webclient => syweb/webclient}/room/room.html (100%) rename {webclient => syweb/webclient}/settings/settings-controller.js (100%) rename {webclient => syweb/webclient}/settings/settings.html (100%) rename {webclient => syweb/webclient}/test/README (100%) rename {webclient => syweb/webclient}/test/e2e/home.spec.js (100%) rename {webclient => syweb/webclient}/test/karma.conf.js (100%) rename {webclient => syweb/webclient}/test/protractor.conf.js (100%) rename {webclient => syweb/webclient}/test/unit/user-controller.spec.js (100%) rename {webclient => syweb/webclient}/user/user-controller.js (100%) rename {webclient => syweb/webclient}/user/user.html (100%) diff --git a/MANIFEST.in b/MANIFEST.in index e1043fb57c..a1a77ff540 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ recursive-include docs * recursive-include tests *.py recursive-include synapse/storage/schema *.sql -recursive-include webclient * +recursive-include syweb/webclient * diff --git a/syweb/__init__.py b/syweb/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/webclient/CAPTCHA_SETUP b/syweb/webclient/CAPTCHA_SETUP similarity index 100% rename from webclient/CAPTCHA_SETUP rename to syweb/webclient/CAPTCHA_SETUP diff --git a/webclient/README b/syweb/webclient/README similarity index 100% rename from webclient/README rename to syweb/webclient/README diff --git a/webclient/app-controller.js b/syweb/webclient/app-controller.js similarity index 100% rename from webclient/app-controller.js rename to syweb/webclient/app-controller.js diff --git a/webclient/app-directive.js b/syweb/webclient/app-directive.js similarity index 100% rename from webclient/app-directive.js rename to syweb/webclient/app-directive.js diff --git a/webclient/app-filter.js b/syweb/webclient/app-filter.js similarity index 100% rename from webclient/app-filter.js rename to syweb/webclient/app-filter.js diff --git a/webclient/app.css b/syweb/webclient/app.css similarity index 100% rename from webclient/app.css rename to syweb/webclient/app.css diff --git a/webclient/app.js b/syweb/webclient/app.js similarity index 100% rename from webclient/app.js rename to syweb/webclient/app.js diff --git a/webclient/bootstrap.css b/syweb/webclient/bootstrap.css similarity index 100% rename from webclient/bootstrap.css rename to syweb/webclient/bootstrap.css diff --git a/webclient/components/fileInput/file-input-directive.js b/syweb/webclient/components/fileInput/file-input-directive.js similarity index 100% rename from webclient/components/fileInput/file-input-directive.js rename to syweb/webclient/components/fileInput/file-input-directive.js diff --git a/webclient/components/fileUpload/file-upload-service.js b/syweb/webclient/components/fileUpload/file-upload-service.js similarity index 100% rename from webclient/components/fileUpload/file-upload-service.js rename to syweb/webclient/components/fileUpload/file-upload-service.js diff --git a/webclient/components/matrix/event-handler-service.js b/syweb/webclient/components/matrix/event-handler-service.js similarity index 100% rename from webclient/components/matrix/event-handler-service.js rename to syweb/webclient/components/matrix/event-handler-service.js diff --git a/webclient/components/matrix/event-stream-service.js b/syweb/webclient/components/matrix/event-stream-service.js similarity index 100% rename from webclient/components/matrix/event-stream-service.js rename to syweb/webclient/components/matrix/event-stream-service.js diff --git a/webclient/components/matrix/matrix-call.js b/syweb/webclient/components/matrix/matrix-call.js similarity index 100% rename from webclient/components/matrix/matrix-call.js rename to syweb/webclient/components/matrix/matrix-call.js diff --git a/webclient/components/matrix/matrix-filter.js b/syweb/webclient/components/matrix/matrix-filter.js similarity index 100% rename from webclient/components/matrix/matrix-filter.js rename to syweb/webclient/components/matrix/matrix-filter.js diff --git a/webclient/components/matrix/matrix-phone-service.js b/syweb/webclient/components/matrix/matrix-phone-service.js similarity index 100% rename from webclient/components/matrix/matrix-phone-service.js rename to syweb/webclient/components/matrix/matrix-phone-service.js diff --git a/webclient/components/matrix/matrix-service.js b/syweb/webclient/components/matrix/matrix-service.js similarity index 100% rename from webclient/components/matrix/matrix-service.js rename to syweb/webclient/components/matrix/matrix-service.js diff --git a/webclient/components/matrix/model-service.js b/syweb/webclient/components/matrix/model-service.js similarity index 100% rename from webclient/components/matrix/model-service.js rename to syweb/webclient/components/matrix/model-service.js diff --git a/webclient/components/matrix/notification-service.js b/syweb/webclient/components/matrix/notification-service.js similarity index 100% rename from webclient/components/matrix/notification-service.js rename to syweb/webclient/components/matrix/notification-service.js diff --git a/webclient/components/matrix/presence-service.js b/syweb/webclient/components/matrix/presence-service.js similarity index 100% rename from webclient/components/matrix/presence-service.js rename to syweb/webclient/components/matrix/presence-service.js diff --git a/webclient/components/utilities/utilities-service.js b/syweb/webclient/components/utilities/utilities-service.js similarity index 100% rename from webclient/components/utilities/utilities-service.js rename to syweb/webclient/components/utilities/utilities-service.js diff --git a/webclient/favicon.ico b/syweb/webclient/favicon.ico similarity index 100% rename from webclient/favicon.ico rename to syweb/webclient/favicon.ico diff --git a/webclient/home/home-controller.js b/syweb/webclient/home/home-controller.js similarity index 100% rename from webclient/home/home-controller.js rename to syweb/webclient/home/home-controller.js diff --git a/webclient/home/home.html b/syweb/webclient/home/home.html similarity index 100% rename from webclient/home/home.html rename to syweb/webclient/home/home.html diff --git a/webclient/img/close.png b/syweb/webclient/img/close.png similarity index 100% rename from webclient/img/close.png rename to syweb/webclient/img/close.png diff --git a/webclient/img/default-profile.png b/syweb/webclient/img/default-profile.png similarity index 100% rename from webclient/img/default-profile.png rename to syweb/webclient/img/default-profile.png diff --git a/webclient/img/gradient.png b/syweb/webclient/img/gradient.png similarity index 100% rename from webclient/img/gradient.png rename to syweb/webclient/img/gradient.png diff --git a/webclient/img/green_phone.png b/syweb/webclient/img/green_phone.png similarity index 100% rename from webclient/img/green_phone.png rename to syweb/webclient/img/green_phone.png diff --git a/webclient/img/logo-small.png b/syweb/webclient/img/logo-small.png similarity index 100% rename from webclient/img/logo-small.png rename to syweb/webclient/img/logo-small.png diff --git a/webclient/img/logo.png b/syweb/webclient/img/logo.png similarity index 100% rename from webclient/img/logo.png rename to syweb/webclient/img/logo.png diff --git a/webclient/img/red_phone.png b/syweb/webclient/img/red_phone.png similarity index 100% rename from webclient/img/red_phone.png rename to syweb/webclient/img/red_phone.png diff --git a/webclient/index.html b/syweb/webclient/index.html similarity index 100% rename from webclient/index.html rename to syweb/webclient/index.html diff --git a/webclient/js/angular-animate.js b/syweb/webclient/js/angular-animate.js similarity index 100% rename from webclient/js/angular-animate.js rename to syweb/webclient/js/angular-animate.js diff --git a/webclient/js/angular-animate.min.js b/syweb/webclient/js/angular-animate.min.js similarity index 100% rename from webclient/js/angular-animate.min.js rename to syweb/webclient/js/angular-animate.min.js diff --git a/webclient/js/angular-mocks.js b/syweb/webclient/js/angular-mocks.js similarity index 100% rename from webclient/js/angular-mocks.js rename to syweb/webclient/js/angular-mocks.js diff --git a/webclient/js/angular-route.js b/syweb/webclient/js/angular-route.js similarity index 100% rename from webclient/js/angular-route.js rename to syweb/webclient/js/angular-route.js diff --git a/webclient/js/angular-route.min.js b/syweb/webclient/js/angular-route.min.js similarity index 100% rename from webclient/js/angular-route.min.js rename to syweb/webclient/js/angular-route.min.js diff --git a/webclient/js/angular-sanitize.js b/syweb/webclient/js/angular-sanitize.js similarity index 100% rename from webclient/js/angular-sanitize.js rename to syweb/webclient/js/angular-sanitize.js diff --git a/webclient/js/angular-sanitize.min.js b/syweb/webclient/js/angular-sanitize.min.js similarity index 100% rename from webclient/js/angular-sanitize.min.js rename to syweb/webclient/js/angular-sanitize.min.js diff --git a/webclient/js/angular.js b/syweb/webclient/js/angular.js similarity index 100% rename from webclient/js/angular.js rename to syweb/webclient/js/angular.js diff --git a/webclient/js/angular.min.js b/syweb/webclient/js/angular.min.js similarity index 100% rename from webclient/js/angular.min.js rename to syweb/webclient/js/angular.min.js diff --git a/webclient/js/autofill-event.js b/syweb/webclient/js/autofill-event.js similarity index 100% rename from webclient/js/autofill-event.js rename to syweb/webclient/js/autofill-event.js diff --git a/webclient/js/elastic.js b/syweb/webclient/js/elastic.js similarity index 100% rename from webclient/js/elastic.js rename to syweb/webclient/js/elastic.js diff --git a/webclient/js/jquery-1.8.3.min.js b/syweb/webclient/js/jquery-1.8.3.min.js similarity index 100% rename from webclient/js/jquery-1.8.3.min.js rename to syweb/webclient/js/jquery-1.8.3.min.js diff --git a/webclient/js/ng-infinite-scroll-matrix.js b/syweb/webclient/js/ng-infinite-scroll-matrix.js similarity index 100% rename from webclient/js/ng-infinite-scroll-matrix.js rename to syweb/webclient/js/ng-infinite-scroll-matrix.js diff --git a/webclient/js/ui-bootstrap-tpls-0.11.2.js b/syweb/webclient/js/ui-bootstrap-tpls-0.11.2.js similarity index 100% rename from webclient/js/ui-bootstrap-tpls-0.11.2.js rename to syweb/webclient/js/ui-bootstrap-tpls-0.11.2.js diff --git a/webclient/login/login-controller.js b/syweb/webclient/login/login-controller.js similarity index 100% rename from webclient/login/login-controller.js rename to syweb/webclient/login/login-controller.js diff --git a/webclient/login/login.html b/syweb/webclient/login/login.html similarity index 100% rename from webclient/login/login.html rename to syweb/webclient/login/login.html diff --git a/webclient/login/register-controller.js b/syweb/webclient/login/register-controller.js similarity index 100% rename from webclient/login/register-controller.js rename to syweb/webclient/login/register-controller.js diff --git a/webclient/login/register.html b/syweb/webclient/login/register.html similarity index 100% rename from webclient/login/register.html rename to syweb/webclient/login/register.html diff --git a/webclient/media/busy.mp3 b/syweb/webclient/media/busy.mp3 similarity index 100% rename from webclient/media/busy.mp3 rename to syweb/webclient/media/busy.mp3 diff --git a/webclient/media/busy.ogg b/syweb/webclient/media/busy.ogg similarity index 100% rename from webclient/media/busy.ogg rename to syweb/webclient/media/busy.ogg diff --git a/webclient/media/callend.mp3 b/syweb/webclient/media/callend.mp3 similarity index 100% rename from webclient/media/callend.mp3 rename to syweb/webclient/media/callend.mp3 diff --git a/webclient/media/callend.ogg b/syweb/webclient/media/callend.ogg similarity index 100% rename from webclient/media/callend.ogg rename to syweb/webclient/media/callend.ogg diff --git a/webclient/media/ring.mp3 b/syweb/webclient/media/ring.mp3 similarity index 100% rename from webclient/media/ring.mp3 rename to syweb/webclient/media/ring.mp3 diff --git a/webclient/media/ring.ogg b/syweb/webclient/media/ring.ogg similarity index 100% rename from webclient/media/ring.ogg rename to syweb/webclient/media/ring.ogg diff --git a/webclient/media/ringback.mp3 b/syweb/webclient/media/ringback.mp3 similarity index 100% rename from webclient/media/ringback.mp3 rename to syweb/webclient/media/ringback.mp3 diff --git a/webclient/media/ringback.ogg b/syweb/webclient/media/ringback.ogg similarity index 100% rename from webclient/media/ringback.ogg rename to syweb/webclient/media/ringback.ogg diff --git a/webclient/mobile.css b/syweb/webclient/mobile.css similarity index 100% rename from webclient/mobile.css rename to syweb/webclient/mobile.css diff --git a/webclient/recents/recents-controller.js b/syweb/webclient/recents/recents-controller.js similarity index 100% rename from webclient/recents/recents-controller.js rename to syweb/webclient/recents/recents-controller.js diff --git a/webclient/recents/recents-filter.js b/syweb/webclient/recents/recents-filter.js similarity index 100% rename from webclient/recents/recents-filter.js rename to syweb/webclient/recents/recents-filter.js diff --git a/webclient/recents/recents.html b/syweb/webclient/recents/recents.html similarity index 100% rename from webclient/recents/recents.html rename to syweb/webclient/recents/recents.html diff --git a/webclient/room/room-controller.js b/syweb/webclient/room/room-controller.js similarity index 100% rename from webclient/room/room-controller.js rename to syweb/webclient/room/room-controller.js diff --git a/webclient/room/room-directive.js b/syweb/webclient/room/room-directive.js similarity index 100% rename from webclient/room/room-directive.js rename to syweb/webclient/room/room-directive.js diff --git a/webclient/room/room.html b/syweb/webclient/room/room.html similarity index 100% rename from webclient/room/room.html rename to syweb/webclient/room/room.html diff --git a/webclient/settings/settings-controller.js b/syweb/webclient/settings/settings-controller.js similarity index 100% rename from webclient/settings/settings-controller.js rename to syweb/webclient/settings/settings-controller.js diff --git a/webclient/settings/settings.html b/syweb/webclient/settings/settings.html similarity index 100% rename from webclient/settings/settings.html rename to syweb/webclient/settings/settings.html diff --git a/webclient/test/README b/syweb/webclient/test/README similarity index 100% rename from webclient/test/README rename to syweb/webclient/test/README diff --git a/webclient/test/e2e/home.spec.js b/syweb/webclient/test/e2e/home.spec.js similarity index 100% rename from webclient/test/e2e/home.spec.js rename to syweb/webclient/test/e2e/home.spec.js diff --git a/webclient/test/karma.conf.js b/syweb/webclient/test/karma.conf.js similarity index 100% rename from webclient/test/karma.conf.js rename to syweb/webclient/test/karma.conf.js diff --git a/webclient/test/protractor.conf.js b/syweb/webclient/test/protractor.conf.js similarity index 100% rename from webclient/test/protractor.conf.js rename to syweb/webclient/test/protractor.conf.js diff --git a/webclient/test/unit/user-controller.spec.js b/syweb/webclient/test/unit/user-controller.spec.js similarity index 100% rename from webclient/test/unit/user-controller.spec.js rename to syweb/webclient/test/unit/user-controller.spec.js diff --git a/webclient/user/user-controller.js b/syweb/webclient/user/user-controller.js similarity index 100% rename from webclient/user/user-controller.js rename to syweb/webclient/user/user-controller.js diff --git a/webclient/user/user.html b/syweb/webclient/user/user.html similarity index 100% rename from webclient/user/user.html rename to syweb/webclient/user/user.html From 4e52f9699b941f7845c2d88fb11428a2c30de465 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 4 Nov 2014 16:15:13 +0000 Subject: [PATCH 31/53] Update .gitignore to ignore config.js files in syweb/webclient. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b91b52b615..bd37f92dc4 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,7 @@ graph/*.svg graph/*.png graph/*.dot -webclient/config.js +**/webclient/config.js webclient/test/environment-protractor.js uploads From dca3ba2f77a3530d78a951556ea8c6cfdc0463df Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Tue, 4 Nov 2014 16:19:03 +0000 Subject: [PATCH 32/53] Determine webclient path by the python module it is contained in --- demo/start.sh | 2 +- synapse/app/homeserver.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/demo/start.sh b/demo/start.sh index fc6cd6303f..8b0cc84fe6 100755 --- a/demo/start.sh +++ b/demo/start.sh @@ -41,6 +41,6 @@ for port in 8080 8081 8082; do done echo "Starting webclient on port 8000..." -python "demo/webserver.py" -p 8000 -P "$DIR/webserver.pid" "webclient" +python "demo/webserver.py" -p 8000 -P "$DIR/webserver.pid" "syweb/webclient" cd "$CWD" diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 6394bc27d1..b3dae5da64 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -42,6 +42,7 @@ import os import re import sys import sqlite3 +import syweb logger = logging.getLogger(__name__) @@ -58,7 +59,9 @@ class SynapseHomeServer(HomeServer): return JsonResource() def build_resource_for_web_client(self): - return File("webclient") # TODO configurable? + syweb_path = os.path.dirname(syweb.__file__) + webclient_path = os.path.join(syweb_path, "webclient") + return File(webclient_path) # TODO configurable? def build_resource_for_content_repo(self): return ContentRepoResource( From 3068210a93e6240dd35445f272ec36edd188de83 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Tue, 4 Nov 2014 16:45:33 +0000 Subject: [PATCH 33/53] SYN-112: Get pynacl from github instead of PyPI --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 0cb56c400f..f5976cd762 100755 --- a/setup.py +++ b/setup.py @@ -43,6 +43,7 @@ setup( ], dependency_links=[ "https://github.com/matrix-org/syutil/tarball/v0.0.2#egg=syutil-0.0.2", + "https://github.com/pyca/pynacl/tarball/52dbe2dc33f1#egg=pynacl-0.3.0", ], setup_requires=[ "setuptools_trial", From a70765ed90196a418023d080dd6ba313c6305633 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 4 Nov 2014 17:19:49 +0000 Subject: [PATCH 34/53] Add matrix-service unit tests. Update angular-mocks. --- syweb/webclient/js/angular-mocks.js | 310 +++++++++++------- .../test/unit/matrix-service.spec.js | 64 ++++ 2 files changed, 262 insertions(+), 112 deletions(-) create mode 100644 syweb/webclient/test/unit/matrix-service.spec.js diff --git a/syweb/webclient/js/angular-mocks.js b/syweb/webclient/js/angular-mocks.js index 48c0b5decb..24bbcd4137 100755 --- a/syweb/webclient/js/angular-mocks.js +++ b/syweb/webclient/js/angular-mocks.js @@ -1,10 +1,3 @@ -/** - * @license AngularJS v1.2.22 - * (c) 2010-2014 Google, Inc. http://angularjs.org - * License: MIT - */ -(function(window, angular, undefined) { - 'use strict'; /** @@ -63,6 +56,8 @@ angular.mock.$Browser = function() { return listener; }; + self.$$checkUrlChange = angular.noop; + self.cookieHash = {}; self.lastCookieHash = {}; self.deferredFns = []; @@ -125,7 +120,7 @@ angular.mock.$Browser = function() { } }; - self.$$baseHref = ''; + self.$$baseHref = '/'; self.baseHref = function() { return this.$$baseHref; }; @@ -774,13 +769,22 @@ angular.mock.animate = angular.module('ngAnimateMock', ['ng']) }; }); - $provide.decorator('$animate', function($delegate, $$asyncCallback) { + $provide.decorator('$animate', ['$delegate', '$$asyncCallback', '$timeout', '$browser', + function($delegate, $$asyncCallback, $timeout, $browser) { var animate = { queue : [], + cancel : $delegate.cancel, enabled : $delegate.enabled, - triggerCallbacks : function() { + triggerCallbackEvents : function() { $$asyncCallback.flush(); }, + triggerCallbackPromise : function() { + $timeout.flush(0); + }, + triggerCallbacks : function() { + this.triggerCallbackEvents(); + this.triggerCallbackPromise(); + }, triggerReflow : function() { angular.forEach(reflowQueue, function(fn) { fn(); @@ -797,12 +801,12 @@ angular.mock.animate = angular.module('ngAnimateMock', ['ng']) element : arguments[0], args : arguments }); - $delegate[method].apply($delegate, arguments); + return $delegate[method].apply($delegate, arguments); }; }); return animate; - }); + }]); }]); @@ -888,7 +892,7 @@ angular.mock.dump = function(object) { * development please see {@link ngMockE2E.$httpBackend e2e $httpBackend mock}. * * During unit testing, we want our unit tests to run quickly and have no external dependencies so - * we don’t want to send [XHR](https://developer.mozilla.org/en/xmlhttprequest) or + * we don’t want to send [XHR](https://developer.mozilla.org/en/xmlhttprequest) or * [JSONP](http://en.wikipedia.org/wiki/JSONP) requests to a real server. All we really need is * to verify whether a certain request has been sent or not, or alternatively just let the * application make requests, respond with pre-trained responses and assert that the end result is @@ -1007,13 +1011,14 @@ angular.mock.dump = function(object) { ```js // testing controller describe('MyController', function() { - var $httpBackend, $rootScope, createController; + var $httpBackend, $rootScope, createController, authRequestHandler; beforeEach(inject(function($injector) { // Set up the mock http service responses $httpBackend = $injector.get('$httpBackend'); // backend definition common for all tests - $httpBackend.when('GET', '/auth.py').respond({userId: 'userX'}, {'A-Token': 'xxx'}); + authRequestHandler = $httpBackend.when('GET', '/auth.py') + .respond({userId: 'userX'}, {'A-Token': 'xxx'}); // Get hold of a scope (i.e. the root scope) $rootScope = $injector.get('$rootScope'); @@ -1039,11 +1044,23 @@ angular.mock.dump = function(object) { }); + it('should fail authentication', function() { + + // Notice how you can change the response even after it was set + authRequestHandler.respond(401, ''); + + $httpBackend.expectGET('/auth.py'); + var controller = createController(); + $httpBackend.flush(); + expect($rootScope.status).toBe('Failed...'); + }); + + it('should send msg to server', function() { var controller = createController(); $httpBackend.flush(); - // now you don’t care about the authentication, but + // now you don’t care about the authentication, but // the controller will still send the request and // $httpBackend will respond without you having to // specify the expectation and response for this request @@ -1186,32 +1203,39 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * Creates a new backend definition. * * @param {string} method HTTP method. - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives * data string and returns true if the data is as expected. * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header * object and returns true if the headers match the current definition. * @returns {requestHandler} Returns an object with `respond` method that controls how a matched - * request is handled. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. * - * - respond – + * - respond – * `{function([status,] data[, headers, statusText]) * | function(function(method, url, data, headers)}` - * – The respond method takes a set of static data to be returned or a function that can + * – The respond method takes a set of static data to be returned or a function that can * return an array containing response status (number), response data (string), response - * headers (Object), and the text for the status (string). + * headers (Object), and the text for the status (string). The respond method returns the + * `requestHandler` object for possible overrides. */ $httpBackend.when = function(method, url, data, headers) { var definition = new MockHttpExpectation(method, url, data, headers), chain = { respond: function(status, data, headers, statusText) { + definition.passThrough = undefined; definition.response = createResponse(status, data, headers, statusText); + return chain; } }; if ($browser) { chain.passThrough = function() { + definition.response = undefined; definition.passThrough = true; + return chain; }; } @@ -1225,10 +1249,12 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * @description * Creates a new backend definition for GET requests. For more info see `when()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(Object|function(Object))=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. */ /** @@ -1237,10 +1263,12 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * @description * Creates a new backend definition for HEAD requests. For more info see `when()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(Object|function(Object))=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. */ /** @@ -1249,10 +1277,12 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * @description * Creates a new backend definition for DELETE requests. For more info see `when()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(Object|function(Object))=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. */ /** @@ -1261,12 +1291,14 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * @description * Creates a new backend definition for POST requests. For more info see `when()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives * data string and returns true if the data is as expected. * @param {(Object|function(Object))=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. */ /** @@ -1275,12 +1307,14 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * @description * Creates a new backend definition for PUT requests. For more info see `when()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives * data string and returns true if the data is as expected. * @param {(Object|function(Object))=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. */ /** @@ -1289,9 +1323,11 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * @description * Creates a new backend definition for JSONP requests. For more info see `when()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. */ createShortMethods('when'); @@ -1303,30 +1339,36 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * Creates a new request expectation. * * @param {string} method HTTP method. - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that * receives data string and returns true if the data is as expected, or Object if request body * is in JSON format. * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header * object and returns true if the headers match the current expectation. * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. * - * - respond – + * - respond – * `{function([status,] data[, headers, statusText]) * | function(function(method, url, data, headers)}` - * – The respond method takes a set of static data to be returned or a function that can + * – The respond method takes a set of static data to be returned or a function that can * return an array containing response status (number), response data (string), response - * headers (Object), and the text for the status (string). + * headers (Object), and the text for the status (string). The respond method returns the + * `requestHandler` object for possible overrides. */ $httpBackend.expect = function(method, url, data, headers) { - var expectation = new MockHttpExpectation(method, url, data, headers); + var expectation = new MockHttpExpectation(method, url, data, headers), + chain = { + respond: function (status, data, headers, statusText) { + expectation.response = createResponse(status, data, headers, statusText); + return chain; + } + }; + expectations.push(expectation); - return { - respond: function (status, data, headers, statusText) { - expectation.response = createResponse(status, data, headers, statusText); - } - }; + return chain; }; @@ -1336,10 +1378,12 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * @description * Creates a new request expectation for GET requests. For more info see `expect()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {Object=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. See #expect for more info. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. See #expect for more info. */ /** @@ -1348,10 +1392,12 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * @description * Creates a new request expectation for HEAD requests. For more info see `expect()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {Object=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. */ /** @@ -1360,10 +1406,12 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * @description * Creates a new request expectation for DELETE requests. For more info see `expect()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {Object=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. */ /** @@ -1372,13 +1420,15 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * @description * Creates a new request expectation for POST requests. For more info see `expect()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that * receives data string and returns true if the data is as expected, or Object if request body * is in JSON format. * @param {Object=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. */ /** @@ -1387,13 +1437,15 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * @description * Creates a new request expectation for PUT requests. For more info see `expect()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that * receives data string and returns true if the data is as expected, or Object if request body * is in JSON format. * @param {Object=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. */ /** @@ -1402,13 +1454,15 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * @description * Creates a new request expectation for PATCH requests. For more info see `expect()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that * receives data string and returns true if the data is as expected, or Object if request body * is in JSON format. * @param {Object=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. */ /** @@ -1417,9 +1471,11 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * @description * Creates a new request expectation for JSONP requests. For more info see `expect()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. + * request is handled. You can save this object for later use and invoke `respond` again in + * order to change how a matched request is handled. */ createShortMethods('expect'); @@ -1434,11 +1490,11 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * all pending requests will be flushed. If there are no pending requests when the flush method * is called an exception is thrown (as this typically a sign of programming error). */ - $httpBackend.flush = function(count) { - $rootScope.$digest(); + $httpBackend.flush = function(count, digest) { + if (digest !== false) $rootScope.$digest(); if (!responses.length) throw new Error('No pending request to flush !'); - if (angular.isDefined(count)) { + if (angular.isDefined(count) && count !== null) { while (count--) { if (!responses.length) throw new Error('No more pending request to flush !'); responses.shift()(); @@ -1448,7 +1504,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { responses.shift()(); } } - $httpBackend.verifyNoOutstandingExpectation(); + $httpBackend.verifyNoOutstandingExpectation(digest); }; @@ -1466,8 +1522,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { * afterEach($httpBackend.verifyNoOutstandingExpectation); * ``` */ - $httpBackend.verifyNoOutstandingExpectation = function() { - $rootScope.$digest(); + $httpBackend.verifyNoOutstandingExpectation = function(digest) { + if (digest !== false) $rootScope.$digest(); if (expectations.length) { throw new Error('Unsatisfied requests: ' + expectations.join(', ')); } @@ -1511,7 +1567,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { function createShortMethods(prefix) { - angular.forEach(['GET', 'DELETE', 'JSONP'], function(method) { + angular.forEach(['GET', 'DELETE', 'JSONP', 'HEAD'], function(method) { $httpBackend[prefix + method] = function(url, headers) { return $httpBackend[prefix](method, url, undefined, headers); }; @@ -1541,6 +1597,7 @@ function MockHttpExpectation(method, url, data, headers) { this.matchUrl = function(u) { if (!url) return true; if (angular.isFunction(url.test)) return url.test(u); + if (angular.isFunction(url)) return url(u); return url == u; }; @@ -1627,7 +1684,7 @@ function MockXhr() { * that adds a "flush" and "verifyNoPendingTasks" methods. */ -angular.mock.$TimeoutDecorator = function($delegate, $browser) { +angular.mock.$TimeoutDecorator = ['$delegate', '$browser', function ($delegate, $browser) { /** * @ngdoc method @@ -1666,9 +1723,9 @@ angular.mock.$TimeoutDecorator = function($delegate, $browser) { } return $delegate; -}; +}]; -angular.mock.$RAFDecorator = function($delegate) { +angular.mock.$RAFDecorator = ['$delegate', function($delegate) { var queue = []; var rafFn = function(fn) { var index = queue.length; @@ -1694,9 +1751,9 @@ angular.mock.$RAFDecorator = function($delegate) { }; return rafFn; -}; +}]; -angular.mock.$AsyncCallbackDecorator = function($delegate) { +angular.mock.$AsyncCallbackDecorator = ['$delegate', function($delegate) { var callbacks = []; var addFn = function(fn) { callbacks.push(fn); @@ -1708,7 +1765,7 @@ angular.mock.$AsyncCallbackDecorator = function($delegate) { callbacks = []; }; return addFn; -}; +}]; /** * @@ -1822,22 +1879,25 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * Creates a new backend definition. * * @param {string} method HTTP method. - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(string|RegExp)=} data HTTP request body. * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header * object and returns true if the headers match the current definition. * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. + * control how a matched request is handled. You can save this object for later use and invoke + * `respond` or `passThrough` again in order to change how a matched request is handled. * - * - respond – + * - respond – * `{function([status,] data[, headers, statusText]) * | function(function(method, url, data, headers)}` - * – The respond method takes a set of static data to be returned or a function that can return + * – The respond method takes a set of static data to be returned or a function that can return * an array containing response status (number), response data (string), response headers * (Object), and the text for the status (string). - * - passThrough – `{function()}` – Any request matching a backend definition with + * - passThrough – `{function()}` – Any request matching a backend definition with * `passThrough` handler will be passed through to the real backend (an XHR request will be made * to the server.) + * - Both methods return the `requestHandler` object for possible overrides. */ /** @@ -1847,10 +1907,12 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * @description * Creates a new backend definition for GET requests. For more info see `when()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(Object|function(Object))=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. + * control how a matched request is handled. You can save this object for later use and invoke + * `respond` or `passThrough` again in order to change how a matched request is handled. */ /** @@ -1860,10 +1922,12 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * @description * Creates a new backend definition for HEAD requests. For more info see `when()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(Object|function(Object))=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. + * control how a matched request is handled. You can save this object for later use and invoke + * `respond` or `passThrough` again in order to change how a matched request is handled. */ /** @@ -1873,10 +1937,12 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * @description * Creates a new backend definition for DELETE requests. For more info see `when()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(Object|function(Object))=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. + * control how a matched request is handled. You can save this object for later use and invoke + * `respond` or `passThrough` again in order to change how a matched request is handled. */ /** @@ -1886,11 +1952,13 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * @description * Creates a new backend definition for POST requests. For more info see `when()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(string|RegExp)=} data HTTP request body. * @param {(Object|function(Object))=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. + * control how a matched request is handled. You can save this object for later use and invoke + * `respond` or `passThrough` again in order to change how a matched request is handled. */ /** @@ -1900,11 +1968,13 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * @description * Creates a new backend definition for PUT requests. For more info see `when()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(string|RegExp)=} data HTTP request body. * @param {(Object|function(Object))=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. + * control how a matched request is handled. You can save this object for later use and invoke + * `respond` or `passThrough` again in order to change how a matched request is handled. */ /** @@ -1914,11 +1984,13 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * @description * Creates a new backend definition for PATCH requests. For more info see `when()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @param {(string|RegExp)=} data HTTP request body. * @param {(Object|function(Object))=} headers HTTP headers. * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. + * control how a matched request is handled. You can save this object for later use and invoke + * `respond` or `passThrough` again in order to change how a matched request is handled. */ /** @@ -1928,30 +2000,17 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * @description * Creates a new backend definition for JSONP requests. For more info see `when()`. * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url + * and returns true if the url match the current definition. * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. + * control how a matched request is handled. You can save this object for later use and invoke + * `respond` or `passThrough` again in order to change how a matched request is handled. */ angular.mock.e2e = {}; angular.mock.e2e.$httpBackendDecorator = ['$rootScope', '$delegate', '$browser', createHttpBackendMock]; -angular.mock.clearDataCache = function() { - var key, - cache = angular.element.cache; - - for(key in cache) { - if (Object.prototype.hasOwnProperty.call(cache,key)) { - var handle = cache[key].handle; - - handle && angular.element(handle.elem).off(); - delete cache[key]; - } - } -}; - - if(window.jasmine || window.mocha) { var currentSpec = null, @@ -1982,8 +2041,6 @@ if(window.jasmine || window.mocha) { injector.get('$browser').pollFns.length = 0; } - angular.mock.clearDataCache(); - // clean up jquery's fragment cache angular.forEach(angular.element.fragments, function(val, key) { delete angular.element.fragments[key]; @@ -2003,6 +2060,7 @@ if(window.jasmine || window.mocha) { * @description * * *NOTE*: This function is also published on window for easy access.
+ * *NOTE*: This function is declared ONLY WHEN running tests with jasmine or mocha * * This function registers a module configuration code. It collects the configuration information * which will be used when the injector is created by {@link angular.mock.inject inject}. @@ -2045,6 +2103,7 @@ if(window.jasmine || window.mocha) { * @description * * *NOTE*: This function is also published on window for easy access.
+ * *NOTE*: This function is declared ONLY WHEN running tests with jasmine or mocha * * The inject function wraps a function into an injectable function. The inject() creates new * instance of {@link auto.$injector $injector} per test, which is then used for @@ -2144,14 +2203,28 @@ if(window.jasmine || window.mocha) { ///////////////////// function workFn() { var modules = currentSpec.$modules || []; - + var strictDi = !!currentSpec.$injectorStrict; modules.unshift('ngMock'); modules.unshift('ng'); var injector = currentSpec.$injector; if (!injector) { - injector = currentSpec.$injector = angular.injector(modules); + if (strictDi) { + // If strictDi is enabled, annotate the providerInjector blocks + angular.forEach(modules, function(moduleFn) { + if (typeof moduleFn === "function") { + angular.injector.$$annotate(moduleFn); + } + }); + } + injector = currentSpec.$injector = angular.injector(modules, strictDi); + currentSpec.$injectorStrict = strictDi; } for(var i = 0, ii = blockFns.length; i < ii; i++) { + if (currentSpec.$injectorStrict) { + // If the injector is strict / strictDi, and the spec wants to inject using automatic + // annotation, then annotate the function here. + injector.annotate(blockFns[i]); + } try { /* jshint -W040 *//* Jasmine explicitly provides a `this` object when calling functions */ injector.invoke(blockFns[i] || angular.noop, this); @@ -2167,7 +2240,20 @@ if(window.jasmine || window.mocha) { } } }; + + + angular.mock.inject.strictDi = function(value) { + value = arguments.length ? !!value : true; + return isSpecRunning() ? workFn() : workFn; + + function workFn() { + if (value !== currentSpec.$injectorStrict) { + if (currentSpec.$injector) { + throw new Error('Injector already created, can not modify strict annotations'); + } else { + currentSpec.$injectorStrict = value; + } + } + } + }; } - - -})(window, window.angular); \ No newline at end of file diff --git a/syweb/webclient/test/unit/matrix-service.spec.js b/syweb/webclient/test/unit/matrix-service.spec.js new file mode 100644 index 0000000000..3c5163e478 --- /dev/null +++ b/syweb/webclient/test/unit/matrix-service.spec.js @@ -0,0 +1,64 @@ +describe('MatrixService', function() { + var scope, httpBackend, createController; + var BASE = "http://example.com"; + var PREFIX = "/_matrix/client/api/v1"; + var URL = BASE + PREFIX; + var roomId = "!wejigf387t34:matrix.org"; + + beforeEach(module('matrixService')); + + beforeEach(inject(function($rootScope, $httpBackend, $controller) { + httpBackend = $httpBackend; + scope = $rootScope; + })); + + afterEach(function() { + httpBackend.verifyNoOutstandingExpectation(); + httpBackend.verifyNoOutstandingRequest(); + }); + + it('should be able to GET /rooms/$roomid/state', inject(function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + matrixService.roomState(roomId).then(function(response) { + expect(response.data).toEqual([]); + }); + + httpBackend.expect('GET', + URL + "/rooms/" + roomId + "/state?access_token=foobar") + .respond([]); + httpBackend.flush(); + })); + + it('should be able to POST /join', inject(function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + matrixService.joinAlias(roomId).then(function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expect('POST', + URL + "/join/" + encodeURIComponent(roomId) + "?access_token=foobar") + .respond({}); + httpBackend.flush(); + })); + + it('should be able to POST /rooms/$roomid/join', inject(function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + matrixService.join(roomId).then(function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expect('POST', + URL + "/rooms/" + encodeURIComponent(roomId) + "/join?access_token=foobar") + .respond({}); + httpBackend.flush(); + })); +}); From 4facbe02fbe53aafebfd68d88ae09c9ae77f3cd3 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 4 Nov 2014 17:48:47 +0000 Subject: [PATCH 35/53] URL encoding bugfix and add more tests. --- .../components/matrix/matrix-service.js | 2 +- .../test/unit/matrix-service.spec.js | 46 ++++++++++++++++--- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/syweb/webclient/components/matrix/matrix-service.js b/syweb/webclient/components/matrix/matrix-service.js index fedfb8910d..5b63fb4a3b 100644 --- a/syweb/webclient/components/matrix/matrix-service.js +++ b/syweb/webclient/components/matrix/matrix-service.js @@ -267,7 +267,7 @@ angular.module('matrixService', []) // get room state for a specific room roomState: function(room_id) { - var path = "/rooms/" + room_id + "/state"; + var path = "/rooms/" + encodeURIComponent(room_id) + "/state"; return doRequest("GET", path); }, diff --git a/syweb/webclient/test/unit/matrix-service.spec.js b/syweb/webclient/test/unit/matrix-service.spec.js index 3c5163e478..29d2ca7be7 100644 --- a/syweb/webclient/test/unit/matrix-service.spec.js +++ b/syweb/webclient/test/unit/matrix-service.spec.js @@ -1,5 +1,5 @@ describe('MatrixService', function() { - var scope, httpBackend, createController; + var scope, httpBackend; var BASE = "http://example.com"; var PREFIX = "/_matrix/client/api/v1"; var URL = BASE + PREFIX; @@ -7,7 +7,7 @@ describe('MatrixService', function() { beforeEach(module('matrixService')); - beforeEach(inject(function($rootScope, $httpBackend, $controller) { + beforeEach(inject(function($rootScope, $httpBackend) { httpBackend = $httpBackend; scope = $rootScope; })); @@ -17,6 +17,40 @@ describe('MatrixService', function() { httpBackend.verifyNoOutstandingRequest(); }); + it('should be able to POST /createRoom with an alias', inject(function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + var alias = "flibble"; + matrixService.create(alias).then(function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectPOST(URL + "/createRoom?access_token=foobar", + { + room_alias_name: alias + }) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to GET /initialSync', inject(function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + var limit = 15; + matrixService.initialSync(limit).then(function(response) { + expect(response.data).toEqual([]); + }); + + httpBackend.expectGET( + URL + "/initialSync?access_token=foobar&limit=15") + .respond([]); + httpBackend.flush(); + })); + it('should be able to GET /rooms/$roomid/state', inject(function(matrixService) { matrixService.setConfig({ access_token: "foobar", @@ -26,8 +60,8 @@ describe('MatrixService', function() { expect(response.data).toEqual([]); }); - httpBackend.expect('GET', - URL + "/rooms/" + roomId + "/state?access_token=foobar") + httpBackend.expectGET( + URL + "/rooms/" + encodeURIComponent(roomId) + "/state?access_token=foobar") .respond([]); httpBackend.flush(); })); @@ -41,7 +75,7 @@ describe('MatrixService', function() { expect(response.data).toEqual({}); }); - httpBackend.expect('POST', + httpBackend.expectPOST( URL + "/join/" + encodeURIComponent(roomId) + "?access_token=foobar") .respond({}); httpBackend.flush(); @@ -56,7 +90,7 @@ describe('MatrixService', function() { expect(response.data).toEqual({}); }); - httpBackend.expect('POST', + httpBackend.expectPOST( URL + "/rooms/" + encodeURIComponent(roomId) + "/join?access_token=foobar") .respond({}); httpBackend.flush(); From a2aafeb959075acd76374d2a7d01830f59930996 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 5 Nov 2014 11:11:36 +0000 Subject: [PATCH 36/53] Add a bunch more unit tests for matrixService. --- .../test/unit/matrix-service.spec.js | 197 +++++++++++++++++- 1 file changed, 191 insertions(+), 6 deletions(-) diff --git a/syweb/webclient/test/unit/matrix-service.spec.js b/syweb/webclient/test/unit/matrix-service.spec.js index 29d2ca7be7..95a43057c4 100644 --- a/syweb/webclient/test/unit/matrix-service.spec.js +++ b/syweb/webclient/test/unit/matrix-service.spec.js @@ -17,7 +17,8 @@ describe('MatrixService', function() { httpBackend.verifyNoOutstandingRequest(); }); - it('should be able to POST /createRoom with an alias', inject(function(matrixService) { + it('should be able to POST /createRoom with an alias', inject( + function(matrixService) { matrixService.setConfig({ access_token: "foobar", homeserver: "http://example.com" @@ -51,7 +52,8 @@ describe('MatrixService', function() { httpBackend.flush(); })); - it('should be able to GET /rooms/$roomid/state', inject(function(matrixService) { + it('should be able to GET /rooms/$roomid/state', inject( + function(matrixService) { matrixService.setConfig({ access_token: "foobar", homeserver: "http://example.com" @@ -61,7 +63,8 @@ describe('MatrixService', function() { }); httpBackend.expectGET( - URL + "/rooms/" + encodeURIComponent(roomId) + "/state?access_token=foobar") + URL + "/rooms/" + encodeURIComponent(roomId) + + "/state?access_token=foobar") .respond([]); httpBackend.flush(); })); @@ -76,12 +79,15 @@ describe('MatrixService', function() { }); httpBackend.expectPOST( - URL + "/join/" + encodeURIComponent(roomId) + "?access_token=foobar") + URL + "/join/" + encodeURIComponent(roomId) + + "?access_token=foobar", + {}) .respond({}); httpBackend.flush(); })); - it('should be able to POST /rooms/$roomid/join', inject(function(matrixService) { + it('should be able to POST /rooms/$roomid/join', inject( + function(matrixService) { matrixService.setConfig({ access_token: "foobar", homeserver: "http://example.com" @@ -91,7 +97,186 @@ describe('MatrixService', function() { }); httpBackend.expectPOST( - URL + "/rooms/" + encodeURIComponent(roomId) + "/join?access_token=foobar") + URL + "/rooms/" + encodeURIComponent(roomId) + + "/join?access_token=foobar", + {}) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to POST /rooms/$roomid/invite', inject( + function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + var inviteUserId = "@user:example.com"; + matrixService.invite(roomId, inviteUserId).then(function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectPOST( + URL + "/rooms/" + encodeURIComponent(roomId) + + "/invite?access_token=foobar", + { + user_id: inviteUserId + }) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to POST /rooms/$roomid/leave', inject( + function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + matrixService.leave(roomId).then(function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectPOST( + URL + "/rooms/" + encodeURIComponent(roomId) + + "/leave?access_token=foobar", + {}) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to POST /rooms/$roomid/ban', inject( + function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + var userId = "@example:example.com"; + var reason = "Because."; + matrixService.ban(roomId, userId, reason).then(function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectPOST( + URL + "/rooms/" + encodeURIComponent(roomId) + + "/ban?access_token=foobar", + { + user_id: userId, + reason: reason + }) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to GET /directory/room/$alias', inject( + function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + var alias = "#test:example.com"; + var roomId = "!wefuhewfuiw:example.com"; + matrixService.resolveRoomAlias(alias).then(function(response) { + expect(response.data).toEqual({ + room_id: roomId + }); + }); + + httpBackend.expectGET( + URL + "/directory/room/" + encodeURIComponent(alias) + + "?access_token=foobar") + .respond({ + room_id: roomId + }); + httpBackend.flush(); + })); + + it('should be able to send m.room.name', inject(function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + var roomId = "!fh38hfwfwef:example.com"; + var name = "Room Name"; + matrixService.setName(roomId, name).then(function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectPUT( + URL + "/rooms/" + encodeURIComponent(roomId) + + "/state/m.room.name?access_token=foobar", + { + name: name + }) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to send m.room.topic', inject(function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + var roomId = "!fh38hfwfwef:example.com"; + var topic = "A room topic can go here."; + matrixService.setTopic(roomId, topic).then(function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectPUT( + URL + "/rooms/" + encodeURIComponent(roomId) + + "/state/m.room.topic?access_token=foobar", + { + topic: topic + }) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to send generic state events without a state key', inject( + function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + var roomId = "!fh38hfwfwef:example.com"; + var eventType = "com.example.events.test"; + var content = { + testing: "1 2 3" + }; + matrixService.sendStateEvent(roomId, eventType, content).then( + function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectPUT( + URL + "/rooms/" + encodeURIComponent(roomId) + "/state/" + + encodeURIComponent(eventType) + "?access_token=foobar", + content) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to send generic state events with a state key', inject( + function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + var roomId = "!fh38hfwfwef:example.com"; + var eventType = "com.example.events.test"; + var content = { + testing: "1 2 3" + }; + var stateKey = "version1"; + matrixService.sendStateEvent(roomId, eventType, content, stateKey).then( + function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectPUT( + URL + "/rooms/" + encodeURIComponent(roomId) + "/state/" + + encodeURIComponent(eventType) + "/" + encodeURIComponent(stateKey)+ + "?access_token=foobar", + content) .respond({}); httpBackend.flush(); })); From 9f6d1b10ad5a9098a8f72157875ce97fc44bc423 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 5 Nov 2014 11:21:55 +0000 Subject: [PATCH 37/53] Be sure to urlencode/decode event types correctly in both the web client and HS. --- synapse/rest/room.py | 2 +- syweb/webclient/components/matrix/matrix-service.js | 4 ++-- syweb/webclient/test/unit/matrix-service.spec.js | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/synapse/rest/room.py b/synapse/rest/room.py index ec0ce78fda..d97babea08 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -148,7 +148,7 @@ class RoomStateEventRestServlet(RestServlet): content = _parse_json(request) event = self.event_factory.create_event( - etype=event_type, + etype=urllib.unquote(event_type), content=content, room_id=urllib.unquote(room_id), user_id=user.to_string(), diff --git a/syweb/webclient/components/matrix/matrix-service.js b/syweb/webclient/components/matrix/matrix-service.js index 5b63fb4a3b..e1e5b88b3e 100644 --- a/syweb/webclient/components/matrix/matrix-service.js +++ b/syweb/webclient/components/matrix/matrix-service.js @@ -375,9 +375,9 @@ angular.module('matrixService', []) sendStateEvent: function(room_id, eventType, content, state_key) { - var path = "/rooms/$room_id/state/"+eventType; + var path = "/rooms/$room_id/state/"+ encodeURIComponent(eventType); if (state_key !== undefined) { - path += "/" + state_key; + path += "/" + encodeURIComponent(state_key); } room_id = encodeURIComponent(room_id); path = path.replace("$room_id", room_id); diff --git a/syweb/webclient/test/unit/matrix-service.spec.js b/syweb/webclient/test/unit/matrix-service.spec.js index 95a43057c4..b54163a641 100644 --- a/syweb/webclient/test/unit/matrix-service.spec.js +++ b/syweb/webclient/test/unit/matrix-service.spec.js @@ -238,7 +238,7 @@ describe('MatrixService', function() { homeserver: "http://example.com" }); var roomId = "!fh38hfwfwef:example.com"; - var eventType = "com.example.events.test"; + var eventType = "com.example.events.test:special@characters"; var content = { testing: "1 2 3" }; @@ -262,11 +262,11 @@ describe('MatrixService', function() { homeserver: "http://example.com" }); var roomId = "!fh38hfwfwef:example.com"; - var eventType = "com.example.events.test"; + var eventType = "com.example.events.test:special@characters"; var content = { testing: "1 2 3" }; - var stateKey = "version1"; + var stateKey = "version:1"; matrixService.sendStateEvent(roomId, eventType, content, stateKey).then( function(response) { expect(response.data).toEqual({}); From 42081b1937127979f3fb0a673eefb866cb4de64e Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 5 Nov 2014 11:28:22 +0000 Subject: [PATCH 38/53] Don't urlencode event types just yet so older HSes don't 500. Skip the tests which test for urlencoding, and add a TODO in matrixService. --- syweb/webclient/components/matrix/matrix-service.js | 4 +++- syweb/webclient/test/unit/matrix-service.spec.js | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/syweb/webclient/components/matrix/matrix-service.js b/syweb/webclient/components/matrix/matrix-service.js index e1e5b88b3e..8ff2999e2d 100644 --- a/syweb/webclient/components/matrix/matrix-service.js +++ b/syweb/webclient/components/matrix/matrix-service.js @@ -375,7 +375,9 @@ angular.module('matrixService', []) sendStateEvent: function(room_id, eventType, content, state_key) { - var path = "/rooms/$room_id/state/"+ encodeURIComponent(eventType); + var path = "/rooms/$room_id/state/"+ eventType; + // TODO: uncomment this when matrix.org is updated, else all state events 500. + // var path = "/rooms/$room_id/state/"+ encodeURIComponent(eventType); if (state_key !== undefined) { path += "/" + encodeURIComponent(state_key); } diff --git a/syweb/webclient/test/unit/matrix-service.spec.js b/syweb/webclient/test/unit/matrix-service.spec.js index b54163a641..ed290f2ff3 100644 --- a/syweb/webclient/test/unit/matrix-service.spec.js +++ b/syweb/webclient/test/unit/matrix-service.spec.js @@ -231,7 +231,7 @@ describe('MatrixService', function() { httpBackend.flush(); })); - it('should be able to send generic state events without a state key', inject( + xit('should be able to send generic state events without a state key', inject( function(matrixService) { matrixService.setConfig({ access_token: "foobar", @@ -255,7 +255,7 @@ describe('MatrixService', function() { httpBackend.flush(); })); - it('should be able to send generic state events with a state key', inject( + xit('should be able to send generic state events with a state key', inject( function(matrixService) { matrixService.setConfig({ access_token: "foobar", From d3a02ec03806d7629681895a0b960be24ff9ae1e Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 5 Nov 2014 12:05:11 +0000 Subject: [PATCH 39/53] Fix url decoding bugs with /redact and /send APIs. --- synapse/rest/room.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/synapse/rest/room.py b/synapse/rest/room.py index d97babea08..7724967061 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -182,7 +182,7 @@ class RoomSendEventRestServlet(RestServlet): content = _parse_json(request) event = self.event_factory.create_event( - etype=event_type, + etype=urllib.unquote(event_type), room_id=urllib.unquote(room_id), user_id=user.to_string(), content=content @@ -458,7 +458,7 @@ class RoomRedactEventRestServlet(RestServlet): room_id=urllib.unquote(room_id), user_id=user.to_string(), content=content, - redacts=event_id, + redacts=urllib.unquote(event_id), ) msg_handler = self.handlers.message_handler From 0881a8ae6f6468af8345fc9e6e46bdb32dfb405b Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 5 Nov 2014 12:32:28 +0000 Subject: [PATCH 40/53] Add more tests and a TODO. --- .../test/unit/matrix-service.spec.js | 57 ++++++++++++++++++- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/syweb/webclient/test/unit/matrix-service.spec.js b/syweb/webclient/test/unit/matrix-service.spec.js index ed290f2ff3..2ca9a24323 100644 --- a/syweb/webclient/test/unit/matrix-service.spec.js +++ b/syweb/webclient/test/unit/matrix-service.spec.js @@ -231,14 +231,14 @@ describe('MatrixService', function() { httpBackend.flush(); })); - xit('should be able to send generic state events without a state key', inject( + it('should be able to send generic state events without a state key', inject( function(matrixService) { matrixService.setConfig({ access_token: "foobar", homeserver: "http://example.com" }); var roomId = "!fh38hfwfwef:example.com"; - var eventType = "com.example.events.test:special@characters"; + var eventType = "com.example.events.test"; var content = { testing: "1 2 3" }; @@ -255,6 +255,8 @@ describe('MatrixService', function() { httpBackend.flush(); })); + // TODO: Skipped since the webclient is purposefully broken so as not to + // 500 matrix.org xit('should be able to send generic state events with a state key', inject( function(matrixService) { matrixService.setConfig({ @@ -280,4 +282,55 @@ describe('MatrixService', function() { .respond({}); httpBackend.flush(); })); + + it('should be able to PUT generic events ', inject( + function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + var roomId = "!fh38hfwfwef:example.com"; + var eventType = "com.example.events.test"; + var txnId = "42"; + var content = { + testing: "1 2 3" + }; + matrixService.sendEvent(roomId, eventType, txnId, content).then( + function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectPUT( + URL + "/rooms/" + encodeURIComponent(roomId) + "/send/" + + encodeURIComponent(eventType) + "/" + encodeURIComponent(txnId)+ + "?access_token=foobar", + content) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to PUT text messages ', inject( + function(matrixService) { + matrixService.setConfig({ + access_token: "foobar", + homeserver: "http://example.com" + }); + var roomId = "!fh38hfwfwef:example.com"; + var body = "ABC 123"; + matrixService.sendTextMessage(roomId, body).then( + function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectPUT( + new RegExp(URL + "/rooms/" + encodeURIComponent(roomId) + + "/send/m.room.message/(.*)" + + "?access_token=foobar"), + { + body: body, + msgtype: "m.text" + }) + .respond({}); + httpBackend.flush(); + })); }); From 988a8526b5a75a988fffd9ab5c3b4abbd2a41840 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 5 Nov 2014 14:35:41 +0000 Subject: [PATCH 41/53] Finish matrixService unit tests. Add missing encodeURIComponent to path args. --- .../components/matrix/matrix-service.js | 11 +- .../test/unit/matrix-service.spec.js | 288 ++++++++++++++---- 2 files changed, 234 insertions(+), 65 deletions(-) diff --git a/syweb/webclient/components/matrix/matrix-service.js b/syweb/webclient/components/matrix/matrix-service.js index 8ff2999e2d..63051c4f47 100644 --- a/syweb/webclient/components/matrix/matrix-service.js +++ b/syweb/webclient/components/matrix/matrix-service.js @@ -443,7 +443,8 @@ angular.module('matrixService', []) redactEvent: function(room_id, event_id) { var path = "/rooms/$room_id/redact/$event_id"; - path = path.replace("$room_id", room_id); + path = path.replace("$room_id", encodeURIComponent(room_id)); + // TODO: encodeURIComponent when HS updated. path = path.replace("$event_id", event_id); var content = {}; return doRequest("POST", path, undefined, content); @@ -461,7 +462,7 @@ angular.module('matrixService', []) paginateBackMessages: function(room_id, from_token, limit) { var path = "/rooms/$room_id/messages"; - path = path.replace("$room_id", room_id); + path = path.replace("$room_id", encodeURIComponent(room_id)); var params = { from: from_token, limit: limit, @@ -509,12 +510,12 @@ angular.module('matrixService', []) setProfileInfo: function(data, info_segment) { var path = "/profile/$user/" + info_segment; - path = path.replace("$user", config.user_id); + path = path.replace("$user", encodeURIComponent(config.user_id)); return doRequest("PUT", path, undefined, data); }, getProfileInfo: function(userId, info_segment) { - var path = "/profile/"+userId + var path = "/profile/"+encodeURIComponent(userId); if (info_segment) path += '/' + info_segment; return doRequest("GET", path); }, @@ -633,7 +634,7 @@ angular.module('matrixService', []) // Set the logged in user presence state setUserPresence: function(presence) { var path = "/presence/$user_id/status"; - path = path.replace("$user_id", config.user_id); + path = path.replace("$user_id", encodeURIComponent(config.user_id)); return doRequest("PUT", path, undefined, { presence: presence }); diff --git a/syweb/webclient/test/unit/matrix-service.spec.js b/syweb/webclient/test/unit/matrix-service.spec.js index 2ca9a24323..4959f2395d 100644 --- a/syweb/webclient/test/unit/matrix-service.spec.js +++ b/syweb/webclient/test/unit/matrix-service.spec.js @@ -5,6 +5,11 @@ describe('MatrixService', function() { var URL = BASE + PREFIX; var roomId = "!wejigf387t34:matrix.org"; + var CONFIG = { + access_token: "foobar", + homeserver: BASE + }; + beforeEach(module('matrixService')); beforeEach(inject(function($rootScope, $httpBackend) { @@ -19,10 +24,7 @@ describe('MatrixService', function() { it('should be able to POST /createRoom with an alias', inject( function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); var alias = "flibble"; matrixService.create(alias).then(function(response) { expect(response.data).toEqual({}); @@ -37,10 +39,7 @@ describe('MatrixService', function() { })); it('should be able to GET /initialSync', inject(function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); var limit = 15; matrixService.initialSync(limit).then(function(response) { expect(response.data).toEqual([]); @@ -54,10 +53,7 @@ describe('MatrixService', function() { it('should be able to GET /rooms/$roomid/state', inject( function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); matrixService.roomState(roomId).then(function(response) { expect(response.data).toEqual([]); }); @@ -70,10 +66,7 @@ describe('MatrixService', function() { })); it('should be able to POST /join', inject(function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); matrixService.joinAlias(roomId).then(function(response) { expect(response.data).toEqual({}); }); @@ -88,10 +81,7 @@ describe('MatrixService', function() { it('should be able to POST /rooms/$roomid/join', inject( function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); matrixService.join(roomId).then(function(response) { expect(response.data).toEqual({}); }); @@ -106,10 +96,7 @@ describe('MatrixService', function() { it('should be able to POST /rooms/$roomid/invite', inject( function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); var inviteUserId = "@user:example.com"; matrixService.invite(roomId, inviteUserId).then(function(response) { expect(response.data).toEqual({}); @@ -127,10 +114,7 @@ describe('MatrixService', function() { it('should be able to POST /rooms/$roomid/leave', inject( function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); matrixService.leave(roomId).then(function(response) { expect(response.data).toEqual({}); }); @@ -145,10 +129,7 @@ describe('MatrixService', function() { it('should be able to POST /rooms/$roomid/ban', inject( function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); var userId = "@example:example.com"; var reason = "Because."; matrixService.ban(roomId, userId, reason).then(function(response) { @@ -168,10 +149,7 @@ describe('MatrixService', function() { it('should be able to GET /directory/room/$alias', inject( function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); var alias = "#test:example.com"; var roomId = "!wefuhewfuiw:example.com"; matrixService.resolveRoomAlias(alias).then(function(response) { @@ -190,10 +168,7 @@ describe('MatrixService', function() { })); it('should be able to send m.room.name', inject(function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); var roomId = "!fh38hfwfwef:example.com"; var name = "Room Name"; matrixService.setName(roomId, name).then(function(response) { @@ -211,10 +186,7 @@ describe('MatrixService', function() { })); it('should be able to send m.room.topic', inject(function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); var roomId = "!fh38hfwfwef:example.com"; var topic = "A room topic can go here."; matrixService.setTopic(roomId, topic).then(function(response) { @@ -233,10 +205,7 @@ describe('MatrixService', function() { it('should be able to send generic state events without a state key', inject( function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); var roomId = "!fh38hfwfwef:example.com"; var eventType = "com.example.events.test"; var content = { @@ -259,10 +228,7 @@ describe('MatrixService', function() { // 500 matrix.org xit('should be able to send generic state events with a state key', inject( function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); var roomId = "!fh38hfwfwef:example.com"; var eventType = "com.example.events.test:special@characters"; var content = { @@ -285,10 +251,7 @@ describe('MatrixService', function() { it('should be able to PUT generic events ', inject( function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); var roomId = "!fh38hfwfwef:example.com"; var eventType = "com.example.events.test"; var txnId = "42"; @@ -311,10 +274,7 @@ describe('MatrixService', function() { it('should be able to PUT text messages ', inject( function(matrixService) { - matrixService.setConfig({ - access_token: "foobar", - homeserver: "http://example.com" - }); + matrixService.setConfig(CONFIG); var roomId = "!fh38hfwfwef:example.com"; var body = "ABC 123"; matrixService.sendTextMessage(roomId, body).then( @@ -333,4 +293,212 @@ describe('MatrixService', function() { .respond({}); httpBackend.flush(); })); + + it('should be able to PUT emote messages ', inject( + function(matrixService) { + matrixService.setConfig(CONFIG); + var roomId = "!fh38hfwfwef:example.com"; + var body = "ABC 123"; + matrixService.sendEmoteMessage(roomId, body).then( + function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectPUT( + new RegExp(URL + "/rooms/" + encodeURIComponent(roomId) + + "/send/m.room.message/(.*)" + + "?access_token=foobar"), + { + body: body, + msgtype: "m.emote" + }) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to POST redactions', inject( + function(matrixService) { + matrixService.setConfig(CONFIG); + var roomId = "!fh38hfwfwef:example.com"; + var eventId = "fwefwexample.com"; + matrixService.redactEvent(roomId, eventId).then( + function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectPOST(URL + "/rooms/" + encodeURIComponent(roomId) + + "/redact/" + encodeURIComponent(eventId) + + "?access_token=foobar") + .respond({}); + httpBackend.flush(); + })); + + it('should be able to GET /directory/room/$alias', inject( + function(matrixService) { + matrixService.setConfig(CONFIG); + var alias = "#test:example.com"; + var roomId = "!wefuhewfuiw:example.com"; + matrixService.resolveRoomAlias(alias).then(function(response) { + expect(response.data).toEqual({ + room_id: roomId + }); + }); + + httpBackend.expectGET( + URL + "/directory/room/" + encodeURIComponent(alias) + + "?access_token=foobar") + .respond({ + room_id: roomId + }); + httpBackend.flush(); + })); + + it('should be able to GET /rooms/$roomid/members', inject( + function(matrixService) { + matrixService.setConfig(CONFIG); + var roomId = "!wefuhewfuiw:example.com"; + matrixService.getMemberList(roomId).then(function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectGET( + URL + "/rooms/" + encodeURIComponent(roomId) + + "/members?access_token=foobar") + .respond({}); + httpBackend.flush(); + })); + + it('should be able to paginate a room', inject( + function(matrixService) { + matrixService.setConfig(CONFIG); + var roomId = "!wefuhewfuiw:example.com"; + var from = "3t_44e_54z"; + var limit = 20; + matrixService.paginateBackMessages(roomId, from, limit).then(function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectGET( + URL + "/rooms/" + encodeURIComponent(roomId) + + "/messages?access_token=foobar&dir=b&from="+ + encodeURIComponent(from)+"&limit="+limit) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to GET /publicRooms', inject( + function(matrixService) { + matrixService.setConfig(CONFIG); + matrixService.publicRooms().then(function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectGET( + new RegExp(URL + "/publicRooms(.*)")) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to GET /profile/$userid/displayname', inject( + function(matrixService) { + matrixService.setConfig(CONFIG); + var userId = "@foo:example.com"; + matrixService.getDisplayName(userId).then(function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectGET(URL + "/profile/" + encodeURIComponent(userId) + + "/displayname?access_token=foobar") + .respond({}); + httpBackend.flush(); + })); + + it('should be able to GET /profile/$userid/avatar_url', inject( + function(matrixService) { + matrixService.setConfig(CONFIG); + var userId = "@foo:example.com"; + matrixService.getProfilePictureUrl(userId).then(function(response) { + expect(response.data).toEqual({}); + }); + + httpBackend.expectGET(URL + "/profile/" + encodeURIComponent(userId) + + "/avatar_url?access_token=foobar") + .respond({}); + httpBackend.flush(); + })); + + it('should be able to PUT /profile/$me/avatar_url', inject( + function(matrixService) { + var testConfig = angular.copy(CONFIG); + testConfig.user_id = "@bob:example.com"; + matrixService.setConfig(testConfig); + var url = "http://example.com/mypic.jpg"; + matrixService.setProfilePictureUrl(url).then(function(response) { + expect(response.data).toEqual({}); + }); + httpBackend.expectPUT(URL + "/profile/" + + encodeURIComponent(testConfig.user_id) + + "/avatar_url?access_token=foobar", + { + avatar_url: url + }) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to PUT /profile/$me/displayname', inject( + function(matrixService) { + var testConfig = angular.copy(CONFIG); + testConfig.user_id = "@bob:example.com"; + matrixService.setConfig(testConfig); + var displayname = "Bob Smith"; + matrixService.setDisplayName(displayname).then(function(response) { + expect(response.data).toEqual({}); + }); + httpBackend.expectPUT(URL + "/profile/" + + encodeURIComponent(testConfig.user_id) + + "/displayname?access_token=foobar", + { + displayname: displayname + }) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to login with password', inject( + function(matrixService) { + matrixService.setConfig(CONFIG); + var userId = "@bob:example.com"; + var password = "monkey"; + matrixService.login(userId, password).then(function(response) { + expect(response.data).toEqual({}); + }); + httpBackend.expectPOST(new RegExp(URL+"/login(.*)"), + { + user: userId, + password: password, + type: "m.login.password" + }) + .respond({}); + httpBackend.flush(); + })); + + it('should be able to PUT presence status', inject( + function(matrixService) { + var testConfig = angular.copy(CONFIG); + testConfig.user_id = "@bob:example.com"; + matrixService.setConfig(testConfig); + var status = "unavailable"; + matrixService.setUserPresence(status).then(function(response) { + expect(response.data).toEqual({}); + }); + httpBackend.expectPUT(URL+"/presence/"+ + encodeURIComponent(testConfig.user_id)+ + "/status?access_token=foobar", + { + presence: status + }) + .respond({}); + httpBackend.flush(); + })); }); From 6aba43f6cc2350f0fce3eb15c4bdd38d7a9c17f6 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 5 Nov 2014 15:32:35 +0000 Subject: [PATCH 42/53] Add a few eventHandlerService tests. --- .../test/unit/event-handler-service.spec.js | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 syweb/webclient/test/unit/event-handler-service.spec.js diff --git a/syweb/webclient/test/unit/event-handler-service.spec.js b/syweb/webclient/test/unit/event-handler-service.spec.js new file mode 100644 index 0000000000..023abec98b --- /dev/null +++ b/syweb/webclient/test/unit/event-handler-service.spec.js @@ -0,0 +1,105 @@ +describe('EventHandlerService', function() { + var scope; + + var modelService = {}; + + // setup the service and mocked dependencies + beforeEach(function() { + // dependencies + module('matrixService'); + module('notificationService'); + module('mPresence'); + + // cleanup mocked methods + modelService = {}; + + // mocked dependencies + module(function ($provide) { + $provide.value('modelService', modelService); + }); + + // tested service + module('eventHandlerService'); + }); + + beforeEach(inject(function($rootScope) { + scope = $rootScope; + })); + + it('should be able to get the number of joined users in a room', inject( + function(eventHandlerService) { + var roomId = "!foo:matrix.org"; + // set mocked data + modelService.getRoom = function(roomId) { + return { + room_id: roomId, + current_room_state: { + members: { + "@adam:matrix.org": { + content: { membership: "join" }, + user_id: "@adam:matrix.org" + }, + "@beth:matrix.org": { + content: { membership: "invite" }, + user_id: "@beth:matrix.org" + }, + "@charlie:matrix.org": { + content: { membership: "join" }, + user_id: "@charlie:matrix.org" + }, + "@danice:matrix.org": { + content: { membership: "leave" }, + user_id: "@danice:matrix.org" + } + } + } + }; + } + + var num = eventHandlerService.getUsersCountInRoom(roomId); + expect(num).toEqual(2); + })); + + it('should be able to get a users power level', inject( + function(eventHandlerService) { + var roomId = "!foo:matrix.org"; + // set mocked data + modelService.getRoom = function(roomId) { + return { + room_id: roomId, + current_room_state: { + members: { + "@adam:matrix.org": { + content: { membership: "join" }, + user_id: "@adam:matrix.org" + }, + "@beth:matrix.org": { + content: { membership: "join" }, + user_id: "@beth:matrix.org" + } + }, + s: { + "m.room.power_levels": { + content: { + "@adam:matrix.org": 90, + "default": 50 + } + } + }, + state: function(type, key) { + return key ? this.s[type+key] : this.s[type] + } + } + }; + }; + + var num = eventHandlerService.getUserPowerLevel(roomId, "@beth:matrix.org"); + expect(num).toEqual(50); + + num = eventHandlerService.getUserPowerLevel(roomId, "@adam:matrix.org"); + expect(num).toEqual(90); + + num = eventHandlerService.getUserPowerLevel(roomId, "@unknown:matrix.org"); + expect(num).toEqual(50); + })); +}); \ No newline at end of file From 69c396825b28074346e3cfe3f239b5b1f2c143df Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 5 Nov 2014 17:49:03 +0000 Subject: [PATCH 43/53] Add duration filter unit tests. --- syweb/webclient/app-filter.js | 15 +------ syweb/webclient/test/unit/filters.spec.js | 50 +++++++++++++++++++++++ 2 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 syweb/webclient/test/unit/filters.spec.js diff --git a/syweb/webclient/app-filter.js b/syweb/webclient/app-filter.js index f19db4141d..65da0d312d 100644 --- a/syweb/webclient/app-filter.js +++ b/syweb/webclient/app-filter.js @@ -29,10 +29,10 @@ angular.module('matrixWebClient') return s + "s"; } if (t < 60 * 60) { - return m + "m "; // + s + "s"; + return m + "m"; // + s + "s"; } if (t < 24 * 60 * 60) { - return h + "h "; // + m + "m"; + return h + "h"; // + m + "m"; } return d + "d "; // + h + "h"; }; @@ -76,17 +76,6 @@ angular.module('matrixWebClient') return filtered; }; }) -.filter('stateEventsFilter', function($sce) { - return function(events) { - var filtered = {}; - angular.forEach(events, function(value, key) { - if (value && typeof(value.state_key) === "string") { - filtered[key] = value; - } - }); - return filtered; - }; -}) .filter('unsafe', ['$sce', function($sce) { return function(text) { return $sce.trustAsHtml(text); diff --git a/syweb/webclient/test/unit/filters.spec.js b/syweb/webclient/test/unit/filters.spec.js new file mode 100644 index 0000000000..3dc735b2c8 --- /dev/null +++ b/syweb/webclient/test/unit/filters.spec.js @@ -0,0 +1,50 @@ +describe('durationFilter', function() { + var filter, durationFilter; + + beforeEach(module('matrixWebClient')); + beforeEach(module('matrixFilter')); + beforeEach(inject(function($filter) { + filter = $filter; + durationFilter = filter("duration"); + })); + + it("should represent 15000 ms as '15s'", function() { + var output = durationFilter(15000); + expect(output).toEqual("15s"); + }); + + it("should represent 60000 ms as '1m'", function() { + var output = durationFilter(60000); + expect(output).toEqual("1m"); + }); + + it("should represent 65000 ms as '1m'", function() { + var output = durationFilter(65000); + expect(output).toEqual("1m"); + }); + + it("should represent 10 ms as '0s'", function() { + var output = durationFilter(10); + expect(output).toEqual("0s"); + }); + + it("should represent 4m as '4m'", function() { + var output = durationFilter(1000*60*4); + expect(output).toEqual("4m"); + }); + + it("should represent 4m30s as '4m'", function() { + var output = durationFilter(1000*60*4 + 1000*30); + expect(output).toEqual("4m"); + }); + + it("should represent 2h as '2h'", function() { + var output = durationFilter(1000*60*60*2); + expect(output).toEqual("2h"); + }); + + it("should represent 2h35m as '2h'", function() { + var output = durationFilter(1000*60*60*2 + 1000*60*35); + expect(output).toEqual("2h"); + }); +}); \ No newline at end of file From 746525014110b4aef2eb00ba9b09714c3c8c5c77 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 6 Nov 2014 09:34:35 +0000 Subject: [PATCH 44/53] State *.js in karma.conf rather than *.* so *.js~ files are ignored. --- syweb/webclient/test/karma.conf.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/syweb/webclient/test/karma.conf.js b/syweb/webclient/test/karma.conf.js index 083c7c7200..7ce958adc9 100644 --- a/syweb/webclient/test/karma.conf.js +++ b/syweb/webclient/test/karma.conf.js @@ -25,13 +25,13 @@ module.exports = function(config) { '../js/ng-infinite-scroll-matrix.js', '../js/ui-bootstrap*', '../js/elastic.js', - '../login/**/*.*', - '../room/**/*.*', - '../components/**/*.*', - '../user/**/*.*', - '../home/**/*.*', - '../recents/**/*.*', - '../settings/**/*.*', + '../login/**/*.js', + '../room/**/*.js', + '../components/**/*.js', + '../user/**/*.js', + '../home/**/*.js', + '../recents/**/*.js', + '../settings/**/*.js', '../app.js', '../app*', './unit/**/*.js' From c5eec32c583f2d577579dac9bc9ecb278b512d98 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 6 Nov 2014 11:04:43 +0000 Subject: [PATCH 45/53] Add mRoomName and orderMembersList filter tests. Mark FIXME on broken tests for now. --- syweb/webclient/test/unit/filters.spec.js | 447 +++++++++++++++++++++- 1 file changed, 444 insertions(+), 3 deletions(-) diff --git a/syweb/webclient/test/unit/filters.spec.js b/syweb/webclient/test/unit/filters.spec.js index 3dc735b2c8..f037425208 100644 --- a/syweb/webclient/test/unit/filters.spec.js +++ b/syweb/webclient/test/unit/filters.spec.js @@ -1,8 +1,243 @@ -describe('durationFilter', function() { +describe('mRoomName filter', function() { + var filter, mRoomName; + + var roomId = "!weufhewifu:matrix.org"; + + // test state values (f.e. test) + var testUserId, testAlias, testDisplayName, testOtherDisplayName, testRoomState; + + // mocked services which return the test values above. + var matrixService = { + getRoomIdToAliasMapping: function(room_id) { + return testAlias; + }, + + config: function() { + return { + user_id: testUserId + }; + } + }; + + var eventHandlerService = { + getUserDisplayName: function(room_id, user_id) { + if (user_id === testUserId) { + return testDisplayName; + } + return testOtherDisplayName; + } + }; + + var modelService = { + getRoom: function(room_id) { + return { + current_room_state: testRoomState + }; + } + }; + + beforeEach(function() { + // inject mocked dependencies + module(function ($provide) { + $provide.value('matrixService', matrixService); + $provide.value('eventHandlerService', eventHandlerService); + $provide.value('modelService', modelService); + }); + + module('matrixFilter'); + }); + + beforeEach(inject(function($filter) { + filter = $filter; + mRoomName = filter("mRoomName"); + + // purge the previous test values + testUserId = undefined; + testAlias = undefined; + testDisplayName = undefined; + testOtherDisplayName = undefined; + + // mock up a stub room state + testRoomState = { + s:{}, // internal; stores the state events + state: function(type, key) { + // accessor used by filter + return key ? this.s[type+key] : this.s[type]; + }, + members: {}, // struct used by filter + + // test helper methods + setJoinRule: function(rule) { + this.s["m.room.join_rules"] = { + content: { + join_rule: rule + } + }; + }, + setRoomName: function(name) { + this.s["m.room.name"] = { + content: { + name: name + } + }; + }, + setMember: function(user_id, membership, inviter_user_id) { + if (!inviter_user_id) { + inviter_user_id = user_id; + } + this.s["m.room.member" + user_id] = { + content: { + membership: membership + }, + state_key: user_id, + user_id: inviter_user_id + }; + this.members[user_id] = this.s["m.room.member" + user_id]; + } + }; + })); + + /**** ROOM NAME ****/ + + it("should show the room name if one exists for private (invite join_rules) rooms.", function() { + var roomName = "The Room Name"; + testUserId = "@me:matrix.org"; + testRoomState.setJoinRule("invite"); + testRoomState.setRoomName(roomName); + testRoomState.setMember(testUserId, "join"); + var output = mRoomName(roomId); + expect(output).toEqual(roomName); + }); + + it("should show the room name if one exists for public (public join_rules) rooms.", function() { + var roomName = "The Room Name"; + testUserId = "@me:matrix.org"; + testRoomState.setJoinRule("public"); + testRoomState.setRoomName(roomName); + testRoomState.setMember(testUserId, "join"); + var output = mRoomName(roomId); + expect(output).toEqual(roomName); + }); + + /**** ROOM ALIAS ****/ + + // FIXME + xit("should show the room alias if one exists for private (invite join_rules) rooms if a room name doesn't exist.", function() { + var testAlias = "#thealias:matrix.org"; + testUserId = "@me:matrix.org"; + testRoomState.setJoinRule("invite"); + testRoomState.setMember(testUserId, "join"); + var output = mRoomName(roomId); + expect(output).toEqual(testAlias); + }); + + // FIXME + xit("should show the room alias if one exists for public (public join_rules) rooms if a room name doesn't exist.", function() { + var testAlias = "#thealias:matrix.org"; + testUserId = "@me:matrix.org"; + testRoomState.setJoinRule("public"); + testRoomState.setMember(testUserId, "join"); + var output = mRoomName(roomId); + expect(output).toEqual(testAlias); + }); + + /**** ROOM ID ****/ + + it("should show the room ID for public (public join_rules) rooms if a room name and alias don't exist.", function() { + testUserId = "@me:matrix.org"; + testRoomState.setJoinRule("public"); + testRoomState.setMember(testUserId, "join"); + var output = mRoomName(roomId); + expect(output).toEqual(roomId); + }); + + it("should show the room ID for private (invite join_rules) rooms if a room name and alias don't exist and there are >2 members.", function() { + testUserId = "@me:matrix.org"; + testRoomState.setJoinRule("public"); + testRoomState.setMember(testUserId, "join"); + testRoomState.setMember("@alice:matrix.org", "join"); + testRoomState.setMember("@bob:matrix.org", "join"); + var output = mRoomName(roomId); + expect(output).toEqual(roomId); + }); + + /**** SELF-CHAT ****/ + + it("should show your display name for private (invite join_rules) rooms if a room name and alias don't exist and it is a self-chat.", function() { + testUserId = "@me:matrix.org"; + testDisplayName = "Me"; + testRoomState.setJoinRule("private"); + testRoomState.setMember(testUserId, "join"); + var output = mRoomName(roomId); + expect(output).toEqual(testDisplayName); + }); + + // FIXME + xit("should show your user ID for private (invite join_rules) rooms if a room name and alias don't exist and it is a self-chat and they don't have a display name set.", function() { + testUserId = "@me:matrix.org"; + testRoomState.setJoinRule("private"); + testRoomState.setMember(testUserId, "join"); + var output = mRoomName(roomId); + expect(output).toEqual(testUserId); + }); + + /**** ONE-TO-ONE CHAT ****/ + + it("should show the other user's display name for private (invite join_rules) rooms if a room name and alias don't exist and it is a 1:1-chat.", function() { + testUserId = "@me:matrix.org"; + otherUserId = "@alice:matrix.org"; + testOtherDisplayName = "Alice"; + testRoomState.setJoinRule("private"); + testRoomState.setMember(testUserId, "join"); + testRoomState.setMember("@alice:matrix.org", "join"); + var output = mRoomName(roomId); + expect(output).toEqual(testOtherDisplayName); + }); + + // FIXME + xit("should show the other user's ID for private (invite join_rules) rooms if a room name and alias don't exist and it is a 1:1-chat and they don't have a display name set.", function() { + testUserId = "@me:matrix.org"; + otherUserId = "@alice:matrix.org"; + testRoomState.setJoinRule("private"); + testRoomState.setMember(testUserId, "join"); + testRoomState.setMember("@alice:matrix.org", "join"); + var output = mRoomName(roomId); + expect(output).toEqual(otherUserId); + }); + + /**** INVITED TO ROOM ****/ + + it("should show the other user's display name for private (invite join_rules) rooms if you are invited to it.", function() { + testUserId = "@me:matrix.org"; + testDisplayName = "Me"; + otherUserId = "@alice:matrix.org"; + testOtherDisplayName = "Alice"; + testRoomState.setJoinRule("private"); + testRoomState.setMember(testUserId, "join"); + testRoomState.setMember(otherUserId, "join"); + testRoomState.setMember(testUserId, "invite"); + var output = mRoomName(roomId); + expect(output).toEqual(testOtherDisplayName); + }); + + // FIXME + xit("should show the other user's ID for private (invite join_rules) rooms if you are invited to it and the inviter doesn't have a display name.", function() { + testUserId = "@me:matrix.org"; + testDisplayName = "Me"; + otherUserId = "@alice:matrix.org"; + testRoomState.setJoinRule("private"); + testRoomState.setMember(testUserId, "join"); + testRoomState.setMember(otherUserId, "join"); + testRoomState.setMember(testUserId, "invite"); + var output = mRoomName(roomId); + expect(output).toEqual(otherUserId); + }); +}); + +describe('duration filter', function() { var filter, durationFilter; beforeEach(module('matrixWebClient')); - beforeEach(module('matrixFilter')); beforeEach(inject(function($filter) { filter = $filter; durationFilter = filter("duration"); @@ -47,4 +282,210 @@ describe('durationFilter', function() { var output = durationFilter(1000*60*60*2 + 1000*60*35); expect(output).toEqual("2h"); }); -}); \ No newline at end of file +}); + +describe('orderMembersList filter', function() { + var filter, orderMembersList; + + beforeEach(module('matrixWebClient')); + beforeEach(inject(function($filter) { + filter = $filter; + orderMembersList = filter("orderMembersList"); + })); + + it("should sort a single entry", function() { + var output = orderMembersList({ + "@a:example.com": { + last_active_ago: 50, + last_updated: 1415266943964 + } + }); + expect(output).toEqual([{ + id: "@a:example.com", + last_active_ago: 50, + last_updated: 1415266943964 + }]); + }); + + it("should sort by taking last_active_ago into account", function() { + var output = orderMembersList({ + "@a:example.com": { + last_active_ago: 1000, + last_updated: 1415266943964 + }, + "@b:example.com": { + last_active_ago: 50, + last_updated: 1415266943964 + }, + "@c:example.com": { + last_active_ago: 99999, + last_updated: 1415266943964 + } + }); + expect(output).toEqual([ + { + id: "@b:example.com", + last_active_ago: 50, + last_updated: 1415266943964 + }, + { + id: "@a:example.com", + last_active_ago: 1000, + last_updated: 1415266943964 + }, + { + id: "@c:example.com", + last_active_ago: 99999, + last_updated: 1415266943964 + }, + ]); + }); + + it("should sort by taking last_updated into account", function() { + var output = orderMembersList({ + "@a:example.com": { + last_active_ago: 1000, + last_updated: 1415266943964 + }, + "@b:example.com": { + last_active_ago: 1000, + last_updated: 1415266900000 + }, + "@c:example.com": { + last_active_ago: 1000, + last_updated: 1415266943000 + } + }); + expect(output).toEqual([ + { + id: "@a:example.com", + last_active_ago: 1000, + last_updated: 1415266943964 + }, + { + id: "@c:example.com", + last_active_ago: 1000, + last_updated: 1415266943000 + }, + { + id: "@b:example.com", + last_active_ago: 1000, + last_updated: 1415266900000 + }, + ]); + }); + + it("should sort by taking last_updated and last_active_ago into account", + function() { + var output = orderMembersList({ + "@a:example.com": { + last_active_ago: 1000, + last_updated: 1415266943000 + }, + "@b:example.com": { + last_active_ago: 100000, + last_updated: 1415266943900 + }, + "@c:example.com": { + last_active_ago: 1000, + last_updated: 1415266943964 + } + }); + expect(output).toEqual([ + { + id: "@c:example.com", + last_active_ago: 1000, + last_updated: 1415266943964 + }, + { + id: "@a:example.com", + last_active_ago: 1000, + last_updated: 1415266943000 + }, + { + id: "@b:example.com", + last_active_ago: 100000, + last_updated: 1415266943900 + }, + ]); + }); + + // SYWEB-26 comment + it("should sort members who do not have last_active_ago value at the end of the list", + function() { + // single undefined entry + var output = orderMembersList({ + "@a:example.com": { + last_active_ago: 1000, + last_updated: 1415266943964 + }, + "@b:example.com": { + last_active_ago: 100000, + last_updated: 1415266943964 + }, + "@c:example.com": { + last_active_ago: undefined, + last_updated: 1415266943964 + } + }); + expect(output).toEqual([ + { + id: "@a:example.com", + last_active_ago: 1000, + last_updated: 1415266943964 + }, + { + id: "@b:example.com", + last_active_ago: 100000, + last_updated: 1415266943964 + }, + { + id: "@c:example.com", + last_active_ago: undefined, + last_updated: 1415266943964 + }, + ]); + }); + + it("should sort multiple members who do not have last_active_ago according to presence", + function() { + // single undefined entry + var output = orderMembersList({ + "@a:example.com": { + last_active_ago: undefined, + last_updated: 1415266943964, + presence: "unavailable" + }, + "@b:example.com": { + last_active_ago: undefined, + last_updated: 1415266943964, + presence: "online" + }, + "@c:example.com": { + last_active_ago: undefined, + last_updated: 1415266943964, + presence: "offline" + } + }); + expect(output).toEqual([ + { + id: "@b:example.com", + last_active_ago: undefined, + last_updated: 1415266943964, + presence: "online" + }, + { + id: "@a:example.com", + last_active_ago: undefined, + last_updated: 1415266943964, + presence: "unavailable" + }, + { + id: "@c:example.com", + last_active_ago: undefined, + last_updated: 1415266943964, + presence: "offline" + }, + ]); + }); +}); From a92092340b5de022d1e48ecd4176cfb9b200b4d6 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 6 Nov 2014 11:14:31 +0000 Subject: [PATCH 46/53] Fix broken tests which were previously skipped. --- .../components/matrix/matrix-filter.js | 14 +++++++++++++- syweb/webclient/test/unit/filters.spec.js | 19 +++++++------------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/syweb/webclient/components/matrix/matrix-filter.js b/syweb/webclient/components/matrix/matrix-filter.js index 4d264e93f3..e84c197c76 100644 --- a/syweb/webclient/components/matrix/matrix-filter.js +++ b/syweb/webclient/components/matrix/matrix-filter.js @@ -38,7 +38,7 @@ function($rootScope, matrixService, eventHandlerService, modelService) { if (room.state("m.room.join_rules") && room.state("m.room.join_rules").content) { isPublicRoom = ("public" === room.state("m.room.join_rules").content.join_rule); } - + if (room_name_event) { roomName = room_name_event.content.name; } @@ -56,6 +56,9 @@ function($rootScope, matrixService, eventHandlerService, modelService) { var member = room.members[i]; if (member.state_key !== user_id) { roomName = eventHandlerService.getUserDisplayName(room_id, member.state_key); + if (!roomName) { + roomName = member.state_key; + } break; } } @@ -70,13 +73,22 @@ function($rootScope, matrixService, eventHandlerService, modelService) { if (room.members[otherUserId].content.membership === "invite") { // someone invited us, use the right ID. roomName = eventHandlerService.getUserDisplayName(room_id, room.members[otherUserId].user_id); + if (!roomName) { + roomName = room.members[otherUserId].user_id; + } } else { roomName = eventHandlerService.getUserDisplayName(room_id, otherUserId); + if (!roomName) { + roomName = user_id; + } } } else { // it isn't us, so use their name if we know it. roomName = eventHandlerService.getUserDisplayName(room_id, otherUserId); + if (!roomName) { + roomName = otherUserId; + } } } else if (Object.keys(room.members).length === 0) { diff --git a/syweb/webclient/test/unit/filters.spec.js b/syweb/webclient/test/unit/filters.spec.js index f037425208..2e8d0c4036 100644 --- a/syweb/webclient/test/unit/filters.spec.js +++ b/syweb/webclient/test/unit/filters.spec.js @@ -121,9 +121,8 @@ describe('mRoomName filter', function() { /**** ROOM ALIAS ****/ - // FIXME - xit("should show the room alias if one exists for private (invite join_rules) rooms if a room name doesn't exist.", function() { - var testAlias = "#thealias:matrix.org"; + it("should show the room alias if one exists for private (invite join_rules) rooms if a room name doesn't exist.", function() { + testAlias = "#thealias:matrix.org"; testUserId = "@me:matrix.org"; testRoomState.setJoinRule("invite"); testRoomState.setMember(testUserId, "join"); @@ -131,9 +130,8 @@ describe('mRoomName filter', function() { expect(output).toEqual(testAlias); }); - // FIXME - xit("should show the room alias if one exists for public (public join_rules) rooms if a room name doesn't exist.", function() { - var testAlias = "#thealias:matrix.org"; + it("should show the room alias if one exists for public (public join_rules) rooms if a room name doesn't exist.", function() { + testAlias = "#thealias:matrix.org"; testUserId = "@me:matrix.org"; testRoomState.setJoinRule("public"); testRoomState.setMember(testUserId, "join"); @@ -172,8 +170,7 @@ describe('mRoomName filter', function() { expect(output).toEqual(testDisplayName); }); - // FIXME - xit("should show your user ID for private (invite join_rules) rooms if a room name and alias don't exist and it is a self-chat and they don't have a display name set.", function() { + it("should show your user ID for private (invite join_rules) rooms if a room name and alias don't exist and it is a self-chat and they don't have a display name set.", function() { testUserId = "@me:matrix.org"; testRoomState.setJoinRule("private"); testRoomState.setMember(testUserId, "join"); @@ -194,8 +191,7 @@ describe('mRoomName filter', function() { expect(output).toEqual(testOtherDisplayName); }); - // FIXME - xit("should show the other user's ID for private (invite join_rules) rooms if a room name and alias don't exist and it is a 1:1-chat and they don't have a display name set.", function() { + it("should show the other user's ID for private (invite join_rules) rooms if a room name and alias don't exist and it is a 1:1-chat and they don't have a display name set.", function() { testUserId = "@me:matrix.org"; otherUserId = "@alice:matrix.org"; testRoomState.setJoinRule("private"); @@ -220,8 +216,7 @@ describe('mRoomName filter', function() { expect(output).toEqual(testOtherDisplayName); }); - // FIXME - xit("should show the other user's ID for private (invite join_rules) rooms if you are invited to it and the inviter doesn't have a display name.", function() { + it("should show the other user's ID for private (invite join_rules) rooms if you are invited to it and the inviter doesn't have a display name.", function() { testUserId = "@me:matrix.org"; testDisplayName = "Me"; otherUserId = "@alice:matrix.org"; From dd8af5565b5822dd2700ef8c2082134679fdc3ba Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 6 Nov 2014 11:55:07 +0000 Subject: [PATCH 47/53] Start adding regression tests. First up, register-controller for SYWEB-109. --- syweb/webclient/login/register-controller.js | 2 +- .../test/unit/register-controller.spec.js | 84 +++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 syweb/webclient/test/unit/register-controller.spec.js diff --git a/syweb/webclient/login/register-controller.js b/syweb/webclient/login/register-controller.js index be970ce1c3..b23a72b185 100644 --- a/syweb/webclient/login/register-controller.js +++ b/syweb/webclient/login/register-controller.js @@ -124,7 +124,7 @@ angular.module('RegisterController', ['matrixService']) $location.url("home"); }, function(error) { - console.trace("Registration error: "+error); + console.error("Registration error: "+JSON.stringify(error)); if (useCaptcha) { Recaptcha.reload(); } diff --git a/syweb/webclient/test/unit/register-controller.spec.js b/syweb/webclient/test/unit/register-controller.spec.js new file mode 100644 index 0000000000..369704c0da --- /dev/null +++ b/syweb/webclient/test/unit/register-controller.spec.js @@ -0,0 +1,84 @@ +describe("RegisterController ", function() { + var rootScope, scope, ctrl, $q, $timeout; + var userId = "@foo:bar"; + var displayName = "Foo"; + var avatarUrl = "avatar.url"; + + window.webClientConfig = { + useCapatcha: false + }; + + // test vars + var testRegisterData, testFailRegisterData; + + + // mock services + var matrixService = { + config: function() { + return { + user_id: userId + } + }, + setConfig: function(){}, + register: function(mxid, password, threepidCreds, useCaptcha) { + var d = $q.defer(); + if (testFailRegisterData) { + d.reject({ + data: testFailRegisterData + }); + } + else { + d.resolve({ + data: testRegisterData + }); + } + return d.promise; + } + }; + + var eventStreamService = {}; + + beforeEach(function() { + module('matrixWebClient'); + + // reset test vars + testRegisterData = undefined; + testFailRegisterData = undefined; + }); + + beforeEach(inject(function($rootScope, $injector, $location, $controller, _$q_, _$timeout_) { + $q = _$q_; + $timeout = _$timeout_; + scope = $rootScope.$new(); + rootScope = $rootScope; + routeParams = { + user_matrix_id: userId + }; + ctrl = $controller('RegisterController', { + '$scope': scope, + '$rootScope': $rootScope, + '$location': $location, + 'matrixService': matrixService, + 'eventStreamService': eventStreamService + }); + }) + ); + + // SYWEB-109 + it('should display an error if the HS rejects the username on registration', function() { + var prevFeedback = angular.copy(scope.feedback); + + testFailRegisterData = { + errcode: "M_UNKNOWN", + error: "I am rejecting you." + }; + + scope.account.pwd1 = "password"; + scope.account.pwd2 = "password"; + scope.account.desired_user_id = "bob"; + scope.register(); + rootScope.$digest(); + + expect(scope.feedback).toNotEqual(prevFeedback); + }); +}); From c9c2e395316a8f8ef905d1ca9d7e0bbab2c39f7e Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 6 Nov 2014 12:00:03 +0000 Subject: [PATCH 48/53] Use .not.toEqual instead of .toNotEqual which is in a newer version of Jasmine. --- syweb/webclient/test/unit/register-controller.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syweb/webclient/test/unit/register-controller.spec.js b/syweb/webclient/test/unit/register-controller.spec.js index 369704c0da..ce6ef1f4e2 100644 --- a/syweb/webclient/test/unit/register-controller.spec.js +++ b/syweb/webclient/test/unit/register-controller.spec.js @@ -79,6 +79,6 @@ describe("RegisterController ", function() { scope.register(); rootScope.$digest(); - expect(scope.feedback).toNotEqual(prevFeedback); + expect(scope.feedback).not.toEqual(prevFeedback); }); }); From 8bcd36377a04bede2e2d74dcd7f18742d0982ad5 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 6 Nov 2014 13:37:05 +0000 Subject: [PATCH 49/53] Factor out room name logic: mRoomName is the canonical source. --- .../components/matrix/event-handler-service.js | 16 ++++------------ .../test/unit/register-controller.spec.js | 4 ++-- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/syweb/webclient/components/matrix/event-handler-service.js b/syweb/webclient/components/matrix/event-handler-service.js index 027c80a1b6..38a6efced7 100644 --- a/syweb/webclient/components/matrix/event-handler-service.js +++ b/syweb/webclient/components/matrix/event-handler-service.js @@ -26,8 +26,8 @@ Typically, this service will store events and broadcast them to any listeners (e.g. controllers) via $broadcast. */ angular.module('eventHandlerService', []) -.factory('eventHandlerService', ['matrixService', '$rootScope', '$q', '$timeout', 'mPresence', 'notificationService', 'modelService', -function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService, modelService) { +.factory('eventHandlerService', ['matrixService', '$rootScope', '$q', '$timeout', '$filter', 'mPresence', 'notificationService', 'modelService', +function(matrixService, $rootScope, $q, $timeout, $filter, mPresence, notificationService, modelService) { var ROOM_CREATE_EVENT = "ROOM_CREATE_EVENT"; var MSG_EVENT = "MSG_EVENT"; var MEMBER_EVENT = "MEMBER_EVENT"; @@ -135,16 +135,8 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService else if (event.content.msgtype === "m.image") { message = displayname + " sent an image."; } - - var roomTitle = matrixService.getRoomIdToAliasMapping(event.room_id); - var theRoom = modelService.getRoom(event.room_id); - if (!roomTitle && theRoom.current_room_state.state("m.room.name") && theRoom.current_room_state.state("m.room.name").content) { - roomTitle = theRoom.current_room_state.state("m.room.name").content.name; - } - - if (!roomTitle) { - roomTitle = event.room_id; - } + + var roomTitle = $filter("mRoomName")(event.room_id); notificationService.showNotification( displayname + " (" + roomTitle + ")", diff --git a/syweb/webclient/test/unit/register-controller.spec.js b/syweb/webclient/test/unit/register-controller.spec.js index ce6ef1f4e2..b5c7842358 100644 --- a/syweb/webclient/test/unit/register-controller.spec.js +++ b/syweb/webclient/test/unit/register-controller.spec.js @@ -76,8 +76,8 @@ describe("RegisterController ", function() { scope.account.pwd1 = "password"; scope.account.pwd2 = "password"; scope.account.desired_user_id = "bob"; - scope.register(); - rootScope.$digest(); + scope.register(); // this depends on the result of a deferred + rootScope.$digest(); // which is delivered after the digest expect(scope.feedback).not.toEqual(prevFeedback); }); From b77cce4ec56c3b4fd74ea65416e030fc321d4fa4 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 6 Nov 2014 14:18:23 +0000 Subject: [PATCH 50/53] Add modelService test. Thin for now but will be expanded upon. --- .../webclient/test/unit/model-service.spec.js | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 syweb/webclient/test/unit/model-service.spec.js diff --git a/syweb/webclient/test/unit/model-service.spec.js b/syweb/webclient/test/unit/model-service.spec.js new file mode 100644 index 0000000000..2e012efe90 --- /dev/null +++ b/syweb/webclient/test/unit/model-service.spec.js @@ -0,0 +1,30 @@ +describe('ModelService', function() { + + // setup the dependencies + beforeEach(function() { + // dependencies + module('matrixService'); + + // tested service + module('modelService'); + }); + + it('should be able to get a member in a room', inject( + function(modelService) { + var roomId = "!wefiohwefuiow:matrix.org"; + var userId = "@bob:matrix.org"; + + modelService.getRoom(roomId).current_room_state.storeStateEvent({ + type: "m.room.member", + id: "fwefw:matrix.org", + user_id: userId, + state_key: userId, + content: { + membership: "join" + } + }); + + var user = modelService.getMember(roomId, userId); + expect(user.state_key).toEqual(userId); + })); +}); From d4c20c472b82e2a8851374743ec5075a58bb71ff Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 6 Nov 2014 14:23:14 +0000 Subject: [PATCH 51/53] Use mRoomName on join notifications as well. --- syweb/webclient/room/room-controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syweb/webclient/room/room-controller.js b/syweb/webclient/room/room-controller.js index 2e0f5faff0..a2bc23195d 100644 --- a/syweb/webclient/room/room-controller.js +++ b/syweb/webclient/room/room-controller.js @@ -207,7 +207,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) } notificationService.showNotification( userName + - " (" + (matrixService.getRoomIdToAliasMapping(event.room_id) || event.room_id) + ")", + " (" + $filter("mRoomName")(event.room_id) + ")", userName + " joined", event.content.avatar_url ? event.content.avatar_url : undefined, function() { From e3c3f5a6d04bfbc0256010e9fb4dad7616ebbcc5 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 6 Nov 2014 14:52:22 +0000 Subject: [PATCH 52/53] 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. --- .../matrix/event-handler-service.js | 9 +++-- .../components/matrix/matrix-call.js | 2 +- .../components/matrix/matrix-filter.js | 8 ++-- .../components/matrix/model-service.js | 4 +- syweb/webclient/recents/recents-filter.js | 3 ++ syweb/webclient/room/room-controller.js | 4 +- .../test/unit/event-handler-service.spec.js | 38 ++++++++++++------- syweb/webclient/test/unit/filters.spec.js | 12 +++--- .../webclient/test/unit/model-service.spec.js | 2 +- 9 files changed, 52 insertions(+), 30 deletions(-) diff --git a/syweb/webclient/components/matrix/event-handler-service.js b/syweb/webclient/components/matrix/event-handler-service.js index 38a6efced7..a9c6eb34c7 100644 --- a/syweb/webclient/components/matrix/event-handler-service.js +++ b/syweb/webclient/components/matrix/event-handler-service.js @@ -141,7 +141,7 @@ function(matrixService, $rootScope, $q, $timeout, $filter, mPresence, notificati notificationService.showNotification( displayname + " (" + roomTitle + ")", message, - member ? member.avatar_url : undefined, + member ? member.event.content.avatar_url : undefined, function() { console.log("notification.onclick() room=" + event.room_id); $rootScope.goToPage('room/' + event.room_id); @@ -306,6 +306,9 @@ function(matrixService, $rootScope, $q, $timeout, $filter, mPresence, notificati // Get the user display name from the member list of the room var member = modelService.getMember(room_id, user_id); + if (member) { + member = member.event; + } if (member && member.content.displayname) { // Do not consider null displayname displayName = member.content.displayname; @@ -315,7 +318,7 @@ function(matrixService, $rootScope, $q, $timeout, $filter, mPresence, notificati for (var member_id in room.current_room_state.members) { if (room.current_room_state.members.hasOwnProperty(member_id) && member_id !== user_id) { - var member2 = room.current_room_state.members[member_id]; + var member2 = room.current_room_state.members[member_id].event; if (member2.content.displayname && member2.content.displayname === displayName) { displayName = displayName + " (" + user_id + ")"; break; @@ -551,7 +554,7 @@ function(matrixService, $rootScope, $q, $timeout, $filter, mPresence, notificati for (var i in room.current_room_state.members) { if (!room.current_room_state.members.hasOwnProperty(i)) continue; - var member = room.current_room_state.members[i]; + var member = room.current_room_state.members[i].event; if ("join" === member.content.membership) { memberCount = memberCount + 1; diff --git a/syweb/webclient/components/matrix/matrix-call.js b/syweb/webclient/components/matrix/matrix-call.js index 5a2807c755..465b2b7807 100644 --- a/syweb/webclient/components/matrix/matrix-call.js +++ b/syweb/webclient/components/matrix/matrix-call.js @@ -214,7 +214,7 @@ angular.module('MatrixCall', []) var self = this; var roomMembers = modelService.getRoom(this.room_id).current_room_state.members; - if (roomMembers[matrixService.config().user_id].membership != 'join') { + if (roomMembers[matrixService.config().user_id].event.content.membership != 'join') { console.log("We need to join the room before we can accept this call"); matrixService.join(this.room_id).then(function() { self.answer(); diff --git a/syweb/webclient/components/matrix/matrix-filter.js b/syweb/webclient/components/matrix/matrix-filter.js index e84c197c76..aeebedc784 100644 --- a/syweb/webclient/components/matrix/matrix-filter.js +++ b/syweb/webclient/components/matrix/matrix-filter.js @@ -53,7 +53,7 @@ function($rootScope, matrixService, eventHandlerService, modelService) { for (var i in room.members) { if (!room.members.hasOwnProperty(i)) continue; - var member = room.members[i]; + var member = room.members[i].event; if (member.state_key !== user_id) { roomName = eventHandlerService.getUserDisplayName(room_id, member.state_key); if (!roomName) { @@ -70,11 +70,11 @@ function($rootScope, matrixService, eventHandlerService, modelService) { if (otherUserId === user_id) { // it's us, we may have been invited to this room or it could // be a self chat. - if (room.members[otherUserId].content.membership === "invite") { + if (room.members[otherUserId].event.content.membership === "invite") { // someone invited us, use the right ID. - roomName = eventHandlerService.getUserDisplayName(room_id, room.members[otherUserId].user_id); + roomName = eventHandlerService.getUserDisplayName(room_id, room.members[otherUserId].event.user_id); if (!roomName) { - roomName = room.members[otherUserId].user_id; + roomName = room.members[otherUserId].event.user_id; } } else { diff --git a/syweb/webclient/components/matrix/model-service.js b/syweb/webclient/components/matrix/model-service.js index 8b2ee877b1..8e0ce8d1a9 100644 --- a/syweb/webclient/components/matrix/model-service.js +++ b/syweb/webclient/components/matrix/model-service.js @@ -106,7 +106,9 @@ angular.module('modelService', []) storeStateEvent: function storeState(event) { this.state_events[event.type + event.state_key] = event; if (event.type === "m.room.member") { - this.members[event.state_key] = event; + var rm = new RoomMember(); + rm.event = event; + this.members[event.state_key] = rm; } }, 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) { diff --git a/syweb/webclient/room/room-controller.js b/syweb/webclient/room/room-controller.js index a2bc23195d..d3fb85b9dc 100644 --- a/syweb/webclient/room/room-controller.js +++ b/syweb/webclient/room/room-controller.js @@ -754,13 +754,13 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) for (var i in members) { if (!members.hasOwnProperty(i)) continue; - var member = members[i]; + var member = members[i].event; updateMemberList(member); } // Check if the user has already join the room if ($scope.state.user_id in members) { - if ("join" === members[$scope.state.user_id].membership) { + if ("join" === members[$scope.state.user_id].event.content.membership) { needsToJoin = false; } } diff --git a/syweb/webclient/test/unit/event-handler-service.spec.js b/syweb/webclient/test/unit/event-handler-service.spec.js index 023abec98b..2a4dc3b5a5 100644 --- a/syweb/webclient/test/unit/event-handler-service.spec.js +++ b/syweb/webclient/test/unit/event-handler-service.spec.js @@ -36,20 +36,28 @@ describe('EventHandlerService', function() { current_room_state: { members: { "@adam:matrix.org": { - content: { membership: "join" }, - user_id: "@adam:matrix.org" + event: { + content: { membership: "join" }, + user_id: "@adam:matrix.org" + } }, "@beth:matrix.org": { - content: { membership: "invite" }, - user_id: "@beth:matrix.org" + event: { + content: { membership: "invite" }, + user_id: "@beth:matrix.org" + } }, "@charlie:matrix.org": { - content: { membership: "join" }, - user_id: "@charlie:matrix.org" + event: { + content: { membership: "join" }, + user_id: "@charlie:matrix.org" + } }, "@danice:matrix.org": { - content: { membership: "leave" }, - user_id: "@danice:matrix.org" + event: { + content: { membership: "leave" }, + user_id: "@danice:matrix.org" + } } } } @@ -70,12 +78,16 @@ describe('EventHandlerService', function() { current_room_state: { members: { "@adam:matrix.org": { - content: { membership: "join" }, - user_id: "@adam:matrix.org" + event: { + content: { membership: "join" }, + user_id: "@adam:matrix.org" + } }, "@beth:matrix.org": { - content: { membership: "join" }, - user_id: "@beth:matrix.org" + event: { + content: { membership: "join" }, + user_id: "@beth:matrix.org" + } } }, s: { @@ -102,4 +114,4 @@ describe('EventHandlerService', function() { num = eventHandlerService.getUserPowerLevel(roomId, "@unknown:matrix.org"); expect(num).toEqual(50); })); -}); \ No newline at end of file +}); diff --git a/syweb/webclient/test/unit/filters.spec.js b/syweb/webclient/test/unit/filters.spec.js index 2e8d0c4036..7324a8e028 100644 --- a/syweb/webclient/test/unit/filters.spec.js +++ b/syweb/webclient/test/unit/filters.spec.js @@ -86,11 +86,13 @@ describe('mRoomName filter', function() { inviter_user_id = user_id; } this.s["m.room.member" + user_id] = { - content: { - membership: membership - }, - state_key: user_id, - user_id: inviter_user_id + event: { + content: { + membership: membership + }, + state_key: user_id, + user_id: inviter_user_id + } }; this.members[user_id] = this.s["m.room.member" + user_id]; } diff --git a/syweb/webclient/test/unit/model-service.spec.js b/syweb/webclient/test/unit/model-service.spec.js index 2e012efe90..e2fa8ceba3 100644 --- a/syweb/webclient/test/unit/model-service.spec.js +++ b/syweb/webclient/test/unit/model-service.spec.js @@ -25,6 +25,6 @@ describe('ModelService', function() { }); var user = modelService.getMember(roomId, userId); - expect(user.state_key).toEqual(userId); + expect(user.event.state_key).toEqual(userId); })); }); From 4b256cab317ab02da549ce64a33911743f1b9d6f Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 6 Nov 2014 16:48:01 +0000 Subject: [PATCH 53/53] Don't cache isWebRTCSupported because whether webRTC is supported might change part-way through the page's lifecycle if your webrtc support comes from some kind of injected content script (hello OpenWebRTC Sarafi extension) --- syweb/webclient/components/matrix/matrix-call.js | 9 +++------ .../components/matrix/matrix-phone-service.js | 2 +- syweb/webclient/index.html | 2 +- syweb/webclient/room/room.html | 12 ++++++------ 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/syweb/webclient/components/matrix/matrix-call.js b/syweb/webclient/components/matrix/matrix-call.js index 465b2b7807..c13083298e 100644 --- a/syweb/webclient/components/matrix/matrix-call.js +++ b/syweb/webclient/components/matrix/matrix-call.js @@ -40,14 +40,11 @@ window.RTCPeerConnection = window.RTCPeerConnection || window.webkitRTCPeerConne window.RTCSessionDescription = window.RTCSessionDescription || window.webkitRTCSessionDescription || window.mozRTCSessionDescription; window.RTCIceCandidate = window.RTCIceCandidate || window.webkitRTCIceCandidate || window.mozRTCIceCandidate; -// Returns true if the browser supports all required features to make WebRTC call -var isWebRTCSupported = function () { - return !!(navigator.getUserMedia || window.RTCPeerConnection || window.RTCSessionDescription || window.RTCIceCandidate); -}; - angular.module('MatrixCall', []) .factory('MatrixCall', ['matrixService', 'matrixPhoneService', 'modelService', '$rootScope', '$timeout', function MatrixCallFactory(matrixService, matrixPhoneService, modelService, $rootScope, $timeout) { - $rootScope.isWebRTCSupported = isWebRTCSupported(); + $rootScope.isWebRTCSupported = function () { + return !!(navigator.getUserMedia || window.RTCPeerConnection || window.RTCSessionDescription || window.RTCIceCandidate); + }; var MatrixCall = function(room_id) { this.room_id = room_id; diff --git a/syweb/webclient/components/matrix/matrix-phone-service.js b/syweb/webclient/components/matrix/matrix-phone-service.js index 06465ed821..55dbbf522e 100644 --- a/syweb/webclient/components/matrix/matrix-phone-service.js +++ b/syweb/webclient/components/matrix/matrix-phone-service.js @@ -60,7 +60,7 @@ angular.module('matrixPhoneService', []) var MatrixCall = $injector.get('MatrixCall'); var call = new MatrixCall(event.room_id); - if (!isWebRTCSupported()) { + if (!$rootScope.isWebRTCSupported()) { console.log("Incoming call ID "+msg.call_id+" but this browser doesn't support WebRTC"); // don't hang up the call: there could be other clients connected that do support WebRTC and declining the // the call on their behalf would be really annoying. diff --git a/syweb/webclient/index.html b/syweb/webclient/index.html index 3ed968a5ea..992e8d3377 100644 --- a/syweb/webclient/index.html +++ b/syweb/webclient/index.html @@ -85,7 +85,7 @@
- + diff --git a/syweb/webclient/room/room.html b/syweb/webclient/room/room.html index ca5669a732..e59cc30edc 100644 --- a/syweb/webclient/room/room.html +++ b/syweb/webclient/room/room.html @@ -182,8 +182,8 @@ (msg.content.formatted_body | unsanitizedLinky) : (msg.content.msgtype === 'm.text' && msg.type === 'm.room.message') ? (msg.content.body | linky:'_blank') : '' "/> - Outgoing Call{{ isWebRTCSupported ? '' : ' (But your browser does not support VoIP)' }} - Incoming Call{{ isWebRTCSupported ? '' : ' (But your browser does not support VoIP)' }} + Outgoing Call{{ isWebRTCSupported() ? '' : ' (But your browser does not support VoIP)' }} + Incoming Call{{ isWebRTCSupported() ? '' : ' (But your browser does not support VoIP)' }}
@@ -248,15 +248,15 @@