matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-18 09:22:18 +03:00
Code Activity

Make the room directory join rooms by alias

Browse Source 
Also makes some improvement on the multiple code path mess for joining rooms
This commit is contained in:
David Baker
2016-06-09 18:49:06 +01:00
parent 049e3a968b
commit 72b3ce200d
2 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/structures/RoomView.js
View File

@ -39,6 +39,7 @@ var dis = require("../../dispatcher");
var Tinter = require("../../Tinter");
var rate_limited_func = require('../../ratelimitedfunc');
var ObjectUtils = require('../../ObjectUtils');
var MatrixTools = require('../../MatrixTools');
var DEBUG = false;
@ -100,7 +101,14 @@ module.exports = React.createClass({
},
getInitialState: function() {
var room = MatrixClientPeg.get().getRoom(this.props.roomAddress);
var room;
if (this.props.roomAddress[0] == '!') {
room = MatrixClientPeg.get().getRoom(this.props.roomAddress);
} else {
room = MatrixTools.getRoomForAlias(
MatrixClientPeg.get().getRooms(), this.props.roomAddress
);
}
return {
room: room,
roomLoading: !room,