diff options
author | Vitaly Takmazov | 2016-11-30 13:37:19 +0300 |
---|---|---|
committer | Vitaly Takmazov | 2016-11-30 13:37:19 +0300 |
commit | f5fd9c7bea380eb4c0c2d58f2167ad3f07c45c33 (patch) | |
tree | 2b82b9cdfdb896de4b449dfea8d36a8b6ecce9c3 /juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java | |
parent | d42a45842b97f6e7313bbfbb352fc12509df4839 (diff) |
juick-xmpp: fix injection
Diffstat (limited to 'juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java')
-rw-r--r-- | juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java index cb3bc46f..d9763709 100644 --- a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java +++ b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java @@ -2,9 +2,6 @@ package com.juick.components.s2s; import com.juick.User; import com.juick.components.XMPPServer; -import com.juick.service.MessagesService; -import com.juick.service.SubscriptionService; -import com.juick.service.UserService; import com.juick.xmpp.JID; import com.juick.xmpp.Message; import com.juick.xmpp.extensions.JuickMessage; @@ -19,7 +16,6 @@ import org.slf4j.LoggerFactory; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; -import javax.inject.Inject; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; @@ -41,13 +37,6 @@ public class ConnectionRouter extends Connection implements Runnable { private int componentPort; private String password; - @Inject - SubscriptionService subscriptionService; - @Inject - UserService userService; - @Inject - MessagesService messagesService; - public ConnectionRouter(XMPPServer s2s, String componentName, int componentPort, String password) throws Exception { super(s2s); this.componentName = componentName; @@ -152,11 +141,11 @@ public class ConnectionRouter extends Connection implements Runnable { List<String> jids = new ArrayList<>(); if (jmsg.FriendsOnly) { - jids = subscriptionService.getJIDSubscribedToUser(jmsg.getUser().getUid(), jmsg.FriendsOnly); + jids = xmpp.subscriptionService.getJIDSubscribedToUser(jmsg.getUser().getUid(), jmsg.FriendsOnly); } else { - List<User> users = subscriptionService.getSubscribedUsers(jmsg.getUser().getUid(), jmsg.getMid()); + List<User> users = xmpp.subscriptionService.getSubscribedUsers(jmsg.getUser().getUid(), jmsg.getMid()); for (User user : users) { - for (String jid : userService.getJIDsbyUID(user.getUid())) { + for (String jid : xmpp.userService.getJIDsbyUID(user.getUid())) { jids.add(jid); } } @@ -197,11 +186,11 @@ public class ConnectionRouter extends Connection implements Runnable { String replyQuote; String replyTo; - users = subscriptionService.getUsersSubscribedToComments(jmsg.getMid(), jmsg.getUser().getUid()); - com.juick.Message replyMessage = jmsg.getReplyto() > 0 ? messagesService.getReply(jmsg.getMid(), jmsg.getReplyto()) - : messagesService.getMessage(jmsg.getMid()); + users = xmpp.subscriptionService.getUsersSubscribedToComments(jmsg.getMid(), jmsg.getUser().getUid()); + com.juick.Message replyMessage = jmsg.getReplyto() > 0 ? xmpp.messagesService.getReply(jmsg.getMid(), jmsg.getReplyto()) + : xmpp.messagesService.getMessage(jmsg.getMid()); replyTo = replyMessage.getUser().getName(); - com.juick.Message fullReply = messagesService.getReply(jmsg.getMid(), jmsg.getRid()); + com.juick.Message fullReply = xmpp.messagesService.getReply(jmsg.getMid(), jmsg.getRid()); replyQuote = fullReply.getReplyQuote(); String txt = "Reply by @" + jmsg.getUser().getName() + ":\n" + replyQuote + "\n@" + replyTo + " "; @@ -217,7 +206,7 @@ public class ConnectionRouter extends Connection implements Runnable { msg.type = Message.Type.chat; msg.addChild(jmsg); for (User user : users) { - for (String jid : userService.getJIDsbyUID(user.getUid())) { + for (String jid : xmpp.userService.getJIDsbyUID(user.getUid())) { msg.to = new JID(jid); xmpp.sendOut(msg); } @@ -227,8 +216,8 @@ public class ConnectionRouter extends Connection implements Runnable { public void sendJuickRecommendation(JuickMessage recomm) { List<User> users; JuickMessage jmsg; - jmsg = new JuickMessage(messagesService.getMessage(recomm.getMid())); - users = subscriptionService.getUsersSubscribedToUserRecommendations(recomm.getUser().getUid(), + jmsg = new JuickMessage(xmpp.messagesService.getMessage(recomm.getMid())); + users = xmpp.subscriptionService.getUsersSubscribedToUserRecommendations(recomm.getUser().getUid(), recomm.getMid(), jmsg.getUser().getUid()); String txt = "Recommended by @" + recomm.getUser().getName() + ":\n"; @@ -265,7 +254,7 @@ public class ConnectionRouter extends Connection implements Runnable { } for (User user : users) { - for (String jid : userService.getJIDsbyUID(user.getUid())) { + for (String jid : xmpp.userService.getJIDsbyUID(user.getUid())) { msg.to = new JID(jid); xmpp.sendOut(msg); } |