From 8a1666bc889d963693b5dff8f0b4c7612319644a Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Thu, 15 Jul 2021 20:37:52 +0200
Subject: Basic sticker support

---
 src/timeline/InputBar.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'src/timeline/InputBar.cpp')

diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index b0747a7c..0f210722 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -21,6 +21,7 @@
 #include "ChatPage.h"
 #include "CompletionProxyModel.h"
 #include "Config.h"
+#include "ImagePackModel.h"
 #include "Logging.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
@@ -501,6 +502,22 @@ InputBar::video(const QString &filename,
         room->sendMessageEvent(video, mtx::events::EventType::RoomMessage);
 }
 
+void
+InputBar::sticker(ImagePackModel *model, int row)
+{
+        if (!model || row < 0)
+                return;
+
+        auto img = model->imageAt(row);
+
+        mtx::events::msg::StickerImage sticker{};
+        sticker.info = img.info.value_or(mtx::common::ImageInfo{});
+        sticker.url  = img.url;
+        sticker.body = img.body;
+
+        room->sendMessageEvent(sticker, mtx::events::EventType::Sticker);
+}
+
 void
 InputBar::command(QString command, QString args)
 {
-- 
cgit 1.5.1


From 3b56ff2d85e607b2620ced0f45bdc2c6ef100feb Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Mon, 19 Jul 2021 16:14:09 +0200
Subject: Fix replying and editing stickers

---
 src/timeline/InputBar.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/timeline/InputBar.cpp')

diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index 0f210722..56d0d1ce 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -515,6 +515,15 @@ InputBar::sticker(ImagePackModel *model, int row)
         sticker.url  = img.url;
         sticker.body = img.body;
 
+        if (!room->reply().isEmpty()) {
+                sticker.relations.relations.push_back(
+                  {mtx::common::RelationType::InReplyTo, room->reply().toStdString()});
+        }
+        if (!room->edit().isEmpty()) {
+                sticker.relations.relations.push_back(
+                  {mtx::common::RelationType::Replace, room->edit().toStdString()});
+        }
+
         room->sendMessageEvent(sticker, mtx::events::EventType::Sticker);
 }
 
-- 
cgit 1.5.1