From 2be7df2ddadcc9800af3593f52bf66123ba32e82 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 10 Sep 2018 12:38:05 +0300
Subject: fix paging

---
 .../src/main/java/com/juick/server/www/controllers/MessagesWWW.java | 2 +-
 juick-server/src/test/java/com/juick/server/tests/ServerTests.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'juick-server')

diff --git a/juick-server/src/main/java/com/juick/server/www/controllers/MessagesWWW.java b/juick-server/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
index 53503cb5..7388060e 100644
--- a/juick-server/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
+++ b/juick-server/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
@@ -167,7 +167,7 @@ public class MessagesWWW {
         model.addAttribute("showAdv",
                 paramShow == null && paramBefore == 0 && paramSearch == null && visitor.isAnonymous());
         if (mids.size() >= 20) {
-            String nextpage = (paramShow != null && paramShow.equals("discuss")) ? "?to=" + msgs.get(msgs.size() - 1).getUpdated().toEpochMilli() : paramSearch != null ? String.format("?page=%d", page + 1) : "?before=" + mids.get(mids.size() - 1);
+            String nextpage = (paramShow == null) ? "?to=" + msgs.get(msgs.size() - 1).getUpdated().toEpochMilli() : paramSearch != null ? String.format("?page=%d", page + 1) : "?before=" + mids.get(mids.size() - 1);
             if (paramShow != null) {
                 nextpage += "&show=" + paramShow;
             }
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 9fe877f3..66845cfa 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
@@ -1562,7 +1562,7 @@ public class ServerTests {
                 new com.gargoylesoftware.htmlunit.util.Cookie(loginCookie.getDomain(),
                         loginCookie.getName(),
                         loginCookie.getValue()));
-        String discussionsUrl = "http://localhost:8080/?show=discuss";
+        String discussionsUrl = "http://localhost:8080/";
         HtmlPage discussions = webClient.getPage(discussionsUrl);
         assertThat(discussions.querySelectorAll("article").size(), is(0));
         subscriptionService.subscribeMessage(messagesService.getMessage(mid), freefd);
@@ -1577,7 +1577,7 @@ public class ServerTests {
         assertThat(discussions.querySelectorAll("article").size(), is(2));
         assertThat(discussions.querySelectorAll("article").get(0).getAttributes().getNamedItem("data-mid").getNodeValue(), is(String.valueOf(mid)));
         Message msg = messagesService.getMessage(mid);
-        HtmlPage discussionsOld = webClient.getPage(discussionsUrl + "&to=" + msg.getUpdated().toEpochMilli());
+        HtmlPage discussionsOld = webClient.getPage(discussionsUrl + "?to=" + msg.getUpdated().toEpochMilli());
         assertThat(discussionsOld.querySelectorAll("article").size(), is(1));
         assertThat(discussionsOld.querySelectorAll("article").get(0).getAttributes().getNamedItem("data-mid").getNodeValue(), is(String.valueOf(midNew)));
         List<Integer> newMids = IntStream.rangeClosed(1, 19).map(i -> messagesService.createMessage(ugnich.getUid(), String.valueOf(i), null, null)).boxed().collect(Collectors.toList());
@@ -1593,7 +1593,7 @@ public class ServerTests {
         assertThat(discussions.querySelectorAll("article")
                 .get(0).getAttributes().getNamedItem("data-mid").getNodeValue(), is(String.valueOf(midNew)));
         Message old = messagesService.getMessage(newMids.get(0));
-        discussionsOld = webClient.getPage(discussionsUrl + "&to=" + old.getUpdated().toEpochMilli());
+        discussionsOld = webClient.getPage(discussionsUrl + "?to=" + old.getUpdated().toEpochMilli());
         assertThat(discussionsOld.querySelectorAll("article").size(), is(1));
         assertThat(discussionsOld.querySelectorAll("article")
                 .get(0).getAttributes().getNamedItem("data-mid").getNodeValue(), is(String.valueOf(mid)));
-- 
cgit v1.2.3