juick-xmpp: fix injection

1 files changed, 21 insertions, 32 deletions

diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java b/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java
index 1b989249..2ed3eaf5 100644
--- a/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java
+++ b/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java
@@ -2,17 +2,12 @@ package com.juick.components.s2s;
 
 import com.juick.User;
 import com.juick.components.XMPPServer;
-import com.juick.server.TagQueries;
-import com.juick.service.PMQueriesService;
-import com.juick.service.TagService;
-import com.juick.service.UserService;
 import com.juick.xmpp.JID;
 import com.juick.xmpp.Message;
 import com.juick.xmpp.Presence;
 import com.juick.xmpp.extensions.Error;
 import com.juick.xmpp.extensions.JuickMessage;
 
-import javax.inject.Inject;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -23,12 +18,6 @@ import java.util.regex.Pattern;
  */
 public class JuickBot {
     XMPPServer xmpp;
-    @Inject
-    UserService userService;
-    @Inject
-    PMQueriesService pmQueriesService;
-    @Inject
-    TagService tagService;
 
     public JuickBot(XMPPServer xmpp, JID jid) {
         this.xmpp = xmpp;
@@ -84,7 +73,7 @@ public class JuickBot {
         } else if (p.type.equals(Presence.Type.probe)) {
             int uid_to = 0;
             if (!toJuick) {
-                uid_to = userService.getUIDbyName(username);
+                uid_to = xmpp.userService.getUIDbyName(username);
             }
 
             if (toJuick || uid_to > 0) {
@@ -107,9 +96,9 @@ public class JuickBot {
             if (toJuick) {
                 canSubscribe = true;
             } else {
-                int uid_to = userService.getUIDbyName(username);
+                int uid_to = xmpp.userService.getUIDbyName(username);
                 if (uid_to > 0) {
-                    pmQueriesService.addPMinRoster(uid_to, p.from.Bare());
+                    xmpp.pmQueriesService.addPMinRoster(uid_to, p.from.Bare());
                     canSubscribe = true;
                 }
             }
@@ -133,9 +122,9 @@ public class JuickBot {
             }
         } else if (p.type.equals(Presence.Type.unsubscribe)) {
             if (!toJuick) {
-                int uid_to = userService.getUIDbyName(username);
+                int uid_to = xmpp.userService.getUIDbyName(username);
                 if (uid_to > 0) {
-                    pmQueriesService.removePMinRoster(uid_to, p.from.Bare());
+                    xmpp.pmQueriesService.removePMinRoster(uid_to, p.from.Bare());
                 }
             }
 
@@ -155,9 +144,9 @@ public class JuickBot {
 
         User user_from = null;
         String signuphash = "";
-        user_from = userService.getUserByJID(msg.from.Bare());
+        user_from = xmpp.userService.getUserByJID(msg.from.Bare());
         if (user_from == null) {
-            signuphash = userService.getSignUpHashByJID(msg.from.Bare());
+            signuphash = xmpp.userService.getSignUpHashByJID(msg.from.Bare());
         }
 
         if (user_from == null) {
@@ -175,7 +164,7 @@ public class JuickBot {
             return incomingMessageJuick(user_from, msg);
         }
 
-        int uid_to = userService.getUIDbyName(username);
+        int uid_to = xmpp.userService.getUIDbyName(username);
 
         if (uid_to == 0) {
             Message reply = new Message(msg.to, msg.from, Message.Type.error);
@@ -186,8 +175,8 @@ public class JuickBot {
         }
 
         boolean success = false;
-        if (!userService.isInBLAny(uid_to, user_from.getUid())) {
-            success = pmQueriesService.createPM(user_from.getUid(), uid_to, msg.body);
+        if (!xmpp.userService.isInBLAny(uid_to, user_from.getUid())) {
+            success = xmpp.pmQueriesService.createPM(user_from.getUid(), uid_to, msg.body);
         }
 
         if (success) {
@@ -205,12 +194,12 @@ public class JuickBot {
 
             List<String> jids;
             boolean inroster = false;
-            jids = userService.getJIDsbyUID(uid_to);
+            jids = xmpp.userService.getJIDsbyUID(uid_to);
             for (String jid : jids) {
                 Message mm = new Message();
                 mm.to = new JID(jid);
                 mm.type = Message.Type.chat;
-                inroster = pmQueriesService.havePMinRoster(user_from.getUid(), jid);
+                inroster = xmpp.pmQueriesService.havePMinRoster(user_from.getUid(), jid);
                 if (inroster) {
                     mm.from = new JID(jmsg.getUser().getName(), "juick.com", "Juick");
                     mm.body = msg.body;
@@ -286,7 +275,7 @@ public class JuickBot {
 
     private void commandLogin(Message m, User user_from) throws Exception {
         Message reply = new Message(jid, m.from, Message.Type.chat);
-        reply.body = "http://juick.com/login?" + userService.getHashByUID(user_from.getUid());
+        reply.body = "http://juick.com/login?" + xmpp.userService.getHashByUID(user_from.getUid());
         xmpp.sendOut(reply);
     }
 
@@ -298,15 +287,15 @@ public class JuickBot {
         boolean haveInRoster = false;
 
         if (user_to.indexOf('@') > 0) {
-            uid_to = userService.getUIDbyJID(user_to);
+            uid_to = xmpp.userService.getUIDbyJID(user_to);
         } else {
-            uid_to = userService.getUIDbyName(user_to);
+            uid_to = xmpp.userService.getUIDbyName(user_to);
         }
 
         if (uid_to > 0) {
-            if (!userService.isInBLAny(uid_to, user_from.getUid())) {
-                if (pmQueriesService.createPM(user_from.getUid(), uid_to, body)) {
-                    jids_to = userService.getJIDsbyUID(uid_to);
+            if (!xmpp.userService.isInBLAny(uid_to, user_from.getUid())) {
+                if (xmpp.pmQueriesService.createPM(user_from.getUid(), uid_to, body)) {
+                    jids_to = xmpp.userService.getJIDsbyUID(uid_to);
                     ret = 200;
                 } else {
                     ret = 500;
@@ -335,7 +324,7 @@ public class JuickBot {
                 Message mm = new Message();
                 mm.to = new JID(jid);
                 mm.type = Message.Type.chat;
-                haveInRoster = pmQueriesService.havePMinRoster(user_from.getUid(), jid);
+                haveInRoster = xmpp.pmQueriesService.havePMinRoster(user_from.getUid(), jid);
                 if (haveInRoster) {
                     mm.from = new JID(user_from.getName(), "juick.com", "Juick");
                     mm.body = body;
@@ -359,8 +348,8 @@ public class JuickBot {
     }
 
     private void commandBLShow(Message m, User user_from) throws Exception {
-        List<User> blusers = userService.getUserBLUsers(user_from.getUid());
-        List<String> bltags = tagService.getUserBLTags(user_from.getUid());
+        List<User> blusers = xmpp.userService.getUserBLUsers(user_from.getUid());
+        List<String> bltags = xmpp.tagService.getUserBLTags(user_from.getUid());
 
         String txt = "";
         if (bltags.size() > 0) {