PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #5277 from matrix-org/t3chguy/fix/9551

Browse source 
Use Own Profile Store for the Profile Settings
This commit is contained in:
Michael Telatynski 2020-10-05 14:46:12 +01:00 committed by GitHub
commit fdb8cb78f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/css/views/settings/_AvatarSetting.scss
View file

@ -16,6 +16,7 @@ limitations under the License.
.mx_AvatarSetting_avatar { .mx_AvatarSetting_avatar {
width: 90px; width: 90px;
min-width: 90px; // so it doesn't get crushed by the flexbox in languages with longer words
height: 90px; height: 90px;
margin-top: 8px; margin-top: 8px;
position: relative; position: relative;

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

@ -18,30 +18,21 @@ import React, {createRef} from 'react';
import {_t} from "../../../languageHandler"; import {_t} from "../../../languageHandler";
import {MatrixClientPeg} from "../../../MatrixClientPeg"; import {MatrixClientPeg} from "../../../MatrixClientPeg";
import Field from "../elements/Field"; import Field from "../elements/Field";
import {User} from "matrix-js-sdk";
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";
export default class ProfileSettings extends React.Component { export default class ProfileSettings extends React.Component {
constructor() { constructor() {
super(); super();
const client = MatrixClientPeg.get(); const client = MatrixClientPeg.get();
let user = client.getUser(client.getUserId()); let avatarUrl = OwnProfileStore.instance.avatarMxc;
if (!user) {
// XXX: We shouldn't have to do this.
// There seems to be a condition where the User object won't exist until a room
// exists on the account. To work around this, we'll just create a temporary User
// and use that.
console.warn("User object not found - creating one for ProfileSettings");
user = new User(client.getUserId());
}
let avatarUrl = user.avatarUrl;
if (avatarUrl) avatarUrl = client.mxcUrlToHttp(avatarUrl, 96, 96, 'crop', false); if (avatarUrl) avatarUrl = client.mxcUrlToHttp(avatarUrl, 96, 96, 'crop', false);
this.state = { this.state = {
userId: user.userId, userId: client.getUserId(),
originalDisplayName: user.rawDisplayName, originalDisplayName: OwnProfileStore.instance.displayName,
displayName: user.rawDisplayName, displayName: OwnProfileStore.instance.displayName,
originalAvatarUrl: avatarUrl, originalAvatarUrl: avatarUrl,
avatarUrl: avatarUrl, avatarUrl: avatarUrl,
avatarFile: null, avatarFile: null,