From 53fb0b3e0e790df007a198deef21c115ed236b3e Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 27 Jun 2016 10:33:52 +0300
Subject: merge with spring-jdbc

---
 src/main/java/com/juick/http/www/Home.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main/java/com/juick/http/www/Home.java')

diff --git a/src/main/java/com/juick/http/www/Home.java b/src/main/java/com/juick/http/www/Home.java
index 8dc3e70c..89d4005f 100644
--- a/src/main/java/com/juick/http/www/Home.java
+++ b/src/main/java/com/juick/http/www/Home.java
@@ -19,6 +19,8 @@ package com.juick.http.www;
 
 import com.juick.server.AdsQueries;
 import com.juick.server.MessagesQueries;
+import org.springframework.jdbc.core.JdbcTemplate;
+
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.URLEncoder;
@@ -35,7 +37,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 public class Home {
 
-    protected void doGet(Connection sql, Connection sqlSearch, HttpServletRequest request, HttpServletResponse response, com.juick.User visitor) throws ServletException, IOException {
+    protected void doGet(JdbcTemplate sql, JdbcTemplate sqlSearch, HttpServletRequest request, HttpServletResponse response, com.juick.User visitor) throws ServletException, IOException {
         int paramBefore = 0;
         String paramBeforeStr = request.getParameter("before");
         if (paramBeforeStr != null) {
-- 
cgit v1.2.3


From c4f9f29274ab9700272ba1064d05ccf7eefe91e2 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 7 Jul 2016 10:22:34 +0300
Subject: filter top and photos by bl_users

---
 deps/com.juick.server                      | 2 +-
 src/main/java/com/juick/http/www/Home.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/juick/http/www/Home.java')

diff --git a/deps/com.juick.server b/deps/com.juick.server
index 67d53fe2..a0d038f5 160000
--- a/deps/com.juick.server
+++ b/deps/com.juick.server
@@ -1 +1 @@
-Subproject commit 67d53fe24081ade138b5d9756fd835575eb4ae79
+Subproject commit a0d038f5e6aa28ef67162c591abe64d057a19fa5
diff --git a/src/main/java/com/juick/http/www/Home.java b/src/main/java/com/juick/http/www/Home.java
index 89d4005f..d5c1bb7b 100644
--- a/src/main/java/com/juick/http/www/Home.java
+++ b/src/main/java/com/juick/http/www/Home.java
@@ -62,10 +62,12 @@ public class Home {
         } else if (paramShow == null) {
             if (visitor != null) {
                 title = "Популярные";
+                mids = MessagesQueries.getPopular(sql, visitor.getUID(), paramBefore);
             } else {
                 title = "Микроблоги Juick: популярные записи";
+                mids = MessagesQueries.getPopular(sql, 0, paramBefore);
             }
-            mids = MessagesQueries.getPopular(sql, paramBefore);
+
         } else if (paramShow.equals("top")) {
             Utils.sendPermanentRedirect(response, "/");
             return;
-- 
cgit v1.2.3