diff --git a/docs/client-server/swagger_matrix/api-docs-rooms b/docs/client-server/swagger_matrix/api-docs-rooms
index 0e1fa452a2..b941e58139 100644
--- a/docs/client-server/swagger_matrix/api-docs-rooms
+++ b/docs/client-server/swagger_matrix/api-docs-rooms
@@ -639,7 +639,7 @@
{
"method": "GET",
"summary": "Get a list of all the current state events for this room.",
- "notes": "NOT YET IMPLEMENTED.",
+ "notes": "This is equivalent to the events returned under the 'state' key for this room in /initialSync.",
"type": "array",
"items": {
"$ref": "Event"
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 14fae689f2..317ef2c80c 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -233,6 +233,22 @@ class MessageHandler(BaseHandler):
yield self._on_new_room_event(event, snapshot)
@defer.inlineCallbacks
+ def get_state_events(self, user_id, room_id):
+ """Retrieve all state events for a given room.
+
+ Args:
+ user_id(str): The user requesting state events.
+ room_id(str): The room ID to get all state events from.
+ Returns:
+ A list of dicts representing state events. [{}, {}, {}]
+ """
+ yield self.auth.check_joined_room(room_id, user_id)
+
+ # TODO: This is duplicating logic from snapshot_all_rooms
+ current_state = yield self.store.get_current_state(room_id)
+ defer.returnValue([self.hs.serialize_event(c) for c in current_state])
+
+ @defer.inlineCallbacks
def snapshot_all_rooms(self, user_id=None, pagin_config=None,
feedback=False):
"""Retrieve a snapshot of all rooms the user is invited or has joined.
diff --git a/synapse/rest/room.py b/synapse/rest/room.py
index ecb1e346d9..cf2e7af2e4 100644
--- a/synapse/rest/room.py
+++ b/synapse/rest/room.py
@@ -329,12 +329,13 @@ class RoomStateRestServlet(RestServlet):
@defer.inlineCallbacks
def on_GET(self, request, room_id):
user = yield self.auth.get_user_by_req(request)
- # TODO: Get all the current state for this room and return in the same
- # format as initial sync, that is:
- # [
- # { state event }, { state event }
- # ]
- defer.returnValue((200, []))
+ handler = self.handlers.message_handler
+ # Get all the current state for this room
+ events = yield handler.get_state_events(
+ room_id=urllib.unquote(room_id),
+ user_id=user.to_string(),
+ )
+ defer.returnValue((200, events))
# TODO: Needs unit testing
diff --git a/webclient/app-filter.js b/webclient/app-filter.js
index ee9374668b..0d059e1621 100644
--- a/webclient/app-filter.js
+++ b/webclient/app-filter.js
@@ -70,7 +70,23 @@ angular.module('matrixWebClient')
});
filtered.sort(function (a, b) {
- return ((a["last_active_ago"] || 10e10) > (b["last_active_ago"] || 10e10) ? 1 : -1);
+ // Sort members on their last_active_ago value
+ if (undefined !== a.last_active_ago || undefined !== b.last_active_ago) {
+ return ((a.last_active_ago || 10e10) > (b.last_active_ago || 10e10) ? 1 : -1);
+ }
+ else {
+ // If they do not have last_active_ago, sort them according to their presence state
+ // Online users go first amongs members who do not have last_active_ago
+ var presenceLevels = {
+ offline: 1,
+ unavailable: 2,
+ online: 4,
+ free_for_chat: 3
+ };
+ var aPresence = (a.presence in presenceLevels) ? presenceLevels[a.presence] : 0;
+ var bPresence = (b.presence in presenceLevels) ? presenceLevels[b.presence] : 0;
+ return bPresence - aPresence;
+ }
});
return filtered;
};
diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js
index 21066e3d9f..9c19f306c0 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -260,8 +260,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
if (event.content.prev !== event.content.membership) {
memberChanges = "membership";
}
- else if (event.prev_content.displayname !==
- event.content.displayname) {
+ else if (event.prev_content && (event.prev_content.displayname !== event.content.displayname)) {
memberChanges = "displayname";
}
diff --git a/webclient/components/matrix/matrix-filter.js b/webclient/components/matrix/matrix-filter.js
index 328e3a7086..1a64dc126c 100644
--- a/webclient/components/matrix/matrix-filter.js
+++ b/webclient/components/matrix/matrix-filter.js
@@ -49,15 +49,12 @@ angular.module('matrixFilter', [])
if (member.state_key !== user_id) {
if (member.state_key in $rootScope.presence) {
- // If the user is available in presence, use the displayname there
+ // If the user is listed in presence, use the displayname there
// as it is the most uptodate
- roomName = $rootScope.presence[member.state_key].content.displayname;
+ roomName = $rootScope.presence[member.state_key].content.displayname || member.state_key;
}
- else if (member.content.displayname) {
- roomName = member.content.displayname;
- }
- else {
- roomName = member.state_key;
+ else {
+ roomName = member.content.displayname || member.state_key;
}
}
}
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js
index 069e02e939..79781f5d86 100644
--- a/webclient/components/matrix/matrix-service.js
+++ b/webclient/components/matrix/matrix-service.js
@@ -697,11 +697,10 @@ angular.module('matrixService', [])
createRoomIdToAliasMapping: function(roomId, alias) {
roomIdToAlias[roomId] = alias;
aliasToRoomId[alias] = roomId;
- // localStorage.setItem(MAPPING_PREFIX+roomId, alias);
},
getRoomIdToAliasMapping: function(roomId) {
- var alias = roomIdToAlias[roomId]; // was localStorage.getItem(MAPPING_PREFIX+roomId)
+ var alias = roomIdToAlias[roomId];
//console.log("looking for alias for " + roomId + "; found: " + alias);
return alias;
},
diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js
index e35219bebb..a535d439d3 100644
--- a/webclient/home/home-controller.js
+++ b/webclient/home/home-controller.js
@@ -42,6 +42,10 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen
displayName: "",
avatarUrl: ""
};
+
+ $scope.newChat = {
+ user: ""
+ };
var refresh = function() {
@@ -112,6 +116,32 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen
}
);
};
+
+ // FIXME: factor this out between user-controller and home-controller etc.
+ $scope.messageUser = function() {
+
+ // FIXME: create a new room every time, for now
+
+ matrixService.create(null, 'private').then(
+ function(response) {
+ // This room has been created. Refresh the rooms list
+ var room_id = response.data.room_id;
+ console.log("Created room with id: "+ room_id);
+
+ matrixService.invite(room_id, $scope.newChat.user).then(
+ function() {
+ $scope.feedback = "Invite sent successfully";
+ $scope.$parent.goToPage("/room/" + room_id);
+ },
+ function(reason) {
+ $scope.feedback = "Failure: " + JSON.stringify(reason);
+ });
+ },
+ function(error) {
+ $scope.feedback = "Failure: " + JSON.stringify(error.data);
+ });
+ };
+
$scope.onInit = function() {
// Load profile data
diff --git a/webclient/home/home.html b/webclient/home/home.html
index 5a1e18e1de..0af382916e 100644
--- a/webclient/home/home.html
+++ b/webclient/home/home.html
@@ -17,7 +17,7 @@
<div>{{ config.user_id }}</div>
</div>
</div>
-
+
<h3>Recent conversations</h3>
<div ng-include="'recents/recents.html'"></div>
<br/>
@@ -52,17 +52,24 @@
<div>
<form>
- <input size="40" ng-model="newRoom.room_alias" ng-enter="createNewRoom(newRoom.room_alias, newRoom.private)" placeholder="(e.g. foo_channel)"/>
+ <input size="40" ng-model="newRoom.room_alias" ng-enter="createNewRoom(newRoom.room_alias, newRoom.private)" placeholder="(e.g. foo)"/>
<input type="checkbox" ng-model="newRoom.private">private
<button ng-disabled="!newRoom.room_alias" ng-click="createNewRoom(newRoom.room_alias, newRoom.private)">Create room</button>
</form>
</div>
<div>
<form>
- <input size="40" ng-model="joinAlias.room_alias" ng-enter="joinAlias(joinAlias.room_alias)" placeholder="(e.g. #foo_channel:example.org)"/>
+ <input size="40" ng-model="joinAlias.room_alias" ng-enter="joinAlias(joinAlias.room_alias)" placeholder="(e.g. #foo:example.org)"/>
<button ng-disabled="!joinAlias.room_alias" ng-click="joinAlias(joinAlias.room_alias)">Join room</button>
</form>
</div>
+ <div>
+ <form>
+ <input size="40" ng-model="newChat.user" ng-enter="messageUser()" placeholder="e.g. @user:domain.com"/>
+ <button ng-disabled="!newChat.user" ng-click="messageUser()">Message user</button>
+ </form>
+ </div>
+
<br/>
{{ feedback }}
diff --git a/webclient/room/room-directive.js b/webclient/room/room-directive.js
index e033b003e1..8db4cb5d9a 100644
--- a/webclient/room/room-directive.js
+++ b/webclient/room/room-directive.js
@@ -21,39 +21,53 @@ angular.module('RoomController')
return function (scope, element, attrs) {
element.bind("keydown keypress", function (event) {
// console.log("event: " + event.which);
- if (event.which === 9) {
+ var TAB = 9;
+ var SHIFT = 16;
+ var keypressCode = event.which;
+ if (keypressCode === TAB) {
if (!scope.tabCompleting) { // cache our starting text
- // console.log("caching " + element[0].value);
scope.tabCompleteOriginal = element[0].value;
scope.tabCompleting = true;
+ scope.tabCompleteIndex = 0;
}
+ // loop in the right direction
if (event.shiftKey) {
scope.tabCompleteIndex--;
if (scope.tabCompleteIndex < 0) {
- scope.tabCompleteIndex = 0;
+ // wrap to the last search match, and fix up to a real
+ // index value after we've matched
+ scope.tabCompleteIndex = Number.MAX_VALUE;
}
}
else {
scope.tabCompleteIndex++;
}
+
var searchIndex = 0;
var targetIndex = scope.tabCompleteIndex;
var text = scope.tabCompleteOriginal;
- // console.log("targetIndex: " + targetIndex + ", text=" + text);
+ // console.log("targetIndex: " + targetIndex + ",
+ // text=" + text);
// FIXME: use the correct regexp to recognise userIDs
+ // XXX: I don't really know what the point of this is. You
+ // WANT to match freeform text given you want to match display
+ // names AND user IDs. Surely you just want to get the last
+ // word out of the input text and that's that?
+ // Am I missing something here? -- Kegan
var search = /@?([a-zA-Z0-9_\-:\.]+)$/.exec(text);
- if (targetIndex === 0) {
- element[0].value = text;
-
- // Force angular to wake up and update the input ng-model by firing up input event
+
+ if (targetIndex === 0) { // 0 is always the original text
+ element[0].value = text;
+ // Force angular to wake up and update the input ng-model
+ // by firing up input event
angular.element(element[0]).triggerHandler('input');
}
else if (search && search[1]) {
- // console.log("search found: " + search);
+ // console.log("search found: " + search+" from "+text);
var expansion;
// FIXME: could do better than linear search here
@@ -68,6 +82,7 @@ angular.module('RoomController')
if (searchIndex < targetIndex) { // then search raw mxids
angular.forEach(scope.members, function(item, name) {
if (searchIndex < targetIndex) {
+ // === 1 because mxids are @username
if (name.toLowerCase().indexOf(search[1].toLowerCase()) === 1) {
expansion = name;
searchIndex++;
@@ -76,18 +91,22 @@ angular.module('RoomController')
});
}
- if (searchIndex === targetIndex) {
- // xchat-style tab complete
+ if (searchIndex === targetIndex ||
+ targetIndex === Number.MAX_VALUE) {
+ // xchat-style tab complete, add a colon if tab
+ // completing at the start of the text
if (search[0].length === text.length)
- expansion += " : ";
+ expansion += ": ";
else
expansion += " ";
element[0].value = text.replace(/@?([a-zA-Z0-9_\-:\.]+)$/, expansion);
// cancel blink
element[0].className = "";
-
- // Force angular to wake up and update the input ng-model by firing up input event
- angular.element(element[0]).triggerHandler('input');
+ if (targetIndex === Number.MAX_VALUE) {
+ // wrap the index around to the last index found
+ scope.tabCompleteIndex = searchIndex;
+ targetIndex = searchIndex;
+ }
}
else {
// console.log("wrapped!");
@@ -97,17 +116,19 @@ angular.module('RoomController')
}, 150);
element[0].value = text;
scope.tabCompleteIndex = 0;
-
- // Force angular to wake up and update the input ng-model by firing up input event
- angular.element(element[0]).triggerHandler('input');
}
+
+ // Force angular to wak up and update the input ng-model by
+ // firing up input event
+ angular.element(element[0]).triggerHandler('input');
}
else {
scope.tabCompleteIndex = 0;
}
+ // prevent the default TAB operation (typically focus shifting)
event.preventDefault();
}
- else if (event.which !== 16 && scope.tabCompleting) {
+ else if (keypressCode !== SHIFT && scope.tabCompleting) {
scope.tabCompleting = false;
scope.tabCompleteIndex = 0;
}
diff --git a/webclient/user/user-controller.js b/webclient/user/user-controller.js
index 3940db6683..0dbfa325d0 100644
--- a/webclient/user/user-controller.js
+++ b/webclient/user/user-controller.js
@@ -38,7 +38,8 @@ angular.module('UserController', ['matrixService'])
$scope.user.avatar_url = response.data.avatar_url;
}
);
-
+
+ // FIXME: factor this out between user-controller and home-controller etc.
$scope.messageUser = function() {
// FIXME: create a new room every time, for now
|
