From be91c5f5771282f2798cb687f915b0df44eaa59e Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 20 Mar 2018 11:36:13 +0300
Subject: jdbc: no more notifications from banned users

---
 juick-server/src/main/java/com/juick/server/XMPPConnection.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'juick-server/src/main/java/com/juick/server/XMPPConnection.java')

diff --git a/juick-server/src/main/java/com/juick/server/XMPPConnection.java b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
index 4bfcd833..69d39c18 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPConnection.java
+++ b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
@@ -160,7 +160,9 @@ public class XMPPConnection implements AutoCloseable {
                         sendJuickRecommendation(jmsg);
                     } else {
                         if (jmsg.getRid() > 0) {
-                            sendJuickComment(jmsg);
+                            // to get quote and attachment
+                            com.juick.Message reply = messagesService.getReply(jmsg.getMid(), jmsg.getRid());
+                            sendJuickComment(reply);
                         } else if (jmsg.getMid() > 0) {
                             sendJuickMessage(jmsg);
                         }
@@ -332,7 +334,8 @@ public class XMPPConnection implements AutoCloseable {
         String replyQuote;
         String replyTo;
 
-        users = subscriptionService.getUsersSubscribedToComments(jmsg.getMid(), jmsg.getUser().getUid());
+        com.juick.Message op = messagesService.getMessage(jmsg.getMid());
+        users = subscriptionService.getUsersSubscribedToComments(op, jmsg);
         com.juick.Message replyMessage = jmsg.getReplyto() > 0 ? messagesService.getReply(jmsg.getMid(), jmsg.getReplyto())
                 : messagesService.getMessage(jmsg.getMid());
         replyTo = replyMessage.getUser().getName();
-- 
cgit v1.2.3