PM Sent page

2 files changed, 97 insertions, 5 deletions

diff --git a/src/java/com/juick/http/www/Main.java b/src/java/com/juick/http/www/Main.java
index 26655897..18c7b8aa 100644
--- a/src/java/com/juick/http/www/Main.java
+++ b/src/java/com/juick/http/www/Main.java
@@ -131,12 +131,18 @@ public class Main extends HttpServlet {
             } else {
                 login.doGetLogin(sql, request, response);
             }
-        } else if (uri.equals("/pm")) {
+        } else if (uri.startsWith("/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);
+                if (uri.equals("/pm/inbox")) {
+                    pm.doGetInbox(sql, request, response, visitor);
+                } else if (uri.equals("/pm/sent")) {
+                    pm.doGetSent(sql, request, response, visitor);
+                } else {
+                    response.sendError(404);
+                }
             }
         } else if (uri.equals("/logout")) {
             login.doGetLogout(sql, request, response);
@@ -235,6 +241,7 @@ public class Main extends HttpServlet {
         String uri = request.getRequestURI();
         if (uri.equals("/post")) {
             pagesNewMessage.doPostNewMessage(sql, request, response);
+        } else if (uri.equals("/pm/send")) {
         } else if (uri.equals("/login")) {
             login.doPostLogin(sql, request, response);
         } else if (uri.equals("/signup")) {
diff --git a/src/java/com/juick/http/www/PM.java b/src/java/com/juick/http/www/PM.java
index ae4e81cd..e709af6b 100644
--- a/src/java/com/juick/http/www/PM.java
+++ b/src/java/com/juick/http/www/PM.java
@@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 public class PM {
 
-    protected void doGet(Connection sql, HttpServletRequest request, HttpServletResponse response, com.juick.User visitor) throws ServletException, IOException {
+    protected void doGetInbox(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);
@@ -50,8 +50,8 @@ public class PM {
         }
          */
 
-        String title = "PM";
-        ArrayList<com.juick.Message> msgs = PMQueries.getLastPMMessages(sql, visitor.UID);
+        String title = "PM: Inbox";
+        ArrayList<com.juick.Message> msgs = PMQueries.getLastPMInbox(sql, visitor.UID);
 
         response.setContentType("text/html; charset=UTF-8");
         PrintWriter out = response.getWriter();
@@ -118,4 +118,89 @@ public class PM {
             out.close();
         }
     }
+
+    protected void doGetSent(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: Sent";
+        ArrayList<com.juick.Message> msgs = PMQueries.getLastPMSent(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\"><img src=\"//i.juick.com/a/" + visitor.UID + ".png\"/></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();
+        }
+    }
 }