Merge branch 'master' into avatar_username_feature
This commit is contained in:
commit
a7150b5666
46 changed files with 1742 additions and 632 deletions
|
|
@ -244,7 +244,7 @@ UserProfile::changeUsername(QString username)
|
|||
if (isGlobalUserProfile()) {
|
||||
// change global
|
||||
http::client()->set_displayname(
|
||||
username.toStdString(), [this](mtx::http::RequestErr err) {
|
||||
username.toStdString(), [](mtx::http::RequestErr err) {
|
||||
if (err) {
|
||||
nhlog::net()->warn("could not change username");
|
||||
return;
|
||||
|
|
@ -408,4 +408,4 @@ UserProfile::getGlobalProfileData()
|
|||
globalAvatarUrl = QString::fromStdString(res.avatar_url);
|
||||
emit avatarUrlChanged();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue