From ad99117a15062a3819dad1f52a072e9694a954df Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 11 Apr 2018 21:34:14 +0300
Subject: server: last read marker for threads

---
 juick-common/src/main/java/com/juick/server/CommandsManager.java  | 4 ++--
 juick-common/src/main/java/com/juick/service/MessagesService.java | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'juick-common/src/main/java/com/juick')

diff --git a/juick-common/src/main/java/com/juick/server/CommandsManager.java b/juick-common/src/main/java/com/juick/server/CommandsManager.java
index d924ac70..734d68fb 100644
--- a/juick-common/src/main/java/com/juick/server/CommandsManager.java
+++ b/juick-common/src/main/java/com/juick/server/CommandsManager.java
@@ -388,7 +388,7 @@ public class CommandsManager {
         com.juick.Message msg = messagesService.getMessage(mid);
         if (msg != null) {
             if (showReplies) {
-                List<com.juick.Message> replies = messagesService.getReplies(mid);
+                List<com.juick.Message> replies = messagesService.getReplies(user, mid);
                 replies.add(0, msg);
                 return CommandResult.fromString(String.join("\n",
                         replies.stream().map(PlainTextFormatter::formatPostSummary).collect(Collectors.toList())));
@@ -477,7 +477,7 @@ public class CommandsManager {
         } else {
             String attachmentStr = attachment.toString();
             String attachmentType = StringUtils.isNotEmpty(attachmentStr) ? attachmentStr.substring(attachmentStr.length() - 3) : null;
-            int newrid = messagesService.createReply(mid, rid, user.getUid(), txt, attachmentType);
+            int newrid = messagesService.createReply(mid, rid, user, txt, attachmentType);
             if (StringUtils.isNotEmpty(attachmentType)) {
                 String attachmentFName = attachment.getScheme().equals("juick") ? attachment.getHost()
                         : HttpUtils.downloadImage(attachment.toURL(), tmpDir).getHost();
diff --git a/juick-common/src/main/java/com/juick/service/MessagesService.java b/juick-common/src/main/java/com/juick/service/MessagesService.java
index 2dce2806..968e64be 100644
--- a/juick-common/src/main/java/com/juick/service/MessagesService.java
+++ b/juick-common/src/main/java/com/juick/service/MessagesService.java
@@ -29,7 +29,7 @@ import java.util.List;
 public interface MessagesService {
     int createMessage(int uid, String txt, String attachment, Collection<com.juick.Tag> tags);
 
-    int createReply(int mid, int rid, int uid, String txt, String attachment);
+    int createReply(int mid, int rid, User user, String txt, String attachment);
 
     int getReplyIDIncrement(int mid);
 
@@ -95,7 +95,7 @@ public interface MessagesService {
 
     List<com.juick.Message> getMessages(List<Integer> mids);
 
-    List<com.juick.Message> getReplies(int mid);
+    List<com.juick.Message> getReplies(User user, int mid);
 
     boolean setMessagePopular(int mid, int popular);
 
@@ -110,4 +110,6 @@ public interface MessagesService {
     List<ResponseReply> getLastReplies(int hours);
 
     List<Integer> getPopularCandidates();
+
+    void setLastReadComment(User user, Integer mid, Integer rid);
 }
-- 
cgit v1.2.3