From 516b3cf0032a6204711dc85cd42d2bf41b84e999 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 16 Apr 2018 22:05:31 +0300
Subject: www: fix refreshing notifications counter

---
 .../test/java/com/juick/server/tests/ServerTests.java |  6 ++++++
 .../java/com/juick/www/controllers/MessagesWWW.java   |  6 +++---
 juick-www/src/test/java/com/juick/WebAppTests.java    | 19 +++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
index db932dc9..17c7e35c 100644
--- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
@@ -789,5 +789,11 @@ public class ServerTests {
         serverManager.onApplicationEvent(new MessageEvent(this, messagesService.getReply(mid, newfreefdrid),
                 Collections.emptyList()));
         assertThat(lastRead.apply(ugnich, mid), is(newfreefdrid));
+        privacyQueriesService.blacklistUser(ugnich, freefd);
+        newfreefdrid = messagesService.createReply(mid, 0, freefd, "after ban", null);
+        assertThat(lastRead.apply(ugnich, mid), lessThan(newfreefdrid));
+        mockMvc.perform(get(String.format("/thread?mid=%d&hash=%s", mid, ugnichHash)))
+                .andExpect(status().isOk());
+        assertThat(lastRead.apply(ugnich, mid), is(newfreefdrid));
     }
 }
diff --git a/juick-www/src/main/java/com/juick/www/controllers/MessagesWWW.java b/juick-www/src/main/java/com/juick/www/controllers/MessagesWWW.java
index 3c3c5d43..78474f49 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/MessagesWWW.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/MessagesWWW.java
@@ -507,9 +507,12 @@ public class MessagesWWW {
             return String.format("redirect:/%s/%d", msg.getUser().getName(), mid);
         }
         msg.VisitorCanComment = visitor.getUid() > 0;
+        List<com.juick.Message> replies = messagesService.getReplies(visitor, msg.getMid());
         if (visitor.getUid() > 0) {
             List<Integer> unread = messagesService.getUnread(visitor);
             visitor.setUnreadCount(unread.size());
+            // this should be after getReplies to mark thread as read
+            fillUserModel(model, user, visitor);
             boolean isMsgAuthor = visitor.getUid() == msg.getUser().getUid();
             boolean isInBL = userService.isInBLAny(msg.getUser().getUid(), visitor.getUid());
             msg.VisitorCanComment = isMsgAuthor || !(msg.ReadOnly || isInBL);
@@ -556,9 +559,6 @@ public class MessagesWWW {
         model.addAttribute("visitorSubscribed", messagesService.isSubscribed(visitor.getUid(), msg.getMid()));
         model.addAttribute("visitorInBL",  userService.isInBL(msg.getUser().getUid(), visitor.getUid()));
         model.addAttribute("recomm", messagesService.getMessageRecommendations(msg.getMid()));
-        List<com.juick.Message> replies = messagesService.getReplies(visitor, msg.getMid());
-        // this should be after getReplies to mark thread as read
-        fillUserModel(model, user, visitor);
         List<Integer> blUIDs = new ArrayList<>();
         for (Message reply : replies) {
             if (reply.getUser().getUid() != msg.getUser().getUid()
diff --git a/juick-www/src/test/java/com/juick/WebAppTests.java b/juick-www/src/test/java/com/juick/WebAppTests.java
index 4f9f4cc1..a0ec9737 100644
--- a/juick-www/src/test/java/com/juick/WebAppTests.java
+++ b/juick-www/src/test/java/com/juick/WebAppTests.java
@@ -394,4 +394,23 @@ public class WebAppTests {
                 .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
                 .andExpect(jsonPath("$.webcredentials.apps[0]", is(appId)));
     }
+    @Test
+    public void notificationsTests() throws Exception {
+        MvcResult loginResult = mockMvc.perform(post("/login")
+                .param("username", freefdName)
+                .param("password", freefdPassword)).andReturn();
+        Cookie loginCookie = loginResult.getResponse().getCookie("juick-remember-me");
+        webClient.setCookieManager(new CookieManager());
+        webClient.getCookieManager().addCookie(
+                new com.gargoylesoftware.htmlunit.util.Cookie(loginCookie.getDomain(),
+                        loginCookie.getName(),
+                        loginCookie.getValue()));
+        int mid = messagesService.createMessage(ugnich.getUid(), "new test", null, null);
+        subscriptionService.subscribeMessage(messagesService.getMessage(mid), freefd);
+        int rid = messagesService.createReply(mid, 0, ugnich, "new reply", null);
+        HtmlPage discussionsPage = webClient.getPage("http://localhost:8080/?show=discuss");
+        assertThat(discussionsPage.querySelectorAll("#global a .badge").size(), is(1));
+        HtmlPage unreadThread = webClient.getPage(String.format("http://localhost:8080/ugnich/%d", mid));
+        assertThat(unreadThread.querySelectorAll("#global a .badge").size(), is(0));
+    }
 }
-- 
cgit v1.2.3