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

Merge pull request #5272 from matrix-org/t3chguy/fix/15255 

Show server errors from saving profile settings
pull/21833/head
Michael Telatynski 2020-10-06 12:35:56 +01:00 committed by GitHub
parent 39c49125ce 55a18b8c2d
commit 5f615bd4c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/components/views/settings/ProfileSettings.js
View File

@ -21,6 +21,8 @@ import Field from "../elements/Field";
import { getHostingLink } from '../../../utils/HostingLink'; import { getHostingLink } from '../../../utils/HostingLink';
import * as sdk from "../../../index"; import * as sdk from "../../../index";
import {OwnProfileStore} from "../../../stores/OwnProfileStore"; import {OwnProfileStore} from "../../../stores/OwnProfileStore";
import Modal from "../../../Modal";
import ErrorDialog from "../dialogs/ErrorDialog";
export default class ProfileSettings extends React.Component { export default class ProfileSettings extends React.Component {
constructor() { constructor() {
@ -75,21 +77,26 @@ export default class ProfileSettings extends React.Component {
const client = MatrixClientPeg.get(); const client = MatrixClientPeg.get();
const newState = {}; const newState = {};
// TODO: What do we do about errors? try {
if (this.state.originalDisplayName !== this.state.displayName) {
await client.setDisplayName(this.state.displayName);
newState.originalDisplayName = this.state.displayName;
}
if (this.state.originalDisplayName !== this.state.displayName) { if (this.state.avatarFile) {
await client.setDisplayName(this.state.displayName); const uri = await client.uploadContent(this.state.avatarFile);
newState.originalDisplayName = this.state.displayName; await client.setAvatarUrl(uri);
} newState.avatarUrl = client.mxcUrlToHttp(uri, 96, 96, 'crop', false);
newState.originalAvatarUrl = newState.avatarUrl;
if (this.state.avatarFile) { newState.avatarFile = null;
const uri = await client.uploadContent(this.state.avatarFile); } else if (this.state.originalAvatarUrl !== this.state.avatarUrl) {
await client.setAvatarUrl(uri); await client.setAvatarUrl(""); // use empty string as Synapse 500s on undefined
newState.avatarUrl = client.mxcUrlToHttp(uri, 96, 96, 'crop', false); }
newState.originalAvatarUrl = newState.avatarUrl; } catch (err) {
newState.avatarFile = null; Modal.createTrackedDialog('Failed to save profile', '', ErrorDialog, {
} else if (this.state.originalAvatarUrl !== this.state.avatarUrl) { title: _t("Failed to save your profile"),
await client.setAvatarUrl(""); // use empty string as Synapse 500s on undefined description: ((err && err.message) ? err.message : _t("The operation could not be completed")),
});
} }
this.setState(newState); this.setState(newState);

2
src/i18n/strings/en_EN.json
View File

@ -715,6 +715,8 @@
"Off": "Off", "Off": "Off",
"On": "On", "On": "On",
"Noisy": "Noisy", "Noisy": "Noisy",
"Failed to save your profile": "Failed to save your profile",
"The operation could not be completed": "The operation could not be completed",
"<a>Upgrade</a> to your own domain": "<a>Upgrade</a> to your own domain", "<a>Upgrade</a> to your own domain": "<a>Upgrade</a> to your own domain",
"Profile": "Profile", "Profile": "Profile",
"Display Name": "Display Name", "Display Name": "Display Name",