Make sending reactions working + some incomplete changes for receiving

psi-im · Jun 28, 2024 · 5676920 · 5676920
1 parent 847c253
commit 5676920
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 7 deletions.
diff --git a/iris b/iris
diff --git a/src/chatdlg.cpp b/src/chatdlg.cpp
@@ -148,6 +148,7 @@ void ChatDlg::init()
     chatView()->setMediaOpener(account()->fileSharingDeviceOpener());
 #endif
     chatView()->init();
+    connect(chatView(), &ChatView::outgoingReactions, this, &ChatDlg::sendOutgoingReactions);
 
     // seems its useless hack
     // connect(chatView(), SIGNAL(selectionChanged()), SLOT(logSelectionChanged())); //
@@ -759,6 +760,14 @@ void ChatDlg::doneSend()
     resetComposing();
 }
 
+void ChatDlg::sendOutgoingReactions(const QString &messageId, const QSet<QString> &reactions)
+{
+    Message m(jid());
+    m.setType(Message::Type::Chat);
+    m.setReactions({ messageId, reactions });
+    emit aSend(m);
+}
+
 void ChatDlg::encryptedMessageSent(int x, bool b, int e, const QString &dtext)
 {
     Q_UNUSED(e);

diff --git a/src/chatdlg.h b/src/chatdlg.h
@@ -146,6 +146,7 @@ private slots:
     void         initComposing();
     void         setComposing();
     void         getHistory();
+    void         sendOutgoingReactions(const QString &messageId, const QSet<QString> &reactions);
 
 protected slots:
     void checkComposing();

diff --git a/src/chatview_te.cpp b/src/chatview_te.cpp
@@ -110,7 +110,7 @@ void ChatView::contextMenuEvent(QContextMenuEvent *e)
     const QUrl anc = QUrl::fromEncoded(anchorAt(e->pos()).toLatin1());
 
     if (anc.scheme() == "addnick") {
-        emit showNM(anc.path().mid(1));
+        emit showNickMenu(anc.path().mid(1));
         e->accept();
     } else {
         QMenu *menu = createStandardContextMenu(e->pos());

diff --git a/src/chatview_te.h b/src/chatview_te.h
@@ -98,7 +98,7 @@ private slots:
     void slotScroll();
 
 signals:
-    void showNM(const QString &);
+    void showNickMenu(const QString &);
     void quote(const QString &text);
     void nickInsertClick(const QString &nick);
     void outgoingReactions(const QString &messageId, const QSet<QString> &reactions);

diff --git a/src/chatview_webkit.cpp b/src/chatview_webkit.cpp
@@ -576,7 +576,7 @@ void ChatView::contextMenuEvent(QContextMenuEvent *e)
     linkUrl = d->webView->page()->mainFrame()->hitTestContent(e->pos()).linkUrl();
 #endif
     if (linkUrl.scheme() == "addnick") {
-        emit showNM(linkUrl.path().mid(1));
+        emit showNickMenu(linkUrl.path().mid(1));
         e->accept();
     }
 }

diff --git a/src/chatview_webkit.h b/src/chatview_webkit.h
@@ -96,7 +96,7 @@ private slots:
     void sessionInited();
 
 signals:
-    void showNM(const QString &);
+    void showNickMenu(const QString &);
     void nickInsertClick(const QString &nick);
     void quote(const QString &text);
     void outgoingReactions(const QString &messageId, const QSet<QString> &reactions);

diff --git a/src/groupchatdlg.cpp b/src/groupchatdlg.cpp
@@ -887,7 +887,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager) : Tab
     ui_.log->setMediaOpener(account()->fileSharingDeviceOpener());
 #endif
 
-    connect(ui_.log, SIGNAL(showNM(QString)), this, SLOT(doContactContextMenu(QString)));
+    connect(ui_.log, SIGNAL(showNickMenu(QString)), this, SLOT(doContactContextMenu(QString)));
     connect(URLObject::getInstance(), SIGNAL(openURL(QString)), SLOT(openURL(QString)));
     connect(ui_.log, SIGNAL(nickInsertClick(QString)), SLOT(onNickInsertClick(QString)));
     connect(ui_.log, &ChatView::outgoingReactions, this, &GCMainDlg::outgoingReactions);

diff --git a/src/psiaccount.cpp b/src/psiaccount.cpp
@@ -2821,7 +2821,7 @@ void PsiAccount::processIncomingMessage(const Message &_m)
     if (_m.type() != Message::Type::Error && _m.body().isEmpty() && _m.urlList().isEmpty() && _m.invite().isEmpty()
         && !_m.containsEvents() && _m.chatState() == StateNone && _m.subject().isNull()
         && _m.rosterExchangeItems().isEmpty() && _m.mucInvites().isEmpty() && _m.getForm().fields().empty()
-        && _m.messageReceipt() == ReceiptNone && _m.getMUCStatuses().isEmpty())
+        && _m.messageReceipt() == ReceiptNone && _m.getMUCStatuses().isEmpty() && _m.reactions().targetId.isEmpty())
         return;
 
     // skip headlines?