From 7a091276874f0ef876df3470cc0b97275be23567 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 7 Nov 2017 11:27:42 +0000 Subject: [PATCH 01/13] Alter group member api To match https://github.com/matrix-org/synapse/pull/2647 --- src/components/views/groups/GroupMemberTile.js | 2 +- src/groups.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js index 84c2adcb41..f967a33f46 100644 --- a/src/components/views/groups/GroupMemberTile.js +++ b/src/components/views/groups/GroupMemberTile.js @@ -63,7 +63,7 @@ export default withMatrixClient(React.createClass({ return ( ); }, diff --git a/src/groups.js b/src/groups.js index 957db1d85b..860cf71fff 100644 --- a/src/groups.js +++ b/src/groups.js @@ -36,7 +36,7 @@ export function groupMemberFromApiObject(apiObject) { userId: apiObject.user_id, displayname: apiObject.displayname, avatarUrl: apiObject.avatar_url, - isAdmin: apiObject.is_admin, + isPrivileged: apiObject.is_privileged, }; } From ed709f52d12b4108200ccf76c2e76a2bf75c78b9 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 7 Nov 2017 16:42:43 +0000 Subject: [PATCH 02/13] Use the getProfileInfo API for group inviter profile --- src/components/structures/GroupView.js | 46 ++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js index 24aa552890..97d842729b 100644 --- a/src/components/structures/GroupView.js +++ b/src/components/structures/GroupView.js @@ -450,6 +450,11 @@ export default React.createClass({ }, _initGroupStore: function(groupId) { + const group = MatrixClientPeg.get().getGroup(groupId); + if (group && group.inviter && group.inviter.userId) { + this._fetchInviterProfile(group.inviter.userId); + } + this._groupStore = GroupStoreCache.getGroupStore(MatrixClientPeg.get(), groupId); this._groupStore.registerListener(() => { const summary = this._groupStore.getSummary(); @@ -481,6 +486,26 @@ export default React.createClass({ }); }, + _fetchInviterProfile(userId) { + this.setState({ + inviterProfileBusy: true, + }); + MatrixClientPeg.get().getProfileInfo(userId).then((resp) => { + this.setState({ + inviterProfile: { + avatarUrl: resp.avatar_url, + displayName: resp.displayname, + }, + }); + }).catch((e) => { + console.error('Error getting group inviter profile', e); + }).finally(() => { + this.setState({ + inviterProfileBusy: false, + }); + }); + }, + _onShowRhsClick: function(ev) { dis.dispatch({ action: 'show_right_panel' }); }, @@ -769,20 +794,37 @@ export default React.createClass({ _getMembershipSection: function() { const Spinner = sdk.getComponent("elements.Spinner"); + const BaseAvatar = sdk.getComponent("avatars.BaseAvatar"); const group = MatrixClientPeg.get().getGroup(this.props.groupId); if (!group) return null; if (group.myMembership === 'invite') { - if (this.state.membershipBusy) { + if (this.state.membershipBusy || this.state.inviterProfileBusy) { return
; } + const httpInviterAvatar = this.state.inviterProfile ? + MatrixClientPeg.get().mxcUrlToHttp( + this.state.inviterProfile.avatarUrl, 36, 36, + ) : null; + + let inviterName = group.inviter.userId; + if(this.state.inviterProfile) { + inviterName = this.state.inviterProfile.displayName || group.inviter.userId; + } return
- { _t("%(inviter)s has invited you to join this community", {inviter: group.inviter.userId}) } + + { _t("%(inviter)s has invited you to join this community", { + inviter: inviterName, + }) }
Date: Tue, 7 Nov 2017 18:51:41 +0000 Subject: [PATCH 03/13] Add checkbox to GroupAddressPicker for determining visibility of group rooms --- src/GroupAddressPicker.js | 24 ++++++++++++------- src/components/structures/GroupView.js | 2 +- .../views/dialogs/AddressPickerDialog.js | 3 +++ src/i18n/strings/en_EN.json | 2 +- src/stores/GroupStore.js | 6 +++++ 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js index 595f0cfe46..c4b3744575 100644 --- a/src/GroupAddressPicker.js +++ b/src/GroupAddressPicker.js @@ -49,20 +49,26 @@ export function showGroupInviteDialog(groupId) { export function showGroupAddRoomDialog(groupId) { return new Promise((resolve, reject) => { + let addRoomsPublicly = false; + const onCheckboxClicked = (e) => { + addRoomsPublicly = e.target.checked; + }; const description =
{ _t("Which rooms would you like to add to this community?") }
-
- { _t( - "Warning: any room you add to a community will be publicly "+ - "visible to anyone who knows the community ID", - ) } -
; + const checkboxContainer = ; + const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog"); Modal.createTrackedDialog('Add Rooms to Group', '', AddressPickerDialog, { title: _t("Add rooms to the community"), description: description, + extraNode: checkboxContainer, placeholder: _t("Room name or alias"), button: _t("Add to community"), pickerType: 'room', @@ -70,7 +76,7 @@ export function showGroupAddRoomDialog(groupId) { onFinished: (success, addrs) => { if (!success) return; - _onGroupAddRoomFinished(groupId, addrs).then(resolve, reject); + _onGroupAddRoomFinished(groupId, addrs, addRoomsPublicly).then(resolve, reject); }, }); }); @@ -106,13 +112,13 @@ function _onGroupInviteFinished(groupId, addrs) { }); } -function _onGroupAddRoomFinished(groupId, addrs) { +function _onGroupAddRoomFinished(groupId, addrs, addRoomsPublicly) { const matrixClient = MatrixClientPeg.get(); const groupStore = GroupStoreCache.getGroupStore(matrixClient, groupId); const errorList = []; return Promise.all(addrs.map((addr) => { return groupStore - .addRoomToGroup(addr.address) + .addRoomToGroup(addr.address, addRoomsPublicly) .catch(() => { errorList.push(addr.address); }) .then(() => { const roomId = addr.address; diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js index 795efaec1e..dee433551f 100644 --- a/src/components/structures/GroupView.js +++ b/src/components/structures/GroupView.js @@ -575,7 +575,7 @@ export default React.createClass({ _onAcceptInviteClick: function() { this.setState({membershipBusy: true}); - MatrixClientPeg.get().acceptGroupInvite(this.props.groupId).then(() => { + this._groupStore.acceptGroupInvite().then(() => { // don't reset membershipBusy here: wait for the membership change to come down the sync }).catch((e) => { this.setState({membershipBusy: false}); diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js index 5796e60cc9..8de76ebfa8 100644 --- a/src/components/views/dialogs/AddressPickerDialog.js +++ b/src/components/views/dialogs/AddressPickerDialog.js @@ -34,6 +34,8 @@ module.exports = React.createClass({ propTypes: { title: PropTypes.string.isRequired, description: PropTypes.node, + // Extra node inserted after picker input, dropdown and errors + extraNode: PropTypes.node, value: PropTypes.string, placeholder: PropTypes.string, roomId: PropTypes.string, @@ -574,6 +576,7 @@ module.exports = React.createClass({
{ query }
{ error } { addressSelector } + { this.props.extraNode }