aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/java/Blogs.properties1
-rw-r--r--src/java/Blogs_ru.properties1
-rw-r--r--src/java/com/juick/http/www/Discover.java139
-rw-r--r--src/java/com/juick/http/www/Home.java33
-rw-r--r--src/java/com/juick/http/www/Main.java2
-rw-r--r--src/java/com/juick/http/www/PM.java24
-rw-r--r--src/java/com/juick/http/www/PageTemplates.java82
-rw-r--r--src/java/com/juick/http/www/User.java2
8 files changed, 114 insertions, 170 deletions
diff --git a/src/java/Blogs.properties b/src/java/Blogs.properties
index 22ce41d5..6190136b 100644
--- a/src/java/Blogs.properties
+++ b/src/java/Blogs.properties
@@ -7,6 +7,7 @@ Tags=Tags
Search=Search
My\ feed=My feed
Private=Private
+Private\ sent=Sent
Discussions=Discussions
Recommended=Recommended
All\ messages=All messages
diff --git a/src/java/Blogs_ru.properties b/src/java/Blogs_ru.properties
index afcea809..afe4b145 100644
--- a/src/java/Blogs_ru.properties
+++ b/src/java/Blogs_ru.properties
@@ -7,6 +7,7 @@ Tags=\u0422\u0435\u0433\u0438
Search=\u041f\u043e\u0438\u0441\u043a
My\ feed=\u041c\u043e\u044f \u043b\u0435\u043d\u0442\u0430
Private=\u041f\u0440\u0438\u0432\u0430\u0442\u043d\u044b\u0435
+Private\ sent=\u0418\u0441\u0445\u043e\u0434\u044f\u0449\u0438\u0435
Discussions=\u041e\u0431\u0441\u0443\u0436\u0434\u0435\u043d\u0438\u044f
Recommended=\u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u043e\u0432\u0430\u043d\u043d\u043e\u0435
All\ messages=\u0412\u0441\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f
diff --git a/src/java/com/juick/http/www/Discover.java b/src/java/com/juick/http/www/Discover.java
index b24164f5..5e24889b 100644
--- a/src/java/com/juick/http/www/Discover.java
+++ b/src/java/com/juick/http/www/Discover.java
@@ -17,20 +17,13 @@
*/
package com.juick.http.www;
-import com.juick.server.AdsQueries;
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;
@@ -43,8 +36,6 @@ import javax.servlet.http.HttpServletResponse;
*/
public class Discover {
- private String tagsHTML = null;
-
protected void doGet(Connection sql, Connection sqlSearch, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
com.juick.User visitor = Utils.getVisitorUser(sql, request, response);
Locale locale = request.getLocale();
@@ -57,10 +48,10 @@ public class Discover {
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;
- }
+ }
+ if (paramTag == 0) {
+ response.sendError(404);
+ return;
}
int paramBefore = 0;
@@ -72,93 +63,36 @@ public class Discover {
}
}
- String paramSearch = request.getParameter("search");
- if (paramSearch != null && paramSearch.length() > 64) {
- paramSearch = null;
- }
-
int visitor_uid = visitor != null ? visitor.UID : 0;
- String title;
- ArrayList<Integer> mids;
-
- String paramShow = request.getParameter("show");
- if (paramShow == null) {
- if (paramTag > 0) {
- title = "*" + Utils.encodeHTML(paramTagStr);
- mids = MessagesQueries.getTag(sql, paramTag, visitor_uid, paramBefore, (visitor == null) ? 40 : 20);
- } 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;
- }
+ String title = "*" + Utils.encodeHTML(paramTagStr);
+ ArrayList<Integer> mids = MessagesQueries.getTag(sql, paramTag, visitor_uid, paramBefore, (visitor == null) ? 40 : 20);
response.setContentType("text/html; charset=UTF-8");
PrintWriter out = response.getWriter();
try {
PageTemplates.pageHead(out, title, null);
- PageTemplates.pageNavigation(out, locale, visitor, paramSearch);
+ PageTemplates.pageNavigation(out, locale, visitor, null);
out.println("<div id=\"topwrapper\">");
out.println("<div id=\"wrapper\">");
out.println("<div id=\"content\">");
if (mids.size() > 0) {
- int ad_mid = 0;
- if (visitor != null && paramShow == null && paramTag == 0 && paramSearch == null) {
- ad_mid = AdsQueries.getAdMID(sql, visitor.UID);
- if (ad_mid > 0 && mids.indexOf(ad_mid) == -1) {
- mids.add(0, ad_mid);
- AdsQueries.logAdMID(sql, visitor.UID, ad_mid);
- } else {
- ad_mid = 0;
- }
- }
-
out.println("<ul>");
- PageTemplates.printMessages(out, sql, null, mids, visitor, locale, visitor == null ? 2 : 3, ad_mid);
+ PageTemplates.printMessages(out, sql, null, mids, visitor, locale, visitor == null ? 2 : 3, 0);
out.println("</ul>");
}
- if (visitor != null) {
- if (mids.size() >= 20) {
- String nextpage = "?before=" + mids.get(mids.size() - 1);
- if (paramShow != null) {
- nextpage += "&amp;show=" + paramShow;
- }
- if (paramSearch != null) {
- nextpage += "&amp;search=" + URLEncoder.encode(paramSearch, "UTF-8");
- }
- out.println("<p class=\"page\"><a href=\"" + nextpage + "\">Older โ†’</a></p>");
- }
- } else {
- out.println("<p class=\"page\"><a href=\"/\">" + rb.getString("LoginToReadMore") + "</a></p>");
+ if (mids.size() >= 20) {
+ String nextpage = "?before=" + mids.get(mids.size() - 1);
+ out.println("<p class=\"page\"><a href=\"" + nextpage + "\">Older โ†’</a></p>");
}
PageTemplates.pageFooter(request, out, locale, visitor, true);
out.println("</div>");
out.println("</div>"); // wrapper
- if (tagsHTML == null) {
- tagsHTML = getTags(sql, 60);
- }
-
- out.println("<div id=\"column\" class=\"abs\">");
- out.println(" <ul>");
- out.println(" <li><a href=\"/discover\">" + rb.getString("All messages") + "</a></li>");
- out.println(" <li><a href=\"/discover?show=photos\">" + rb.getString("With photos") + "</a></li>");
- out.println(" </ul>");
- out.println(" <hr/>");
- out.println(" <p>" + tagsHTML + "</p>");
- out.println("</div>");
+ PageTemplates.pageHomeColumn(out, sql, locale);
out.println("</div>"); // topwrapper
@@ -168,53 +102,4 @@ public class Discover {
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 = "<a href=\"/tag/" + URLEncoder.encode(tags[i].Name, "UTF-8") + "\">" + tag + "</a>";
- } catch (UnsupportedEncodingException e) {
- }
-
- if (tags[i].UsageCnt > maxUsageCnt / 3 * 2) {
- ret += "<big>" + tag + "</big> ";
- } else if (tags[i].UsageCnt > maxUsageCnt / 3) {
- ret += "<small>" + tag + "</small> ";
- } 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
index 2705d953..8bf30af5 100644
--- a/src/java/com/juick/http/www/Home.java
+++ b/src/java/com/juick/http/www/Home.java
@@ -23,6 +23,7 @@ import com.juick.server.MessagesQueries;
import com.juick.server.PMQueries;
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.URLEncoder;
import java.sql.Connection;
import java.util.ArrayList;
import java.util.Locale;
@@ -50,11 +51,19 @@ public class Home {
}
}
+ String paramSearch = request.getParameter("search");
+ if (paramSearch != null && paramSearch.length() > 64) {
+ paramSearch = null;
+ }
+
String title;
ArrayList<Integer> mids;
String paramShow = request.getParameter("show");
- if (paramShow == null || paramShow.equals("my")) {
+ if (paramSearch != null) {
+ title = rb.getString("Search") + ": " + Utils.encodeHTML(paramSearch);
+ mids = MessagesQueries.getSearch(sql, sqlSearch, Utils.encodeSphinx(paramSearch), paramBefore);
+ } else if (paramShow == null || paramShow.equals("my")) {
title = rb.getString("My feed");
mids = MessagesQueries.getMyFeed(sql, visitor.UID, paramBefore);
} else if (paramShow.equals("private")) {
@@ -69,6 +78,9 @@ public class Home {
} else if (paramShow.equals("top")) {
title = rb.getString("Popular");
mids = MessagesQueries.getPopular(sql, paramBefore);
+ } else if (paramShow.equals("all")) {
+ title = rb.getString("Last messages");
+ mids = MessagesQueries.getAll(sql, visitor.UID, paramBefore);
} else {
response.sendError(404);
return;
@@ -96,7 +108,7 @@ public class Home {
if (mids.size() > 0) {
int ad_mid = 0;
- if (paramShow == null || paramShow.equals("top")) {
+ if (paramShow == null || paramShow.equals("top") || paramShow.equals("all")) {
ad_mid = AdsQueries.getAdMID(sql, visitor.UID);
if (ad_mid > 0 && mids.indexOf(ad_mid) == -1) {
@@ -117,24 +129,17 @@ public class Home {
if (paramShow != null) {
nextpage += "&amp;show=" + paramShow;
}
+ if (paramSearch != null) {
+ nextpage += "&amp;search=" + URLEncoder.encode(paramSearch, "UTF-8");
+ }
+
out.println("<p class=\"page\"><a href=\"" + nextpage + "\">Older โ†’</a></p>");
}
PageTemplates.pageFooter(request, out, locale, visitor, true);
out.println("</div>");
out.println("</div>"); // wrapper
-
- out.println("<div id=\"column\" class=\"abs\">");
- out.println(" <ul>");
- out.println(" <li><a href=\"/\">" + rb.getString("My feed") + "</a></li>");
- out.println(" <li><a href=\"/?show=private\">" + rb.getString("Private") + "</a></li>");
- out.println(" <li><a href=\"/?show=discuss\">" + rb.getString("Discussions") + "</a></li>");
- out.println(" <li><a href=\"/?show=recommended\">" + rb.getString("Recommended") + "</a></li>");
- out.println(" <li class=\"margtop\"><a href=\"/?show=top\">" + rb.getString("Popular") + "</a></li>");
- out.println(" </ul>");
- out.println(" <hr/>");
- out.println(" <ul id=\"pmulist\"></ul>");
- out.println("</div>");
+ PageTemplates.pageHomeColumn(out, sql, locale);
out.println("</div>"); // topwrapper
diff --git a/src/java/com/juick/http/www/Main.java b/src/java/com/juick/http/www/Main.java
index 7564664a..998fb4f3 100644
--- a/src/java/com/juick/http/www/Main.java
+++ b/src/java/com/juick/http/www/Main.java
@@ -188,8 +188,6 @@ public class Main extends HttpServlet implements Stream.StreamListener {
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/")) {
discover.doGet(sql, sqlSearch, request, response);
} else if (uri.matches("^/\\d+$")) {
diff --git a/src/java/com/juick/http/www/PM.java b/src/java/com/juick/http/www/PM.java
index bc43f1ee..b874c065 100644
--- a/src/java/com/juick/http/www/PM.java
+++ b/src/java/com/juick/http/www/PM.java
@@ -103,17 +103,7 @@ public class PM {
out.println("</div>");
out.println("</div>"); // wrapper
- out.println("<div id=\"column\" class=\"abs\">");
- out.println(" <ul>");
- out.println(" <li><a href=\"/\">" + rb.getString("My feed") + "</a></li>");
- out.println(" <li><a href=\"/?show=private\">" + rb.getString("Private") + "</a></li>");
- out.println(" <li><a href=\"/?show=discuss\">" + rb.getString("Discussions") + "</a></li>");
- out.println(" <li><a href=\"/?show=recommended\">" + rb.getString("Recommended") + "</a></li>");
- out.println(" <li class=\"margtop\"><a href=\"/?show=top\">" + rb.getString("Popular") + "</a></li>");
- out.println(" </ul>");
- out.println(" <hr/>");
- out.println(" <ul id=\"pmulist\"></ul>");
- out.println("</div>");
+ PageTemplates.pageHomeColumn(out, sql, locale);
out.println("</div>"); // topwrapper
@@ -196,17 +186,7 @@ public class PM {
out.println("</div>");
out.println("</div>"); // wrapper
- out.println("<div id=\"column\" class=\"abs\">");
- out.println(" <ul>");
- out.println(" <li><a href=\"/\">" + rb.getString("My feed") + "</a></li>");
- out.println(" <li><a href=\"/?show=private\">" + rb.getString("Private") + "</a></li>");
- out.println(" <li><a href=\"/?show=discuss\">" + rb.getString("Discussions") + "</a></li>");
- out.println(" <li><a href=\"/?show=recommended\">" + rb.getString("Recommended") + "</a></li>");
- out.println(" <li class=\"margtop\"><a href=\"/?show=top\">" + rb.getString("Popular") + "</a></li>");
- out.println(" </ul>");
- out.println(" <hr/>");
- out.println(" <ul id=\"pmulist\"></ul>");
- out.println("</div>");
+ PageTemplates.pageHomeColumn(out, sql, locale);
out.println("</div>"); // topwrapper
diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java
index 3718bc9e..f1a1b29d 100644
--- a/src/java/com/juick/http/www/PageTemplates.java
+++ b/src/java/com/juick/http/www/PageTemplates.java
@@ -23,8 +23,12 @@ import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
@@ -45,14 +49,15 @@ public class PageTemplates {
private static SimpleDateFormat sdfSimple = new SimpleDateFormat("d MMM");
private static SimpleDateFormat sdfFull = new SimpleDateFormat("d MMM yyyy");
private static SimpleDateFormat sdfJS = new SimpleDateFormat("yyyy,MM,dd,HH,mm,ss");
+ private static String tagsHTML = null;
public static void pageHead(PrintWriter out, String title, String headers) {
out.println("<!DOCTYPE html>");
out.print("<html>");
out.print("<head>");
- out.print("<link rel=\"stylesheet\" href=\"/style.2013120400.css\"/>");
+ out.print("<link rel=\"stylesheet\" href=\"/style.2014012700.css\"/>");
out.print("<script type=\"text/javascript\" src=\"//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js\" defer=\"defer\"></script>");
- out.print("<script type=\"text/javascript\" src=\"/scripts.2013120801.js\" defer=\"defer\"></script>");
+ out.print("<script type=\"text/javascript\" src=\"/scripts.2014012700.js\" defer=\"defer\"></script>");
if (headers != null) {
out.print(headers);
}
@@ -70,12 +75,11 @@ public class PageTemplates {
out.println("<ul id=\"header\">");
if (user != null) {
out.println(" <li><a href=\"/\"><div class=\"head-ico\" id=\"hi-home\"></div><label>" + rb.getString("Home") + "</label></a></li>");
- out.println(" <li><a href=\"/discover\"><div class=\"head-ico\" id=\"hi-discover\"></div><label>" + rb.getString("Discover") + "</label></a></li>");
} else {
out.println(" <li><a href=\"/\"><div class=\"head-ico\" id=\"hi-logo\"></div></a></li>");
}
- out.print(" <li id=\"search\"><form action=\"/discover\"><input type=\"text\" name=\"search\" class=\"text\" placeholder=\"" + rb.getString("Search") + "\"");
+ out.print(" <li id=\"search\"><form action=\"/\"><input type=\"text\" name=\"search\" class=\"text\" placeholder=\"" + rb.getString("Search") + "\"");
if (search != null) {
out.print(" value=\"" + Utils.encodeHTML(search) + "\"");
}
@@ -166,6 +170,76 @@ public class PageTemplates {
out.println("</script>");
}
+ public static void pageHomeColumn(PrintWriter out, Connection sql, Locale locale) {
+ ResourceBundle rb = ResourceBundle.getBundle("Blogs", locale);
+
+ if (tagsHTML == null) {
+ tagsHTML = PageTemplates.getPopularTags(sql, 60);
+ }
+
+ out.println("<div id=\"column\" class=\"abs\">");
+ out.println(" <ul>");
+ out.println(" <li><a href=\"/\">" + rb.getString("My feed") + "</a></li>");
+ out.println(" <li><a href=\"/pm/inbox\">" + rb.getString("Private") + "</a> ยท <a href=\"/pm/sent\">" + rb.getString("Private sent") + "</a></li>");
+ out.println(" <li><a href=\"/?show=discuss\">" + rb.getString("Discussions") + "</a></li>");
+ out.println(" <li><a href=\"/?show=recommended\">" + rb.getString("Recommended") + "</a></li>");
+ out.println(" <li class=\"margtop\"><a href=\"/?show=top\">" + rb.getString("Popular") + "</a></li>");
+ out.println(" <li><a href=\"/?show=all\">" + rb.getString("All messages") + "</a></li>");
+ out.println(" </ul>");
+ out.println(" <hr/>");
+ out.println(" <p>" + tagsHTML + "</p>");
+ out.println("</div>");
+ }
+
+ public static String getPopularTags(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 = "<a href=\"/tag/" + URLEncoder.encode(tags[i].Name, "UTF-8") + "\">" + tag + "</a>";
+ } catch (UnsupportedEncodingException e) {
+ }
+
+ if (tags[i].UsageCnt > maxUsageCnt / 3 * 2) {
+ ret += "<big>" + tag + "</big> ";
+ } else if (tags[i].UsageCnt > maxUsageCnt / 3) {
+ ret += "<small>" + tag + "</small> ";
+ } else {
+ ret += tag + " ";
+ }
+ }
+
+ return ret;
+ }
+
public static void pageDialogTemplate(PrintWriter out, Locale locale) {
ResourceBundle rb = ResourceBundle.getBundle("Global", locale);
out.println("<div id=\"dialogb\" onclick=\"$('#dialogb').hide();$('#dialogw').hide()\"></div>");
diff --git a/src/java/com/juick/http/www/User.java b/src/java/com/juick/http/www/User.java
index 94244dca..2af66275 100644
--- a/src/java/com/juick/http/www/User.java
+++ b/src/java/com/juick/http/www/User.java
@@ -305,7 +305,7 @@ public class User {
out.println(" <li><a href=\"/post?body=BL+%40" + user.UName + "\" title=\"" + rb.getString("(UToolbar) Block") + "\"><div style=\"background-position: -80px 0\"></div></a></li>");
}
if (!UserQueries.isInBLAny(sql, user.UID, visitor.UID)) {
- out.println(" <li><a href=\"/#chat/" + user.UName + "\" title=\"" + rb.getString("(UToolbar) Private") + "\"><div style=\"background-position: -112px 0\"></div></a></li>");
+ out.println(" <li><a href=\"/pm/sent?uname=" + user.UName + "\" title=\"" + rb.getString("(UToolbar) Private") + "\"><div style=\"background-position: -112px 0\"></div></a></li>");
}
out.println(" </ul>");
} else {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 15:53:20 +0000