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

Merge pull request #5332 from Transfusion/trim_display_name

Browse source 
Trim spurious whitespace of nicknames
This commit is contained in:
Michael Telatynski 2021-03-04 16:26:09 +00:00 • committed by GitHub
commit c73ad9e594
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/room_settings/RoomProfileSettings.js
View file

@ -100,10 +100,11 @@ export default class RoomProfileSettings extends React.Component {
const newState = {}; const newState = {};
// TODO: What do we do about errors? // TODO: What do we do about errors?
const displayName = this.state.displayName.trim();
if (this.state.originalDisplayName !== this.state.displayName) { if (this.state.originalDisplayName !== this.state.displayName) {
await client.setRoomName(this.props.roomId, this.state.displayName); await client.setRoomName(this.props.roomId, displayName);
newState.originalDisplayName = this.state.displayName; newState.originalDisplayName = displayName;
newState.displayName = displayName;
} }
if (this.state.avatarFile) { if (this.state.avatarFile) {

6
src/components/views/settings/ProfileSettings.js
View file

@ -81,10 +81,12 @@ export default class ProfileSettings extends React.Component {
const client = MatrixClientPeg.get(); const client = MatrixClientPeg.get();
const newState = {}; const newState = {};
const displayName = this.state.displayName.trim();
try { try {
if (this.state.originalDisplayName !== this.state.displayName) { if (this.state.originalDisplayName !== this.state.displayName) {
await client.setDisplayName(this.state.displayName); await client.setDisplayName(displayName);
newState.originalDisplayName = this.state.displayName; newState.originalDisplayName = displayName;
newState.displayName = displayName;
} }
if (this.state.avatarFile) { if (this.state.avatarFile) {