Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-07 00:15:01 -04:00
Code Issues Projects Releases Packages Wiki Activity

use all new /rooms/<room id>/state to actually gather the state for rooms whenever join them. a bit ugly, as we don't currently have a nice place to gather housekeeping after joining a room, so horrible code duplication...

Browse source
This commit is contained in:
Matthew Hodgson 2014-09-23 18:50:39 +01:00
parent 284fac379c
commit 437969eac9
3 changed files with 49 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

29
webclient/home/home-controller.js
View file

@ -86,18 +86,24 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen
// Go to a room
$scope.goToRoom = function(room_id) {
// Simply open the room page on this room id
//$location.url("room/" + room_id);
matrixService.join(room_id).then(
function(response) {
var final_room_id = room_id;
if (response.data.hasOwnProperty("room_id")) {
if (response.data.room_id != room_id) {
$location.url("room/" + response.data.room_id);
return;
}
final_room_id = response.data.room_id;
}
$location.url("room/" + room_id);
// TODO: factor out the common housekeeping whenever we try to join a room or alias
matrixService.roomState(final_room_id).then(
function(response) {
eventHandlerService.handleEvents(response, false, true);
},
function(error) {
$scope.feedback = "Failed to get room state for: " + final_room_id;
}
);
$location.url("room/" + final_room_id);
},
function(error) {
$scope.feedback = "Can't join room: " + JSON.stringify(error.data);
@ -108,6 +114,15 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen
$scope.joinAlias = function(room_alias) {
matrixService.joinAlias(room_alias).then(
function(response) {
// TODO: factor out the common housekeeping whenever we try to join a room or alias
matrixService.roomState(response.room_id).then(
function(response) {
eventHandlerService.handleEvents(response, false, true);
},
function(error) {
$scope.feedback = "Failed to get room state for: " + response.room_id;
}
);
// Go to this room
$location.url("room/" + room_alias);
},