From cdbf949013fe140fed0e5ad79ad6111c97ea07ad Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Tue, 29 Jan 2013 23:45:00 +0700
Subject: Sape optimization

---
 src/java/com/juick/http/www/Main.java | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

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

diff --git a/src/java/com/juick/http/www/Main.java b/src/java/com/juick/http/www/Main.java
index 226ac729..a41ccf9b 100644
--- a/src/java/com/juick/http/www/Main.java
+++ b/src/java/com/juick/http/www/Main.java
@@ -42,7 +42,6 @@ public class Main extends HttpServlet implements XmppListener {
     Connection sqlSearch;
     XmppConnection xmpp;
     Blogs blogs;
-    RootRedirects rootRedirects = new RootRedirects();
     Login login = new Login();
     Help help = new Help();
     User pagesUser = new User();
@@ -122,6 +121,7 @@ public class Main extends HttpServlet implements XmppListener {
             request.setCharacterEncoding("UTF-8");
         }
         String uri = request.getRequestURI();
+
         if (uri.equals("/")) {
             blogs.doGet(sql, sqlSearch, request, response);
         } else if (uri.equals("/post")) {
@@ -150,9 +150,27 @@ public class Main extends HttpServlet implements XmppListener {
         } else if (uri.startsWith("/places/")) {
             blogs.doGet(sql, sqlSearch, request, response);
         } else if (uri.matches("^/\\d+$")) {
-            rootRedirects.doGetPostID(sql, request, response);
+            String strID = request.getRequestURI().substring(1);
+            int mid = 0;
+            try {
+                mid = Integer.parseInt(strID);
+            } catch (NumberFormatException e) {
+            }
+            if (mid > 0) {
+                com.juick.User author = com.juick.server.MessagesQueries.getMessageAuthor(sql, mid);
+                if (author != null) {
+                    Utils.sendPermanentRedirect(response, "/" + author.UName + "/" + mid);
+                    return;
+                }
+            }
+            response.sendError(404);
         } else if (uri.matches("^/[^/]+$")) {
-            rootRedirects.doGetUsername(sql, request, response);
+            com.juick.User user = com.juick.server.UserQueries.getUserByNick(sql, request.getRequestURI().substring(1));
+            if (user != null) {
+                Utils.sendPermanentRedirect(response, "/" + user.UName + "/");
+            } else {
+                response.sendError(404);
+            }
         } else if (uri.matches("^/.+/.*")) {
             String uriparts[] = uri.split("/");
             com.juick.User user = com.juick.server.UserQueries.getUserByNick(sql, uriparts[1]);
-- 
cgit v1.2.3