OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1414 from matrix-org/dbkr/member_list_profiles 

Show displayname & avatar url in group member list
pull/21833/head
David Baker 2017-09-22 15:15:55 +01:00 committed by GitHub
parent 45c4eeba01 0f9f1c85a8
commit 77febdedfc
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/groups/GroupMemberList.js
View File

@ -90,11 +90,10 @@ export default withMatrixClient(React.createClass({
let memberList = this.state.members;
if (query) {
memberList = memberList.filter((m) => {
// TODO: add this when we have this info from the API
//const matchesName = m.name.toLowerCase().indexOf(query) !== -1;
const matchesName = m.displayname.toLowerCase().indexOf(query) !== -1;
const matchesId = m.userId.toLowerCase().includes(query);
if (/*!matchesName &&*/ !matchesId) {
if (!matchesName && !matchesId) {
return false;
}

7
src/components/views/groups/GroupMemberTile.js
View File

@ -47,10 +47,13 @@ export default withMatrixClient(React.createClass({
const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
const EntityTile = sdk.getComponent('rooms.EntityTile');
const name = this.props.member.userId;
const name = this.props.member.displayname || this.props.member.userId;
const av = (
<BaseAvatar name={this.props.member.userId} width={36} height={36} />
<BaseAvatar name={this.props.member.userId}
width={36} height={36}
url={this.props.matrixClient.mxcUrlToHttp(this.props.member.avatarUrl)}
/>
);
return (

4
src/groups.js
View File

@ -18,10 +18,14 @@ import PropTypes from 'prop-types';
export const GroupMemberType = PropTypes.shape({
userId: PropTypes.string.isRequired,
displayname: PropTypes.string,
avatarUrl: PropTypes.string,
});
export function groupMemberFromApiObject(apiObject) {
return {
userId: apiObject.user_id,
displayname: apiObject.displayname,
avatarUrl: apiObject.avatar_url,
};
}