show permalinks to communities as Pills
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
parent
b79cd205a0
commit
c1e608f1a8
2 changed files with 38 additions and 4 deletions
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
.mx_UserPill,
|
.mx_UserPill,
|
||||||
.mx_RoomPill,
|
.mx_RoomPill,
|
||||||
|
.mx_GroupPill,
|
||||||
.mx_AtRoomPill {
|
.mx_AtRoomPill {
|
||||||
border-radius: 16px;
|
border-radius: 16px;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
@ -13,7 +14,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_EventTile_body .mx_UserPill,
|
.mx_EventTile_body .mx_UserPill,
|
||||||
.mx_EventTile_body .mx_RoomPill {
|
.mx_EventTile_body .mx_RoomPill,
|
||||||
|
.mx_EventTile_body .mx_GroupPill {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,6 +45,7 @@
|
||||||
|
|
||||||
.mx_UserPill .mx_BaseAvatar,
|
.mx_UserPill .mx_BaseAvatar,
|
||||||
.mx_RoomPill .mx_BaseAvatar,
|
.mx_RoomPill .mx_BaseAvatar,
|
||||||
|
.mx_GroupPill .mx_BaseAvatar,
|
||||||
.mx_AtRoomPill .mx_BaseAvatar {
|
.mx_AtRoomPill .mx_BaseAvatar {
|
||||||
position: relative;
|
position: relative;
|
||||||
left: -3px;
|
left: -3px;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
Copyright 2017 Vector Creations Ltd
|
Copyright 2017 Vector Creations Ltd
|
||||||
|
Copyright 2018 New Vector Ltd
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
@ -22,12 +23,13 @@ import PropTypes from 'prop-types';
|
||||||
import MatrixClientPeg from '../../../MatrixClientPeg';
|
import MatrixClientPeg from '../../../MatrixClientPeg';
|
||||||
import { MATRIXTO_URL_PATTERN } from '../../../linkify-matrix';
|
import { MATRIXTO_URL_PATTERN } from '../../../linkify-matrix';
|
||||||
import { getDisplayAliasForRoom } from '../../../Rooms';
|
import { getDisplayAliasForRoom } from '../../../Rooms';
|
||||||
|
import FlairStore from "../../../stores/FlairStore";
|
||||||
|
|
||||||
const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN);
|
const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN);
|
||||||
|
|
||||||
// For URLs of matrix.to links in the timeline which have been reformatted by
|
// For URLs of matrix.to links in the timeline which have been reformatted by
|
||||||
// HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
|
// HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
|
||||||
const REGEX_LOCAL_MATRIXTO = /^#\/(?:user|room)\/(([\#\!\@\+])[^\/]*)$/;
|
const REGEX_LOCAL_MATRIXTO = /^#\/(?:user|room|group)\/(([#!@+])[^\/]*)$/;
|
||||||
|
|
||||||
const Pill = React.createClass({
|
const Pill = React.createClass({
|
||||||
statics: {
|
statics: {
|
||||||
|
@ -45,6 +47,7 @@ const Pill = React.createClass({
|
||||||
},
|
},
|
||||||
TYPE_USER_MENTION: 'TYPE_USER_MENTION',
|
TYPE_USER_MENTION: 'TYPE_USER_MENTION',
|
||||||
TYPE_ROOM_MENTION: 'TYPE_ROOM_MENTION',
|
TYPE_ROOM_MENTION: 'TYPE_ROOM_MENTION',
|
||||||
|
TYPE_GROUP_MENTION: 'TYPE_GROUP_MENTION',
|
||||||
TYPE_AT_ROOM_MENTION: 'TYPE_AT_ROOM_MENTION', // '@room' mention
|
TYPE_AT_ROOM_MENTION: 'TYPE_AT_ROOM_MENTION', // '@room' mention
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -81,12 +84,14 @@ const Pill = React.createClass({
|
||||||
|
|
||||||
// The member related to the user pill
|
// The member related to the user pill
|
||||||
member: null,
|
member: null,
|
||||||
|
// The group related to the group pill
|
||||||
|
group: null,
|
||||||
// The room related to the room pill
|
// The room related to the room pill
|
||||||
room: null,
|
room: null,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
componentWillReceiveProps(nextProps) {
|
async componentWillReceiveProps(nextProps) {
|
||||||
let regex = REGEX_MATRIXTO;
|
let regex = REGEX_MATRIXTO;
|
||||||
if (nextProps.inMessage) {
|
if (nextProps.inMessage) {
|
||||||
regex = REGEX_LOCAL_MATRIXTO;
|
regex = REGEX_LOCAL_MATRIXTO;
|
||||||
|
@ -109,9 +114,11 @@ const Pill = React.createClass({
|
||||||
'@': Pill.TYPE_USER_MENTION,
|
'@': Pill.TYPE_USER_MENTION,
|
||||||
'#': Pill.TYPE_ROOM_MENTION,
|
'#': Pill.TYPE_ROOM_MENTION,
|
||||||
'!': Pill.TYPE_ROOM_MENTION,
|
'!': Pill.TYPE_ROOM_MENTION,
|
||||||
|
'+': Pill.TYPE_GROUP_MENTION,
|
||||||
}[prefix];
|
}[prefix];
|
||||||
|
|
||||||
let member;
|
let member;
|
||||||
|
let group;
|
||||||
let room;
|
let room;
|
||||||
switch (pillType) {
|
switch (pillType) {
|
||||||
case Pill.TYPE_AT_ROOM_MENTION: {
|
case Pill.TYPE_AT_ROOM_MENTION: {
|
||||||
|
@ -140,8 +147,17 @@ const Pill = React.createClass({
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case Pill.TYPE_GROUP_MENTION: {
|
||||||
|
const cli = MatrixClientPeg.get();
|
||||||
|
|
||||||
|
try {
|
||||||
|
group = await FlairStore.getGroupProfileCached(cli, resourceId);
|
||||||
|
} catch (e) { // if FlairStore failed, rely on js-sdk's store which lacks info
|
||||||
|
group = cli.getGroup(resourceId);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
this.setState({resourceId, pillType, member, room});
|
this.setState({resourceId, pillType, member, group, room});
|
||||||
},
|
},
|
||||||
|
|
||||||
componentWillMount() {
|
componentWillMount() {
|
||||||
|
@ -179,6 +195,7 @@ const Pill = React.createClass({
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
render: function() {
|
render: function() {
|
||||||
|
const BaseAvatar = sdk.getComponent('views.avatars.BaseAvatar');
|
||||||
const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
|
const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
|
||||||
const RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
|
const RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
|
||||||
|
|
||||||
|
@ -229,6 +246,20 @@ const Pill = React.createClass({
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case Pill.TYPE_GROUP_MENTION: {
|
||||||
|
if (this.state.group) {
|
||||||
|
const {avatarUrl, groupId, name} = this.state.group;
|
||||||
|
const cli = MatrixClientPeg.get();
|
||||||
|
|
||||||
|
linkText = groupId;
|
||||||
|
if (this.props.shouldShowPillAvatar) {
|
||||||
|
avatar = <BaseAvatar name={name || groupId} width={16} height={16}
|
||||||
|
url={avatarUrl ? cli.mxcUrlToHttp(avatarUrl, 16, 16) : null} />;
|
||||||
|
}
|
||||||
|
pillClass = 'mx_RoomPill' || 'mx_GroupPill';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
const classes = classNames(pillClass, {
|
const classes = classNames(pillClass, {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue