Shifted fetching of global username fom timeline model to user profile
This commit is contained in:
parent
3b82b2ff97
commit
fa7ad4f234
4 changed files with 34 additions and 21 deletions
|
|
@ -22,7 +22,6 @@
|
|||
#include "TimelineViewManager.h"
|
||||
#include "Utils.h"
|
||||
#include "dialogs/RawMessage.h"
|
||||
#include <mtx/responses.hpp>
|
||||
|
||||
Q_DECLARE_METATYPE(QModelIndex)
|
||||
|
||||
|
|
@ -261,17 +260,6 @@ TimelineModel::TimelineModel(TimelineViewManager *manager, QString room_id, QObj
|
|||
connect(&events, &EventStore::updateFlowEventId, this, [this](std::string event_id) {
|
||||
this->updateFlowEventId(event_id);
|
||||
});
|
||||
|
||||
const auto userid = utils::localUser().toStdString();
|
||||
http::client()->get_profile(
|
||||
userid, [this](const mtx::responses::Profile &res, mtx::http::RequestErr err) {
|
||||
if (err) {
|
||||
nhlog::net()->warn("failed to retrieve own profile info");
|
||||
return;
|
||||
}
|
||||
|
||||
globalUsername = QString::fromStdString(res.display_name);
|
||||
});
|
||||
}
|
||||
|
||||
QHash<int, QByteArray>
|
||||
|
|
@ -814,8 +802,7 @@ void
|
|||
TimelineModel::openUserProfile(QString userid, bool global)
|
||||
{
|
||||
if (global) {
|
||||
emit openProfile(
|
||||
new UserProfile("", utils::localUser(), manager_, this, globalUsername));
|
||||
emit openProfile(new UserProfile("", utils::localUser(), manager_, this));
|
||||
} else {
|
||||
emit openProfile(new UserProfile(room_id_, userid, manager_, this));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue