summary refs log tree commit diff
path: root/src/timeline
diff options
context:
space:
mode:
authorJedi18 <targetakhil@gmail.com>2021-01-27 11:03:08 +0530
committerJedi18 <targetakhil@gmail.com>2021-01-27 11:03:08 +0530
commit5e3f5136557b83ee964d6c0cfa4fed422330728d (patch)
tree1b94d5d41571f83ffbaecff2a8dffda42ccc0b91 /src/timeline
parentMerge pull request #419 from LorenDB/master (diff)
downloadnheko-5e3f5136557b83ee964d6c0cfa4fed422330728d.tar.xz
update room specific username from userprofile
Diffstat (limited to 'src/timeline')
-rw-r--r--src/timeline/TimelineModel.cpp4
-rw-r--r--src/timeline/TimelineModel.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp

index 4346b0b2..79cf5184 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp
@@ -799,9 +799,9 @@ TimelineModel::viewDecryptedRawMessage(QString id) const } void -TimelineModel::openUserProfile(QString userid) +TimelineModel::openUserProfile(QString userid, bool global) { - emit openProfile(new UserProfile(room_id_, userid, manager_, this)); + emit openProfile(new UserProfile(global ? "" : room_id_, userid, manager_, this)); } void diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index 35e62eb4..51b8049e 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h
@@ -212,7 +212,7 @@ public: Q_INVOKABLE void viewRawMessage(QString id) const; Q_INVOKABLE void viewDecryptedRawMessage(QString id) const; - Q_INVOKABLE void openUserProfile(QString userid); + Q_INVOKABLE void openUserProfile(QString userid, bool global = false); Q_INVOKABLE void replyAction(QString id); Q_INVOKABLE void readReceiptsAction(QString id) const; Q_INVOKABLE void redactEvent(QString id);