Merge branch 'master' into avatar_username_feature

This commit is contained in:
DeepBlueV7.X 2021-02-03 03:17:28 +01:00 committed by GitHub
commit a7150b5666
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 1742 additions and 632 deletions

View file

@ -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();
});
}
}