summary refs log tree commit diff
path: root/src/Utils.cpp
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2020-04-23 19:22:54 -0400
committerJoseph Donofry <joedonofry@gmail.com>2020-04-23 19:22:54 -0400
commit619d9bc1858b12350d95f64a1340d56f32e28bfe (patch)
tree7c597bbe8f40059b8ef6c935d64f8a69ff107a94 /src/Utils.cpp
parentUpdate versions to 0.7.1 (diff)
parentMerge pull request #173 from Nheko-Reborn/decrypt-sidebar (diff)
downloadnheko-619d9bc1858b12350d95f64a1340d56f32e28bfe.tar.xz
Merge remote-tracking branch 'origin/master' into release-prep-0.7.1
Diffstat (limited to 'src/Utils.cpp')
-rw-r--r--src/Utils.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Utils.cpp b/src/Utils.cpp

index 62a1a3c8..cd615c24 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp
@@ -179,8 +179,9 @@ utils::getMessageDescription(const TimelineEvent &event, const auto ts = QDateTime::fromMSecsSinceEpoch(msg->origin_server_ts); DescInfo info; - info.userid = sender; - info.body = QString(" %1").arg(messageDescription<Encrypted>()); + info.userid = sender; + info.body = QString(" %1").arg( + messageDescription<Encrypted>(username, "", sender == localUser)); info.timestamp = utils::descriptiveTime(ts); info.event_id = QString::fromStdString(msg->event_id); info.datetime = ts;