sort discussions by last replay date

1 files changed, 6 insertions, 2 deletions

diff --git a/juick-www/src/main/java/com/juick/www/controllers/Messages.java b/juick-www/src/main/java/com/juick/www/controllers/Messages.java
index e74f7486..c83bb356 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/Messages.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/Messages.java
@@ -41,6 +41,9 @@ import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BooleanSupplier;
@@ -117,6 +120,7 @@ public class Messages {
             @RequestParam(name = "show", required = false) String paramShow,
             @RequestParam(name = "search", required = false) String paramSearch,
             @RequestParam(name = "before", required = false, defaultValue = "0") Integer paramBefore,
+            @RequestParam(name = "to", required = false, defaultValue = "0") Long paramTo,
             @CookieValue(name = "sape_cookie", required = false, defaultValue = StringUtils.EMPTY) String sapeCookie,
             ModelMap model) throws IOException {
         if (tag != null) {
@@ -156,7 +160,7 @@ public class Messages {
             mids = messagesService.getPrivate(visitor.getUid(), paramBefore);
         } else if (paramShow.equals("discuss") && !visitor.isAnonymous()) {
             title = "Обсуждения";
-            mids = messagesService.getDiscussions(visitor.getUid(), paramBefore);
+            mids = messagesService.getDiscussions(visitor.getUid(), paramTo);
         } else if (paramShow.equals("recommended") && !visitor.isAnonymous()) {
             title = "Рекомендации";
             mids = messagesService.getRecommended(visitor.getUid(), paramBefore);
@@ -194,7 +198,7 @@ public class Messages {
         model.addAttribute("showAdv",
                 paramShow == null && paramBefore == 0 && paramSearch == null && visitor.getUid() == 0);
         if (mids.size() >= 20) {
-            String nextpage = "?before=" + mids.get(mids.size() - 1);
+            String nextpage = (paramShow != null && paramShow.equals("discuss")) ? "?to=" + msgs.get(msgs.size() - 1).getUpdated().toEpochMilli() : "?before=" + mids.get(mids.size() - 1);
             if (paramShow != null) {
                 nextpage += "&show=" + paramShow;
             }