xmpp: revert to Connection-based router because Stream-based router can not route full stanzas

1 files changed, 16 insertions, 12 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 737fbdc2..7458d892 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
@@ -21,12 +21,12 @@ import java.util.regex.Pattern;
  */
 public class JuickBot {
     XMPPServer xmpp;
-    public JuickBot(XMPPServer xmpp, JID JuickJID) {
+    public JuickBot(XMPPServer xmpp, JID jid) {
         this.xmpp = xmpp;
-        this.JuickJID = JuickJID;
+        this.jid = jid;
     }
 
-    public final JID JuickJID;
+    private final JID jid;
     private static final String HELPTEXT =
             "@username text - Send private message\n"
             + "*tagname Blah-blah-blah - Post a message with tag 'tagname'\n"
@@ -189,10 +189,10 @@ public class JuickBot {
             jmsg.setUser(user_from);
             jmsg.setText(msg.body);
             m.childs.add(jmsg);
-            xmpp.getRouter().send(m.toString());
+            xmpp.getRouter().sendStanza(m.toString());
 
             m.to.Host = "ws.juick.com";
-            xmpp.getRouter().send(m.toString());
+            xmpp.getRouter().sendStanza(m.toString());
 
             List<String> jids;
             boolean inroster = false;
@@ -260,23 +260,23 @@ public class JuickBot {
     }
 
     private void commandPing(Message m) throws Exception {
-        Presence p = new Presence(JuickJID, m.from);
+        Presence p = new Presence(jid, m.from);
         p.priority = 10;
         xmpp.sendOut(p);
 
-        Message reply = new Message(JuickJID, m.from, Message.Type.chat);
+        Message reply = new Message(jid, m.from, Message.Type.chat);
         reply.body = "PONG";
         xmpp.sendOut(reply);
     }
 
     private void commandHelp(Message m) throws Exception {
-        Message reply = new Message(JuickJID, m.from, Message.Type.chat);
+        Message reply = new Message(jid, m.from, Message.Type.chat);
         reply.body = HELPTEXT;
         xmpp.sendOut(reply);
     }
 
     private void commandLogin(Message m, User user_from) throws Exception {
-        Message reply = new Message(JuickJID, m.from, Message.Type.chat);
+        Message reply = new Message(jid, m.from, Message.Type.chat);
         reply.body = "http://juick.com/login?" + UserQueries.getHashByUID(xmpp.jdbc, user_from.getUID());
         xmpp.sendOut(reply);
     }
@@ -317,10 +317,10 @@ public class JuickBot {
             jmsg.setUser(user_from);
             jmsg.setText(body);
             msg.childs.add(jmsg);
-            xmpp.getRouter().send(msg.toString());
+            xmpp.getRouter().sendStanza(msg.toString());
 
             msg.to.Host = "ws.juick.com";
-            xmpp.getRouter().send(msg.toString());
+            xmpp.getRouter().sendStanza(msg.toString());
 
             for (String jid : jids_to) {
                 Message mm = new Message();
@@ -372,8 +372,12 @@ public class JuickBot {
             txt = "You don't have any users or tags in your blacklist.";
         }
 
-        Message reply = new Message(JuickJID, m.from, Message.Type.chat);
+        Message reply = new Message(jid, m.from, Message.Type.chat);
         reply.body = txt;
         xmpp.sendOut(reply);
     }
+
+    public JID getJid() {
+        return jid;
+    }
 }