From 19dbb5c44b3c32b894ed2c3c83d6c67aa69e7c17 Mon Sep 17 00:00:00 2001 From: Ugnich Anton Date: Thu, 24 Oct 2013 01:24:19 +0700 Subject: Home + Discover --- src/java/Global.properties | 2 + src/java/Global_ru.properties | 2 + src/java/com/juick/http/www/Blogs.java | 278 ------------------------- src/java/com/juick/http/www/Discover.java | 199 ++++++++++++++++++ src/java/com/juick/http/www/Home.java | 121 +++++++++++ src/java/com/juick/http/www/Main.java | 21 +- src/java/com/juick/http/www/PageTemplates.java | 17 +- 7 files changed, 343 insertions(+), 297 deletions(-) delete mode 100644 src/java/com/juick/http/www/Blogs.java create mode 100644 src/java/com/juick/http/www/Discover.java create mode 100644 src/java/com/juick/http/www/Home.java (limited to 'src/java') diff --git a/src/java/Global.properties b/src/java/Global.properties index 706e258f..f823d7d2 100644 --- a/src/java/Global.properties +++ b/src/java/Global.properties @@ -1,6 +1,8 @@ # To change this template, choose Tools | Templates # and open the template in the editor. +Home=Home +Discover=Discover Search=Search Blogs=Blogs Chats=Chats diff --git a/src/java/Global_ru.properties b/src/java/Global_ru.properties index a7c7e9d5..2df1f883 100644 --- a/src/java/Global_ru.properties +++ b/src/java/Global_ru.properties @@ -1,6 +1,8 @@ # To change this template, choose Tools | Templates # and open the template in the editor. +Home=\u0414\u043e\u043c\u043e\u0439 +Discover=\u041e\u0431\u0437\u043e\u0440 Search=\u041f\u043e\u0438\u0441\u043a Blogs=\u0411\u043b\u043e\u0433\u0438 Chats=\u0427\u0430\u0442\u044b diff --git a/src/java/com/juick/http/www/Blogs.java b/src/java/com/juick/http/www/Blogs.java deleted file mode 100644 index cf58ed4f..00000000 --- a/src/java/com/juick/http/www/Blogs.java +++ /dev/null @@ -1,278 +0,0 @@ -/* - * Juick - * Copyright (C) 2008-2011, Ugnich Anton - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package com.juick.http.www; - -import com.juick.server.MessagesQueries; -import com.juick.server.TagQueries; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.net.URLEncoder; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Locale; -import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * - * @author Ugnich Anton - */ -public class Blogs { - - protected void doGet(Connection sql, Connection sqlSearch, HttpServletRequest request, HttpServletResponse response, com.juick.User visitor) throws ServletException, IOException { - String paramTagStrQuery = request.getParameter("tag"); - if (paramTagStrQuery != null) { - String url = "/tag/" + URLEncoder.encode(paramTagStrQuery, "UTF-8"); - String paramBeforeStr = request.getParameter("before"); - if (paramBeforeStr != null) { - url += "?before=" + paramBeforeStr; - } - Utils.sendPermanentRedirect(response, url); - } - - Locale locale = request.getLocale(); - ResourceBundle rb = ResourceBundle.getBundle("Blogs", locale); - - String title; - ArrayList mids; - - String paramShow = request.getParameter("show"); - - String requesturi = request.getRequestURI(); - - int paramTag = 0; - String paramTagStr = null; - if (requesturi.startsWith("/tag/")) { - paramTagStr = URLDecoder.decode(request.getRequestURI().substring(5), "UTF-8"); - paramTag = TagQueries.getTagID(sql, paramTagStr, false); - if (paramTag == 0) { - response.sendError(404); - return; - } - } else if (requesturi.startsWith("/places/")) { - //TODO перенести сюда блок, который страницей ниже - } - - int paramBefore = 0; - String paramBeforeStr = request.getParameter("before"); - if (paramBeforeStr != null) { - try { - paramBefore = Integer.parseInt(paramBeforeStr); - } catch (NumberFormatException e) { - } - } - - String paramSearch = request.getParameter("search"); - if (paramSearch != null && paramSearch.length() > 64) { - paramSearch = null; - } - - com.juick.Place place = null; - int visitor_uid = visitor != null ? visitor.UID : 0; - - if (paramShow == null) { - if (paramTag > 0) { - title = "*" + Utils.encodeHTML(paramTagStr); - mids = MessagesQueries.getTag(sql, paramTag, visitor_uid, paramBefore); - } else if (paramSearch != null) { - title = rb.getString("Search") + ": " + Utils.encodeHTML(paramSearch); - mids = MessagesQueries.getSearch(sql, sqlSearch, Utils.encodeSphinx(paramSearch), paramBefore); - } else if (requesturi.matches("^\\/places\\/\\d+$")) { - int place_id = 0; - try { - place_id = Integer.parseInt(requesturi.substring(8)); - } catch (NumberFormatException e) { - } - place = com.juick.server.PlacesQueries.getPlace(sql, place_id); - if (place != null) { - title = place.name; - mids = MessagesQueries.getPlace(sql, place_id, visitor_uid, paramBefore); - } else { - response.sendError(404); - return; - } - } else { - title = rb.getString("Last messages"); - mids = MessagesQueries.getAll(sql, visitor_uid, paramBefore); - } - } else if (paramShow.equals("my")) { - if (visitor != null) { - title = rb.getString("My feed"); - mids = MessagesQueries.getMyFeed(sql, visitor.UID, paramBefore); - } else { - response.sendError(404); - return; - } - } else if (paramShow.equals("private")) { - if (visitor != null) { - title = rb.getString("Private"); - mids = MessagesQueries.getPrivate(sql, visitor.UID, paramBefore); - } else { - response.sendError(404); - return; - } - } else if (paramShow.equals("discuss")) { - if (visitor != null) { - title = rb.getString("Discussions"); - mids = MessagesQueries.getDiscussions(sql, visitor.UID, paramBefore); - } else { - response.sendError(404); - return; - } - } else if (paramShow.equals("recommended")) { - if (visitor != null) { - title = rb.getString("Recommended"); - mids = MessagesQueries.getRecommended(sql, visitor.UID, paramBefore); - } else { - response.sendError(404); - return; - } - } else if (paramShow.equals("top")) { - title = rb.getString("Popular"); - mids = MessagesQueries.getPopular(sql, paramBefore); - } else if (paramShow.equals("photos")) { - title = rb.getString("With photos"); - mids = MessagesQueries.getPhotos(sql, visitor_uid, paramBefore); - } else { - response.sendError(404); - return; - } - - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = response.getWriter(); - try { - PageTemplates.pageHead(out, title, null); - PageTemplates.pageNavigation(out, locale, visitor, paramSearch); - - out.println("
"); - out.println("
"); - out.println("
"); - - if (place != null) { - out.println("
\"Map\"/
"); - } - - if (mids.size() > 0) { - out.println("
    "); - PageTemplates.printMessages(out, sql, null, mids, visitor, locale, visitor == null ? 2 : 3); - out.println("
"); - } - - if (mids.size() == 20) { - String nextpage = "?before=" + mids.get(mids.size() - 1); - if (paramShow != null) { - nextpage += "&show=" + paramShow; - } - if (paramSearch != null) { - nextpage += "&search=" + URLEncoder.encode(paramSearch, "UTF-8"); - } - out.println("

Older →

"); - } - PageTemplates.pageFooter(request, out, locale, visitor, true); - out.println("
"); - out.println("
"); // wrapper - - - out.println("
"); - if (visitor != null) { - out.println(" "); - out.println("
"); - } - out.println(" "); - out.println("
"); - out.println("
"); - out.println("

"); - out.println("
"); - out.println("

" + getTags(sql, 45) + "

"); - out.println("
"); - - out.println("
"); // topwrapper - - PageTemplates.pageDialogTemplate(out, locale); - PageTemplates.pageEnd(out); - } finally { - out.close(); - } - } - - private String getTags(Connection sql, int cnt) { - String ret = ""; - com.juick.Tag tags[] = new com.juick.Tag[cnt]; - - int maxUsageCnt = 0; - PreparedStatement stmt = null; - ResultSet rs = null; - try { - stmt = sql.prepareStatement("SELECT tags.name AS name,COUNT(DISTINCT messages.user_id) AS cnt FROM (messages INNER JOIN messages_tags ON (messages.ts>TIMESTAMPADD(MONTH,-1,NOW()) AND messages.message_id=messages_tags.message_id)) INNER JOIN tags ON messages_tags.tag_id=tags.tag_id WHERE tags.tag_id NOT IN (SELECT tag_id FROM tags_ignore) GROUP BY tags.tag_id ORDER BY cnt DESC LIMIT ?"); - stmt.setInt(1, cnt); - rs = stmt.executeQuery(); - rs.beforeFirst(); - cnt = 0; - while (rs.next()) { - tags[cnt] = new com.juick.Tag(); - tags[cnt].Name = rs.getString(1); - tags[cnt].UsageCnt = rs.getInt(2); - if (tags[cnt].UsageCnt > maxUsageCnt) { - maxUsageCnt = tags[cnt].UsageCnt; - } - cnt++; - } - } catch (SQLException e) { - System.err.println(e); - } finally { - Utils.finishSQL(rs, stmt); - } - - Arrays.sort(tags, 0, cnt); - - for (int i = 0; i < cnt; i++) { - String tag = Utils.encodeHTML(tags[i].Name); - try { - tag = "" + tag + ""; - } catch (UnsupportedEncodingException e) { - } - - if (tags[i].UsageCnt > maxUsageCnt / 3 * 2) { - ret += "" + tag + " "; - } else if (tags[i].UsageCnt > maxUsageCnt / 3) { - ret += "" + tag + " "; - } else { - ret += tag + " "; - } - } - - return ret; - } -} diff --git a/src/java/com/juick/http/www/Discover.java b/src/java/com/juick/http/www/Discover.java new file mode 100644 index 00000000..b76a1d77 --- /dev/null +++ b/src/java/com/juick/http/www/Discover.java @@ -0,0 +1,199 @@ +/* + * Juick + * Copyright (C) 2008-2011, Ugnich Anton + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package com.juick.http.www; + +import com.juick.server.MessagesQueries; +import com.juick.server.TagQueries; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Locale; +import java.util.ResourceBundle; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + * @author Ugnich Anton + */ +public class Discover { + + protected void doGet(Connection sql, Connection sqlSearch, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + com.juick.User visitor = Utils.getVisitorUser(sql, request); + Locale locale = request.getLocale(); + ResourceBundle rb = ResourceBundle.getBundle("Blogs", locale); + + String requesturi = request.getRequestURI(); + + int paramTag = 0; + String paramTagStr = null; + if (requesturi.startsWith("/tag/")) { + paramTagStr = URLDecoder.decode(request.getRequestURI().substring(5), "UTF-8"); + paramTag = TagQueries.getTagID(sql, paramTagStr, false); + if (paramTag == 0) { + response.sendError(404); + return; + } + } + + int paramBefore = 0; + String paramBeforeStr = request.getParameter("before"); + if (paramBeforeStr != null) { + try { + paramBefore = Integer.parseInt(paramBeforeStr); + } catch (NumberFormatException e) { + } + } + + String paramSearch = request.getParameter("search"); + if (paramSearch != null && paramSearch.length() > 64) { + paramSearch = null; + } + + int visitor_uid = visitor != null ? visitor.UID : 0; + + String title; + ArrayList mids; + + String paramShow = request.getParameter("show"); + if (paramShow == null) { + if (paramTag > 0) { + title = "*" + Utils.encodeHTML(paramTagStr); + mids = MessagesQueries.getTag(sql, paramTag, visitor_uid, paramBefore); + } else if (paramSearch != null) { + title = rb.getString("Search") + ": " + Utils.encodeHTML(paramSearch); + mids = MessagesQueries.getSearch(sql, sqlSearch, Utils.encodeSphinx(paramSearch), paramBefore); + } else { + title = rb.getString("Last messages"); + mids = MessagesQueries.getAll(sql, visitor_uid, paramBefore); + } + } else if (paramShow.equals("photos")) { + title = rb.getString("With photos"); + mids = MessagesQueries.getPhotos(sql, visitor_uid, paramBefore); + } else { + response.sendError(404); + return; + } + + response.setContentType("text/html; charset=UTF-8"); + PrintWriter out = response.getWriter(); + try { + PageTemplates.pageHead(out, title, null); + PageTemplates.pageNavigation(out, locale, visitor, paramSearch); + + out.println("
"); + out.println("
"); + out.println("
"); + + if (mids.size() > 0) { + out.println("
    "); + PageTemplates.printMessages(out, sql, null, mids, visitor, locale, visitor == null ? 2 : 3); + out.println("
"); + } + + if (mids.size() == 20) { + String nextpage = "?before=" + mids.get(mids.size() - 1); + if (paramShow != null) { + nextpage += "&show=" + paramShow; + } + if (paramSearch != null) { + nextpage += "&search=" + URLEncoder.encode(paramSearch, "UTF-8"); + } + out.println("

Older →

"); + } + PageTemplates.pageFooter(request, out, locale, visitor, true); + out.println("
"); + out.println("
"); // wrapper + + + out.println("
"); + out.println(" "); + out.println("
"); + out.println("

" + getTags(sql, 45) + "

"); + out.println("
"); + + out.println("
"); // topwrapper + + PageTemplates.pageDialogTemplate(out, locale); + PageTemplates.pageEnd(out); + } finally { + out.close(); + } + } + + private String getTags(Connection sql, int cnt) { + String ret = ""; + com.juick.Tag tags[] = new com.juick.Tag[cnt]; + + int maxUsageCnt = 0; + PreparedStatement stmt = null; + ResultSet rs = null; + try { + stmt = sql.prepareStatement("SELECT tags.name AS name,COUNT(DISTINCT messages.user_id) AS cnt FROM (messages INNER JOIN messages_tags ON (messages.ts>TIMESTAMPADD(MONTH,-1,NOW()) AND messages.message_id=messages_tags.message_id)) INNER JOIN tags ON messages_tags.tag_id=tags.tag_id WHERE tags.tag_id NOT IN (SELECT tag_id FROM tags_ignore) GROUP BY tags.tag_id ORDER BY cnt DESC LIMIT ?"); + stmt.setInt(1, cnt); + rs = stmt.executeQuery(); + rs.beforeFirst(); + cnt = 0; + while (rs.next()) { + tags[cnt] = new com.juick.Tag(); + tags[cnt].Name = rs.getString(1); + tags[cnt].UsageCnt = rs.getInt(2); + if (tags[cnt].UsageCnt > maxUsageCnt) { + maxUsageCnt = tags[cnt].UsageCnt; + } + cnt++; + } + } catch (SQLException e) { + System.err.println(e); + } finally { + Utils.finishSQL(rs, stmt); + } + + Arrays.sort(tags, 0, cnt); + + for (int i = 0; i < cnt; i++) { + String tag = Utils.encodeHTML(tags[i].Name); + try { + tag = "" + tag + ""; + } catch (UnsupportedEncodingException e) { + } + + if (tags[i].UsageCnt > maxUsageCnt / 3 * 2) { + ret += "" + tag + " "; + } else if (tags[i].UsageCnt > maxUsageCnt / 3) { + ret += "" + tag + " "; + } else { + ret += tag + " "; + } + } + + return ret; + } +} diff --git a/src/java/com/juick/http/www/Home.java b/src/java/com/juick/http/www/Home.java new file mode 100644 index 00000000..b9009a80 --- /dev/null +++ b/src/java/com/juick/http/www/Home.java @@ -0,0 +1,121 @@ +/* + * Juick + * Copyright (C) 2008-2011, Ugnich Anton + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package com.juick.http.www; + +import com.juick.server.MessagesQueries; +import java.io.IOException; +import java.io.PrintWriter; +import java.sql.Connection; +import java.util.ArrayList; +import java.util.Locale; +import java.util.ResourceBundle; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + * @author Ugnich Anton + */ +public class Home { + + protected void doGet(Connection sql, Connection sqlSearch, HttpServletRequest request, HttpServletResponse response, com.juick.User visitor) throws ServletException, IOException { + Locale locale = request.getLocale(); + ResourceBundle rb = ResourceBundle.getBundle("Blogs", locale); + + int paramBefore = 0; + String paramBeforeStr = request.getParameter("before"); + if (paramBeforeStr != null) { + try { + paramBefore = Integer.parseInt(paramBeforeStr); + } catch (NumberFormatException e) { + } + } + + String title; + ArrayList mids; + + String paramShow = request.getParameter("show"); + if (paramShow == null || paramShow.equals("my")) { + title = rb.getString("My feed"); + mids = MessagesQueries.getMyFeed(sql, visitor.UID, paramBefore); + } else if (paramShow.equals("private")) { + title = rb.getString("Private"); + mids = MessagesQueries.getPrivate(sql, visitor.UID, paramBefore); + } else if (paramShow.equals("discuss")) { + title = rb.getString("Discussions"); + mids = MessagesQueries.getDiscussions(sql, visitor.UID, paramBefore); + } else if (paramShow.equals("recommended")) { + title = rb.getString("Recommended"); + mids = MessagesQueries.getRecommended(sql, visitor.UID, paramBefore); + } else if (paramShow.equals("top")) { + title = rb.getString("Popular"); + mids = MessagesQueries.getPopular(sql, paramBefore); + } else { + response.sendError(404); + return; + } + + response.setContentType("text/html; charset=UTF-8"); + PrintWriter out = response.getWriter(); + try { + PageTemplates.pageHead(out, title, null); + PageTemplates.pageNavigation(out, locale, visitor, null); + + out.println("
"); + out.println("
"); + out.println("
"); + + if (mids.size() > 0) { + out.println("
    "); + PageTemplates.printMessages(out, sql, null, mids, visitor, locale, visitor == null ? 2 : 3); + out.println("
"); + } + + if (mids.size() == 20) { + String nextpage = "?before=" + mids.get(mids.size() - 1); + if (paramShow != null) { + nextpage += "&show=" + paramShow; + } + out.println("

Older →

"); + } + PageTemplates.pageFooter(request, out, locale, visitor, true); + out.println("
"); + out.println("
"); // wrapper + + + out.println("
"); + out.println(" "); + out.println("
"); + out.println("
"); + + out.println("
"); // topwrapper + + PageTemplates.pageDialogTemplate(out, locale); + PageTemplates.pageEnd(out); + } finally { + out.close(); + } + } +} diff --git a/src/java/com/juick/http/www/Main.java b/src/java/com/juick/http/www/Main.java index 4c6e310b..8b760e44 100644 --- a/src/java/com/juick/http/www/Main.java +++ b/src/java/com/juick/http/www/Main.java @@ -41,7 +41,8 @@ public class Main extends HttpServlet { Connection sql; Connection sqlSearch; Stream xmpp; - Blogs blogs = new Blogs(); + Home home = new Home(); + Discover discover = new Discover(); Login login = new Login(); Help help = new Help(); User pagesUser = new User(); @@ -111,14 +112,10 @@ public class Main extends HttpServlet { if (uri.equals("/")) { com.juick.User visitor = Utils.getVisitorUser(sql, request); - if (request.getQueryString() == null) { - if (visitor == null) { - login.doGetLoginForm(sql, request, response); - } else { - blogs.doGet(sql, sqlSearch, request, response, visitor); - } + if (visitor == null) { + login.doGetLoginForm(sql, request, response); } else { - blogs.doGet(sql, sqlSearch, request, response, visitor); + home.doGet(sql, sqlSearch, request, response, visitor); } } else if (uri.equals("/post")) { com.juick.User visitor = Utils.getVisitorUser(sql, request); @@ -147,12 +144,10 @@ public class Main extends HttpServlet { help.doRedirectToHelpIndex(sql, request, response); } else if (uri.startsWith("/help/")) { help.doGetHelp(sql, request, response); + } else if (uri.equals("/discover")) { + discover.doGet(sql, sqlSearch, request, response); } else if (uri.startsWith("/tag/")) { - com.juick.User visitor = Utils.getVisitorUser(sql, request); - blogs.doGet(sql, sqlSearch, request, response, visitor); - } else if (uri.startsWith("/places/")) { - com.juick.User visitor = Utils.getVisitorUser(sql, request); - blogs.doGet(sql, sqlSearch, request, response, visitor); + discover.doGet(sql, sqlSearch, request, response); } else if (uri.matches("^/\\d+$")) { String strID = request.getRequestURI().substring(1); int mid = 0; diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java index fc9bb1d5..0c98f26f 100644 --- a/src/java/com/juick/http/www/PageTemplates.java +++ b/src/java/com/juick/http/www/PageTemplates.java @@ -50,7 +50,7 @@ public class PageTemplates { out.println(""); out.print(""); out.print(""); - out.print(""); + out.print(""); out.print(""); out.print(""); out.print(""); @@ -69,14 +69,19 @@ public class PageTemplates { ResourceBundle rb = ResourceBundle.getBundle("Global", loc); out.println("
"); out.println("