OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

SYWEB-146: Fix room ID leaking on recents page when the name of the room is just an alias.

pull/14/head
Kegan Dougal 2014-11-12 11:24:05 +00:00
parent 9d0efedaee
commit 2c400363e8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
syweb/webclient/components/matrix/matrix-service.js
View File

@ -39,7 +39,6 @@ angular.module('matrixService', [])
// Current version of permanent storage
var configVersion = 0;
var prefixPath = "/_matrix/client/api/v1";
var MAPPING_PREFIX = "alias_for_";
var doRequest = function(method, path, params, data, $httpParams) {
if (!config) {

10
syweb/webclient/components/matrix/model-service.js
View File

@ -31,6 +31,10 @@ angular.module('modelService', [])
// alias / id lookups
var roomIdToAlias = {};
var aliasToRoomId = {};
var setRoomIdToAliasMapping = function(roomId, alias) {
roomIdToAlias[roomId] = alias;
aliasToRoomId[alias] = roomId;
};
/***** Room Object *****/
var Room = function Room(room_id) {
@ -114,6 +118,9 @@ angular.module('modelService', [])
rm.event = event;
this.members[event.state_key] = rm;
}
else if (event.type === "m.room.aliases") {
setRoomIdToAliasMapping(event.room_id, event.content.aliases[0]);
}
},
storeStateEvents: function storeState(events) {
@ -210,8 +217,7 @@ angular.module('modelService', [])
},
createRoomIdToAliasMapping: function(roomId, alias) {
roomIdToAlias[roomId] = alias;
aliasToRoomId[alias] = roomId;
setRoomIdToAliasMapping(roomId, alias);
},
getRoomIdToAliasMapping: function(roomId) {