summary refs log tree commit diff
path: root/src/timeline
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-01-07 10:44:59 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2021-01-07 10:44:59 +0100
commit4b4c321397e0681f306eade889e0fab6dbbe94f5 (patch)
treebefea6b86fc0cfb5df1fca770a45611e8c531e80 /src/timeline
parentExplicitly mention, if call support is enabled at build time (diff)
downloadnheko-4b4c321397e0681f306eade889e0fab6dbbe94f5.tar.xz
Allow inline replies from notifications on linux
Diffstat (limited to 'src/timeline')
-rw-r--r--src/timeline/InputBar.h2
-rw-r--r--src/timeline/TimelineViewManager.cpp12
-rw-r--r--src/timeline/TimelineViewManager.h3
3 files changed, 16 insertions, 1 deletions
diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h

index 27aa4bc3..89ca34fe 100644 --- a/src/timeline/InputBar.h +++ b/src/timeline/InputBar.h
@@ -42,6 +42,7 @@ public slots: void openFileSelection(); bool uploading() const { return uploading_; } void callButton(); + void message(QString body); QObject *completerFor(QString completerName); @@ -54,7 +55,6 @@ signals: void uploadingChanged(bool value); private: - void message(QString body); void emote(QString body); void command(QString name, QString args); void image(const QString &filename, diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index f31b5ea5..f10c2c0d 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp
@@ -509,6 +509,18 @@ TimelineViewManager::initWithMessages(const std::vector<QString> &roomIds) } void +TimelineViewManager::queueReply(const QString &roomid, + const QString &repliedToEvent, + const QString &replyBody) +{ + auto room = models.find(roomid); + if (room != models.end()) { + room.value()->setReply(repliedToEvent); + room.value()->input()->message(replyBody); + } +} + +void TimelineViewManager::queueReactionMessage(const QString &reactedEvent, const QString &reactionKey) { if (!timeline_) diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h
index f346acf8..1cec0939 100644 --- a/src/timeline/TimelineViewManager.h +++ b/src/timeline/TimelineViewManager.h
@@ -120,6 +120,9 @@ public slots: } void updateColorPalette(); + void queueReply(const QString &roomid, + const QString &repliedToEvent, + const QString &replyBody); void queueReactionMessage(const QString &reactedEvent, const QString &reactionKey); void queueCallMessage(const QString &roomid, const mtx::events::msg::CallInvite &); void queueCallMessage(const QString &roomid, const mtx::events::msg::CallCandidates &);