d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed global avatar updation in the dialog

Browse source
This commit is contained in:
Jedi18 2021-02-02 17:46:02 +05:30
parent cd3f719e43
commit 2ff3c0c97e
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/ui/UserProfile.cpp
View file

@ -24,6 +24,7 @@ UserProfile::UserProfile(QString roomid,
, model(parent) , model(parent)
{ {
fetchDeviceList(this->userid_); fetchDeviceList(this->userid_);
globalAvatarUrl = "";
connect(cache::client(), connect(cache::client(),
&Cache::verificationStatusChanged, &Cache::verificationStatusChanged,
@ -56,16 +57,9 @@ UserProfile::UserProfile(QString roomid,
&UserProfile::setGlobalUsername, &UserProfile::setGlobalUsername,
Qt::QueuedConnection); Qt::QueuedConnection);
http::client()->get_profile( if (isGlobalUserProfile()) {
userid_.toStdString(), getGlobalProfileData();
[this](const mtx::responses::Profile &res, mtx::http::RequestErr err) { }
if (err) {
nhlog::net()->warn("failed to retrieve own profile info");
return;
}
emit globalUsernameRetrieved(QString::fromStdString(res.display_name));
});
} }
QHash<int, QByteArray> QHash<int, QByteArray>
@ -125,7 +119,10 @@ UserProfile::displayName()
QString QString
UserProfile::avatarUrl() UserProfile::avatarUrl()
{ {
return cache::avatarUrl(roomid_, userid_); return (isGlobalUserProfile() && globalAvatarUrl != "")
? globalAvatarUrl
: cache::avatarUrl(roomid_, userid_);
;
} }
bool bool
@ -353,6 +350,7 @@ UserProfile::changeAvatar()
isLoading_ = false; isLoading_ = false;
emit loadingChanged(); emit loadingChanged();
getGlobalProfileData();
}); });
} else { } else {
// change room username // change room username
@ -393,4 +391,21 @@ bool
UserProfile::isLoading() const UserProfile::isLoading() const
{ {
return isLoading_; return isLoading_;
}
void
UserProfile::getGlobalProfileData()
{
http::client()->get_profile(
userid_.toStdString(),
[this](const mtx::responses::Profile &res, mtx::http::RequestErr err) {
if (err) {
nhlog::net()->warn("failed to retrieve own profile info");
return;
}
emit globalUsernameRetrieved(QString::fromStdString(res.display_name));
globalAvatarUrl = QString::fromStdString(res.avatar_url);
emit avatarUrlChanged();
});
} }

2
src/ui/UserProfile.h
View file

@ -134,10 +134,12 @@ protected slots:
private: private:
void updateRoomMemberState(mtx::events::state::Member member); void updateRoomMemberState(mtx::events::state::Member member);
void getGlobalProfileData();
private: private:
QString roomid_, userid_; QString roomid_, userid_;
QString globalUsername; QString globalUsername;
QString globalAvatarUrl;
DeviceInfoModel deviceList_; DeviceInfoModel deviceList_;
bool isUserVerified = false; bool isUserVerified = false;
bool hasMasterKey = false; bool hasMasterKey = false;