server: mark comments from blacklisted users as read

1 files changed, 10 insertions, 0 deletions

diff --git a/juick-server/src/main/java/com/juick/server/ServerManager.java b/juick-server/src/main/java/com/juick/server/ServerManager.java
index f209d934..3db6ec90 100644
--- a/juick-server/src/main/java/com/juick/server/ServerManager.java
+++ b/juick-server/src/main/java/com/juick/server/ServerManager.java
@@ -18,10 +18,12 @@ package com.juick.server;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.juick.Message;
 import com.juick.User;
 import com.juick.server.component.MessageEvent;
 import com.juick.service.MessagesService;
 import com.juick.service.SubscriptionService;
+import com.juick.service.UserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -48,6 +50,10 @@ public class ServerManager implements ApplicationListener<MessageEvent> {
     private MessagesService messagesService;
     @Inject
     private WebsocketManager wsHandler;
+    @Inject
+    private SubscriptionService subscriptionService;
+    @Inject
+    private UserService userService;
     @Value("${service_user:juick}")
     private String serviceUser;
     @Inject
@@ -157,7 +163,11 @@ public class ServerManager implements ApplicationListener<MessageEvent> {
             onJuickMessagePost(messagesService.getMessage(jmsg.getMid()), subscribedUsers);
         } else {
             // to get quote and attachment
+            Message op = messagesService.getMessage(jmsg.getMid());
             com.juick.Message reply = messagesService.getReply(jmsg.getMid(), jmsg.getRid());
+            subscriptionService.getUsersSubscribedToComments(op, reply, true).stream()
+                    .filter(u -> userService.isInBLAny(reply.getUser().getUid(), u.getUid()))
+                    .forEach(b -> messagesService.setLastReadComment(b, reply.getMid(), reply.getRid()));
             onJuickMessageReply(reply, subscribedUsers);
         }
     }