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

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-10-04 09:46:20 +00:00
parent 8286456794 21cedbabf2
commit 8a3093d7e8
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/autocomplete/UserProvider.js
View File

@ -105,11 +105,11 @@ export default class UserProvider extends AutocompleteProvider {
// Don't search if the query is a single "@" // Don't search if the query is a single "@"
if (fullMatch && fullMatch !== '@') { if (fullMatch && fullMatch !== '@') {
completions = this.matcher.match(fullMatch).map((user) => { completions = this.matcher.match(fullMatch).map((user) => {
const displayName = (user.name || user.userId || '').replace(' (IRC)', ''); // FIXME when groups are done const displayName = (user.name || user.userId || '');
return { return {
// Length of completion should equal length of text in decorator. draft-js // Length of completion should equal length of text in decorator. draft-js
// relies on the length of the entity === length of the text in the decoration. // relies on the length of the entity === length of the text in the decoration.
completion: user.rawDisplayName.replace(' (IRC)', ''), completion: user.rawDisplayName,
completionId: user.userId, completionId: user.userId,
suffix: (selection.beginning && range.start === 0) ? ': ' : ' ', suffix: (selection.beginning && range.start === 0) ? ': ' : ' ',
href: makeUserPermalink(user.userId), href: makeUserPermalink(user.userId),

2
src/components/views/elements/Pill.js
View File

@ -234,7 +234,7 @@ const Pill = React.createClass({
if (member) { if (member) {
userId = member.userId; userId = member.userId;
member.rawDisplayName = member.rawDisplayName || ''; member.rawDisplayName = member.rawDisplayName || '';
linkText = member.rawDisplayName.replace(' (IRC)', ''); // FIXME when groups are done linkText = member.rawDisplayName;
if (this.props.shouldShowPillAvatar) { if (this.props.shouldShowPillAvatar) {
avatar = <MemberAvatar member={member} width={16} height={16} />; avatar = <MemberAvatar member={member} width={16} height={16} />;
} }

3
src/components/views/messages/SenderProfile.js
View File

@ -109,9 +109,6 @@ export default React.createClass({
this.state.userGroups, this.state.relatedGroups, this.state.userGroups, this.state.relatedGroups,
); );
// Backwards-compatible replacing of "(IRC)" with AS user flair
name = displayedGroups.length > 0 ? name.replace(' (IRC)', '') : name;
flair = <Flair key='flair' flair = <Flair key='flair'
userId={mxEvent.getSender()} userId={mxEvent.getSender()}
groups={displayedGroups} groups={displayedGroups}

2
src/components/views/rooms/MessageComposerInput.js
View File

@ -361,7 +361,7 @@ export default class MessageComposerInput extends React.Component {
const selection = this.getSelectionRange(this.state.editorState); const selection = this.getSelectionRange(this.state.editorState);
const member = this.props.room.getMember(payload.user_id); const member = this.props.room.getMember(payload.user_id);
const completion = member ? const completion = member ?
member.rawDisplayName.replace(' (IRC)', '') : payload.user_id; member.rawDisplayName : payload.user_id;
this.setDisplayedCompletion({ this.setDisplayedCompletion({
completion, completion,
completionId: payload.user_id, completionId: payload.user_id,