aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ugnich Anton2014-01-26 03:24:23 +0700
committerGravatar Ugnich Anton2014-01-26 03:24:23 +0700
commite218e34535b0bfdb6a7ac3a4d010ec03fcd946a1 (patch)
treefd9109cf3154ac0f3fd14a2b51d0f553021a96f9
parentf4a45264cb8f0cfeacdb89ce9bf4c60474923f80 (diff)
PM
-rw-r--r--src/java/Global.properties1
-rw-r--r--src/java/Global_ru.properties1
-rw-r--r--src/java/com/juick/http/www/Main.java8
-rw-r--r--src/java/com/juick/http/www/PM.java121
4 files changed, 131 insertions, 0 deletions
diff --git a/src/java/Global.properties b/src/java/Global.properties
index 4514ba6e..51bb6928 100644
--- a/src/java/Global.properties
+++ b/src/java/Global.properties
@@ -22,6 +22,7 @@ Newer=Newer
Recommended\ by=Recommended by
Comment=Comment
Add\ a\ comment=Add a comment...
+Reply=Reply
Sponsored\ by=Sponsored by
Block\ user=Block user
Send\ private\ message=Send private message
diff --git a/src/java/Global_ru.properties b/src/java/Global_ru.properties
index 4b2e1e04..e22ac59e 100644
--- a/src/java/Global_ru.properties
+++ b/src/java/Global_ru.properties
@@ -22,6 +22,7 @@ Newer=\u041d\u043e\u0432\u044b\u0435
Recommended\ by=\u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u043e\u0432\u0430\u043b\u0438
Comment=\u041e\u0442\u0432\u0435\u0442\u0438\u0442\u044c
Add\ a\ comment=\u041d\u0430\u043f\u0438\u0441\u0430\u0442\u044c \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0439...
+Reply=\u041e\u0442\u0432\u0435\u0442\u0438\u0442\u044c
Sponsored\ by=\u041f\u0440\u0438 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0435
Block\ user=\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
Send\ private\ message=\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0438\u0432\u0430\u0442\u043d\u043e\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435
diff --git a/src/java/com/juick/http/www/Main.java b/src/java/com/juick/http/www/Main.java
index c7295ce6..26655897 100644
--- a/src/java/com/juick/http/www/Main.java
+++ b/src/java/com/juick/http/www/Main.java
@@ -43,6 +43,7 @@ public class Main extends HttpServlet {
Stream xmpp;
Home home = new Home();
Discover discover = new Discover();
+ PM pm = new PM();
Login login = new Login();
Help help = new Help();
User pagesUser = new User();
@@ -130,6 +131,13 @@ public class Main extends HttpServlet {
} else {
login.doGetLogin(sql, request, response);
}
+ } else if (uri.equals("/pm")) {
+ com.juick.User visitor = Utils.getVisitorUser(sql, request, response);
+ if (visitor == null) {
+ login.doGetLoginForm(sql, request, response);
+ } else {
+ pm.doGet(sql, request, response, visitor);
+ }
} else if (uri.equals("/logout")) {
login.doGetLogout(sql, request, response);
} else if (uri.equals("/settings")) {
diff --git a/src/java/com/juick/http/www/PM.java b/src/java/com/juick/http/www/PM.java
new file mode 100644
index 00000000..ae4e81cd
--- /dev/null
+++ b/src/java/com/juick/http/www/PM.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 <http://www.gnu.org/licenses/>.
+ */
+package com.juick.http.www;
+
+import com.juick.server.PMQueries;
+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 PM {
+
+ protected void doGet(Connection sql, HttpServletRequest request, HttpServletResponse response, com.juick.User visitor) throws ServletException, IOException {
+ Locale locale = request.getLocale();
+ ResourceBundle rbg = ResourceBundle.getBundle("Global", locale);
+ 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 = "PM";
+ ArrayList<com.juick.Message> msgs = PMQueries.getLastPMMessages(sql, visitor.UID);
+
+ 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("<div id=\"topwrapper\">");
+ out.println("<div id=\"wrapper\">");
+ out.println("<div id=\"content\">");
+
+ if (!msgs.isEmpty()) {
+ out.println("<ul>");
+ for (int i = msgs.size() - 1; i >= 0; i--) {
+ com.juick.Message msg = msgs.get(i);
+
+ String txt = PageTemplates.formatMessage(msg.Text);
+
+ out.println(" <li class=\"msg\">");
+ out.println(" <div class=\"msg-avatar\"><a href=\"/" + msg.User.UName + "/\"><img src=\"//i.juick.com/a/" + msg.User.UID + ".png\" alt=\"" + msg.User.UName + "\"/></a></div>");
+ out.println(" <div class=\"msg-cont\">");
+ out.println(" <div class=\"msg-header\"><a href=\"/" + msg.User.UName + "/\">@" + msg.User.UName + "</a>:</div>");
+ out.println(" <div class=\"msg-ts\"><a href=\"#\" onclick=\"return false\" title=\"" + msg.TimestampString + " GMT\">" + PageTemplates.formatDate(msg.TimeAgo, msg.TimestampString, locale) + "</a></div>");
+ out.println(" <div class=\"msg-txt\">" + txt + "</div>");
+ /*
+ out.println(" <form action=\"/post\" method=\"POST\" enctype=\"multipart/form-data\"><input type=\"hidden\" name=\"pm\" value=\"" + msg.User.UName + "\"/>");
+ out.println(" <div class=\"msg-comment\"><div class=\"ta-wrapper\"><textarea name=\"body\" rows=\"1\" class=\"reply\" placeholder=\"" + rbg.getString("Reply") + "\" onkeypress=\"postformListener(this.form,event)\"></textarea></div></div>");
+ out.println(" </form>");
+ */
+ out.println(" </div>");
+ out.println(" </li>");
+ }
+ out.println("</ul>");
+ }
+
+ /*
+ if (msgs.size() >= 20) {
+ String nextpage = "?before=" + msgs.get(msgs.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
+
+ 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>");
+
+ out.println("</div>"); // topwrapper
+
+ PageTemplates.pageDialogTemplate(out, locale);
+ PageTemplates.pageEnd(out);
+ } finally {
+ out.close();
+ }
+ }
+}