imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #183 from matrix-org/dbkr/3pid_invite_metadata

Browse source 
Pass room metadata from 3pid invite emails all the way through to the…
This commit is contained in:
David Baker 2016-03-02 14:31:58 +00:00
commit 0051c91126
4 changed files with 110 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/components/structures/MatrixChat.js
View file

@ -312,7 +312,10 @@ module.exports = React.createClass({
});
break;
case 'view_room':
this._viewRoom(payload.room_id, payload.show_settings, payload.event_id, payload.invite_sign_url);
this._viewRoom(
payload.room_id, payload.show_settings, payload.event_id,
payload.invite_sign_url, payload.oob_data
);
break;
case 'view_prev_room':
roomIndexDelta = -1;
@ -350,6 +353,7 @@ module.exports = React.createClass({
room_id: foundRoom.roomId,
event_id: payload.event_id,
invite_sign_url: payload.invite_sign_url,
oob_data: payload.oob_data,
});
return;
}
@ -361,6 +365,7 @@ module.exports = React.createClass({
room_id: result.room_id,
event_id: payload.event_id,
invite_sign_url: payload.invite_sign_url,
oob_data: payload.oob_data,
});
});
break;
@ -448,7 +453,10 @@ module.exports = React.createClass({
//
// eventId is optional and will cause a switch to the context of that
// particular event.
_viewRoom: function(roomId, showSettings, eventId, invite_sign_url) {
// @param {Object} oob_data Object of additional data about the room
// that has been passed out-of-band (eg.
// room name and avatar from an invite email)
_viewRoom: function(roomId, showSettings, eventId, invite_sign_url, oob_data) {
// before we switch room, record the scroll state of the current room
this._updateScrollMap();
@ -461,6 +469,7 @@ module.exports = React.createClass({
initialEventPixelOffset: undefined,
page_type: this.PageTypes.RoomView,
inviteSignUrl: invite_sign_url,
roomOobData: oob_data,
};
// if we aren't given an explicit event id, look for one in the
@ -552,10 +561,12 @@ module.exports = React.createClass({
room_alias: self.starting_room_alias,
event_id: self.starting_event_id,
invite_sign_url: self.starting_room_invite_sign_url,
oob_data: self.starting_room_oob_data,
});
delete self.starting_room_alias;
delete self.starting_event_id;
delete self.starting_room_invite_sign_url;
delete self.starting_room_oob_data;
} else if (!self.state.page_type) {
if (!self.state.currentRoom) {
var firstRoom = null;
@ -675,6 +686,13 @@ module.exports = React.createClass({
var segments = screen.substring(5).split('/');
var roomString = segments[0];
var eventId = segments[1]; // undefined if no event id given
var oob_data = {
name: params.room_name,
avatarUrl: params.room_avatar_url,
inviterName: params.inviter_name,
};
if (roomString[0] == '#') {
if (this.state.logged_in) {
dis.dispatch({
@ -682,11 +700,16 @@ module.exports = React.createClass({
room_alias: roomString,
event_id: eventId,
invite_sign_url: params.signurl,
oob_data: oob_data,
});
} else {
// Okay, we'll take you here soon...
// XXX: There are way too many of these:
// It would probably be better to handle whether the SDK is
// ready or not in the view_room_alias handler instead.
this.starting_room_alias = roomString;
this.starting_room_invite_sign_url = params.signurl;
this.starting_room_oob_data = oob_data;
this.starting_event_id = eventId;
// ...but you're still going to have to log in.
this.notifyNewScreen('login');
@ -697,6 +720,7 @@ module.exports = React.createClass({
room_id: roomString,
event_id: eventId,
invite_sign_url: params.signurl,
oob_data: oob_data,
});
}
}
@ -884,6 +908,7 @@ module.exports = React.createClass({
roomId={this.state.currentRoom}
eventId={this.state.initialEventId}
inviteSignUrl={this.state.inviteSignUrl}
oobData={this.state.roomOobData}
highlightedEventId={this.state.highlightedEventId}
eventPixelOffset={this.state.initialEventPixelOffset}
key={this.state.currentRoom}

20
src/components/structures/RoomView.js
View file

@ -59,6 +59,17 @@ module.exports = React.createClass({
// (given as part of the link in the invite email)
inviteSignUrl: React.PropTypes.string,
// Any data about the room that would normally come from the Home Server
// but has been passed out-of-band, eg. the room name and avatar URL
// from an email invite (a workaround for the fact that we can't
// get this information from the HS using an email invite).
// Fields:
// * name (string) The room's name
// * avatarUrl (string) The mxc:// avatar URL for the room
// * inviterName (string) The display name of the person who
// * invited us tovthe room
oobData: React.PropTypes.object,
// id of an event to jump to. If not given, will go to the end of the
// live timeline.
eventId: React.PropTypes.string,
@ -1052,13 +1063,19 @@ module.exports = React.createClass({
);
}
else {
var inviterName = undefined;
if (this.props.oobData) {
inviterName = this.props.oobData.inviterName;
}
return (
<div className="mx_RoomView">
<RoomHeader ref="header" room={this.state.room} simpleHeader="Join room"/>
<RoomHeader ref="header" room={this.state.room} oobData={this.props.oobData} />
<div className="mx_RoomView_auxPanel">
<RoomPreviewBar onJoinClick={ this.onJoinButtonClicked }
canJoin={ true } canPreview={ false }
spinner={this.state.joining}
inviterName={inviterName}
/>
</div>
<div className="mx_RoomView_messagePanel"></div>
@ -1293,6 +1310,7 @@ module.exports = React.createClass({
return (
<div className={ "mx_RoomView" + (inCall ? " mx_RoomView_inCall" : "") } ref="roomView">
<RoomHeader ref="header" room={this.state.room} searchInfo={searchInfo}
oobData={this.props.oobData}
editing={this.state.editingRoomSettings}
onSearchClick={this.onSearchClick}
onSettingsClick={this.onSettingsClick}