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

Fix crash when fetching global profile

Browse source
This commit is contained in:
Nicolas Werner 2022-08-13 16:28:41 +02:00
parent 9570c3ccc4
commit 242b7d5506
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
3 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/MainWindow.cpp
View file

@ -67,6 +67,7 @@ Q_DECLARE_METATYPE(mtx::events::collections::TimelineEvents)
Q_DECLARE_METATYPE(std::vector<DeviceInfo>)
Q_DECLARE_METATYPE(std::vector<mtx::responses::PublicRoomsChunk>)
Q_DECLARE_METATYPE(mtx::responses::PublicRoom)
Q_DECLARE_METATYPE(mtx::responses::Profile)
MainWindow *MainWindow::instance_ = nullptr;
@ -145,6 +146,7 @@ MainWindow::registerQmlTypes()
qRegisterMetaType<mtx::events::msg::KeyVerificationRequest>();
qRegisterMetaType<mtx::events::msg::KeyVerificationStart>();
qRegisterMetaType<mtx::responses::PublicRoom>();
qRegisterMetaType<mtx::responses::Profile>();
qRegisterMetaType<CombinedImagePackModel *>();
qRegisterMetaType<mtx::events::collections::TimelineEvents>();
qRegisterMetaType<std::vector<DeviceInfo>>();

30
src/ui/UserProfile.cpp
View file

@ -487,17 +487,27 @@ UserProfile::isLoading() const
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 profile info for {}", userid_.toStdString());
return;
}
auto profProx = std::make_shared<UserProfileFetchProxy>();
connect(profProx.get(),
&UserProfileFetchProxy::profileFetched,
this,
[this](const mtx::responses::Profile &res) {
emit globalUsernameRetrieved(QString::fromStdString(res.display_name));
globalAvatarUrl = QString::fromStdString(res.avatar_url);
emit avatarUrlChanged();
});
emit globalUsernameRetrieved(QString::fromStdString(res.display_name));
globalAvatarUrl = QString::fromStdString(res.avatar_url);
emit avatarUrlChanged();
});
http::client()->get_profile(userid_.toStdString(),
[prox = std::move(profProx), user = userid_.toStdString()](
const mtx::responses::Profile &res, mtx::http::RequestErr err) {
if (err) {
nhlog::net()->warn("failed to retrieve profile info for {}",
user);
return;
}
emit prox->profileFetched(res);
});
}
void

13
src/ui/UserProfile.h
View file

@ -32,6 +32,19 @@ Q_ENUM_NS(Status)
class DeviceVerificationFlow;
class TimelineViewManager;
class UserProfileFetchProxy : public QObject
{
Q_OBJECT
public:
UserProfileFetchProxy(QObject *p = nullptr)
: QObject(p)
{}
signals:
void profileFetched(mtx::responses::Profile);
};
class DeviceInfo
{
public: