diff options
Diffstat (limited to 'src/main/java/com/juick/http/www/Main.java')
| -rw-r--r-- | src/main/java/com/juick/http/www/Main.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/juick/http/www/Main.java b/src/main/java/com/juick/http/www/Main.java index ced7fb98..9a22c172 100644 --- a/src/main/java/com/juick/http/www/Main.java +++ b/src/main/java/com/juick/http/www/Main.java @@ -59,6 +59,7 @@ public class Main extends HttpServlet implements Stream.StreamListener { NewMessage pagesNewMessage = new NewMessage(); FacebookLogin loginFacebook = new FacebookLogin(); VKontakteLogin loginVK = new VKontakteLogin(); + TwitterAuth twitterAuth; SignUp signup = new SignUp(); Settings settings = new Settings(); RSS rss = new RSS(); @@ -76,7 +77,8 @@ public class Main extends HttpServlet implements Stream.StreamListener { sqlSearch = null; // init this on search, timeout is too low setupXmppComponent(conf.getProperty("xmpp_password")); - + twitterAuth = new TwitterAuth(conf.getProperty("twitter_consumer_key"), + conf.getProperty("twitter_consumer_secret")); PageTemplates.sape = new Sape(conf.getProperty("sape_user"), "juick.com", 2000, 3600); } catch (Exception e) { log(null, e); @@ -217,6 +219,8 @@ public class Main extends HttpServlet implements Stream.StreamListener { loginFacebook.doGet(sql, request, response); } else if (uri.equals("/_vklogin")) { loginVK.doGet(sql, request, response); + } else if (uri.equals("/_twitter")) { + twitterAuth.doGet(sql, request, response); } else if (uri.equals("/signup")) { signup.doGet(sql, request, response); } else if (uri.equals("/help") || uri.equals("/help/")) { |