diff options
Diffstat (limited to 'juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java')
| -rw-r--r-- | juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java | 55 |
1 files changed, 32 insertions, 23 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 ac7d122f..1b989249 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,15 +2,17 @@ package com.juick.components.s2s; import com.juick.User; import com.juick.components.XMPPServer; -import com.juick.server.PMQueries; import com.juick.server.TagQueries; -import com.juick.server.UserQueries; +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; @@ -21,6 +23,13 @@ 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; this.jid = jid; @@ -75,7 +84,7 @@ public class JuickBot { } else if (p.type.equals(Presence.Type.probe)) { int uid_to = 0; if (!toJuick) { - uid_to = UserQueries.getUIDbyName(xmpp.jdbc, username); + uid_to = userService.getUIDbyName(username); } if (toJuick || uid_to > 0) { @@ -98,9 +107,9 @@ public class JuickBot { if (toJuick) { canSubscribe = true; } else { - int uid_to = UserQueries.getUIDbyName(xmpp.jdbc, username); + int uid_to = userService.getUIDbyName(username); if (uid_to > 0) { - PMQueries.addPMinRoster(xmpp.jdbc, uid_to, p.from.Bare()); + pmQueriesService.addPMinRoster(uid_to, p.from.Bare()); canSubscribe = true; } } @@ -124,9 +133,9 @@ public class JuickBot { } } else if (p.type.equals(Presence.Type.unsubscribe)) { if (!toJuick) { - int uid_to = UserQueries.getUIDbyName(xmpp.jdbc, username); + int uid_to = userService.getUIDbyName(username); if (uid_to > 0) { - PMQueries.removePMinRoster(xmpp.jdbc, uid_to, p.from.Bare()); + pmQueriesService.removePMinRoster(uid_to, p.from.Bare()); } } @@ -146,9 +155,9 @@ public class JuickBot { User user_from = null; String signuphash = ""; - user_from = UserQueries.getUserByJID(xmpp.jdbc, msg.from.Bare()); + user_from = userService.getUserByJID(msg.from.Bare()); if (user_from == null) { - signuphash = UserQueries.getSignUpHashByJID(xmpp.jdbc, msg.from.Bare()); + signuphash = userService.getSignUpHashByJID(msg.from.Bare()); } if (user_from == null) { @@ -166,7 +175,7 @@ public class JuickBot { return incomingMessageJuick(user_from, msg); } - int uid_to = UserQueries.getUIDbyName(xmpp.jdbc, username); + int uid_to = userService.getUIDbyName(username); if (uid_to == 0) { Message reply = new Message(msg.to, msg.from, Message.Type.error); @@ -177,8 +186,8 @@ public class JuickBot { } boolean success = false; - if (!UserQueries.isInBLAny(xmpp.jdbc, uid_to, user_from.getUid())) { - success = PMQueries.createPM(xmpp.jdbc, user_from.getUid(), uid_to, msg.body); + if (!userService.isInBLAny(uid_to, user_from.getUid())) { + success = pmQueriesService.createPM(user_from.getUid(), uid_to, msg.body); } if (success) { @@ -196,12 +205,12 @@ public class JuickBot { List<String> jids; boolean inroster = false; - jids = UserQueries.getJIDsbyUID(xmpp.jdbc, uid_to); + jids = userService.getJIDsbyUID(uid_to); for (String jid : jids) { Message mm = new Message(); mm.to = new JID(jid); mm.type = Message.Type.chat; - inroster = PMQueries.havePMinRoster(xmpp.jdbc, user_from.getUid(), jid); + inroster = pmQueriesService.havePMinRoster(user_from.getUid(), jid); if (inroster) { mm.from = new JID(jmsg.getUser().getName(), "juick.com", "Juick"); mm.body = msg.body; @@ -277,7 +286,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?" + UserQueries.getHashByUID(xmpp.jdbc, user_from.getUid()); + reply.body = "http://juick.com/login?" + userService.getHashByUID(user_from.getUid()); xmpp.sendOut(reply); } @@ -289,15 +298,15 @@ public class JuickBot { boolean haveInRoster = false; if (user_to.indexOf('@') > 0) { - uid_to = UserQueries.getUIDbyJID(xmpp.jdbc, user_to); + uid_to = userService.getUIDbyJID(user_to); } else { - uid_to = UserQueries.getUIDbyName(xmpp.jdbc, user_to); + uid_to = userService.getUIDbyName(user_to); } if (uid_to > 0) { - if (!UserQueries.isInBLAny(xmpp.jdbc, uid_to, user_from.getUid())) { - if (PMQueries.createPM(xmpp.jdbc, user_from.getUid(), uid_to, body)) { - jids_to = UserQueries.getJIDsbyUID(xmpp.jdbc, uid_to); + if (!userService.isInBLAny(uid_to, user_from.getUid())) { + if (pmQueriesService.createPM(user_from.getUid(), uid_to, body)) { + jids_to = userService.getJIDsbyUID(uid_to); ret = 200; } else { ret = 500; @@ -326,7 +335,7 @@ public class JuickBot { Message mm = new Message(); mm.to = new JID(jid); mm.type = Message.Type.chat; - haveInRoster = PMQueries.havePMinRoster(xmpp.jdbc, user_from.getUid(), jid); + haveInRoster = pmQueriesService.havePMinRoster(user_from.getUid(), jid); if (haveInRoster) { mm.from = new JID(user_from.getName(), "juick.com", "Juick"); mm.body = body; @@ -350,8 +359,8 @@ public class JuickBot { } private void commandBLShow(Message m, User user_from) throws Exception { - List<User> blusers = UserQueries.getUserBLUsers(xmpp.jdbc, user_from.getUid()); - List<String> bltags = TagQueries.getUserBLTags(xmpp.jdbc, user_from.getUid()); + List<User> blusers = userService.getUserBLUsers(user_from.getUid()); + List<String> bltags = tagService.getUserBLTags(user_from.getUid()); String txt = ""; if (bltags.size() > 0) { |