A lot of changes.

1 files changed, 4 insertions, 9 deletions

diff --git a/src/java/com/juick/http/www/Main.java b/src/java/com/juick/http/www/Main.java
index 256e70f9..055327dd 100644
--- a/src/java/com/juick/http/www/Main.java
+++ b/src/java/com/juick/http/www/Main.java
@@ -42,10 +42,8 @@ public class Main extends HttpServlet implements XmppListener {
     Connection sqlSearch;
     XmppConnection xmpp;
     Blogs blogs = new Blogs();
-    Chats chats = new Chats();
-    Photos photos = new Photos();
+    Tags tags = new Tags();
     RootRedirects rootRedirects = new RootRedirects();
-    Map map = new Map();
     Login login = new Login();
     User pagesUser = new User();
     UserThread pagesUserThread = new UserThread();
@@ -124,12 +122,9 @@ public class Main extends HttpServlet implements XmppListener {
         String uri = request.getRequestURI();
         if (uri.equals("/")) {
             blogs.doGet(sql, sqlSearch, request, response);
-        } else if (uri.equals("/chats")) {
-            chats.doGet(sql, request, response);
-        } else if (uri.equals("/photos")) {
-            photos.doGet(sql, request, response);
-        } else if (uri.equals("/map")) {
-            map.doGet(sql, request, response);
+        } else if (uri.equals("/tags")) {
+            com.juick.User visitor = Utils.getVisitorUser(sql, request);
+            tags.doGetTags(sql, request, response, visitor);
         } else if (uri.equals("/post")) {
             com.juick.User visitor = Utils.getVisitorUser(sql, request);
             if (visitor != null) {