diff options
author | Vitaly Takmazov | 2017-01-31 06:57:45 +0300 |
---|---|---|
committer | Vitaly Takmazov | 2017-01-31 06:57:45 +0300 |
commit | 6e93a73628ee87cf4bba12098c7a27a5fd03bc64 (patch) | |
tree | 6edf1d1a0b911ff3a50463e18d13ffc4d1cf0503 /juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java | |
parent | 09ebad6b9dcb02fd35f15b02c4aa7da279d8f454 (diff) |
update dependencies
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 | 21 |
1 files changed, 11 insertions, 10 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 37d3c59f..f0fc3c60 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,7 +2,6 @@ package com.juick.components.s2s; import com.juick.User; import com.juick.components.XMPPServer; -import com.juick.xmpp.JID; import com.juick.xmpp.Message; import com.juick.xmpp.extensions.JuickMessage; import com.juick.xmpp.extensions.Nickname; @@ -15,6 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; +import rocks.xmpp.addr.Jid; import java.io.IOException; import java.io.InputStreamReader; @@ -92,15 +92,15 @@ public class ConnectionRouter extends Connection implements Runnable, AutoClosea String tag = parser.getName(); String to = parser.getAttributeValue(null, "to"); if (to != null && (tag.equals("message") || tag.equals("presence") || tag.equals("iq"))) { - JID jid = new JID(to); - if (jid.Host != null) { - if (jid.Host.equals(componentName)) { + Jid jid = Jid.of(to); + if (jid.getDomain() != null) { + if (jid.getDomain().equals(componentName)) { if (tag.equals("message")) { Message xmsg = Message.parse(parser, xmpp.childParsers); logger.info("stream router (process): {}", xmsg); JuickMessage jmsg = (JuickMessage) xmsg.getChild(JuickMessage.XMLNS); if (jmsg != null) { - if (jid.Username != null && jid.Username.equals("recomm")) { + if (jid.getLocal() != null && jid.getLocal().equals("recomm")) { sendJuickRecommendation(jmsg); } else { if (jmsg.getRid() > 0) { @@ -114,13 +114,14 @@ public class ConnectionRouter extends Connection implements Runnable, AutoClosea String xml = XmlUtils.parseToString(parser, true); logger.info("stream router (stanza): {}", xml); } - } else if (jid.Host.endsWith(xmpp.HOSTNAME) && (jid.Host.equals(xmpp.HOSTNAME) || jid.Host.endsWith("." + xmpp.HOSTNAME))) { + } else if (jid.getDomain().endsWith(xmpp.HOSTNAME) && (jid.getDomain().equals(xmpp.HOSTNAME) + || jid.getDomain().endsWith("." + xmpp.HOSTNAME))) { String xml = XmlUtils.parseToString(parser, true); logger.info("stream router: {}", xml); } else { String xml = XmlUtils.parseToString(parser, true); logger.info("stream router (out): {}", xml); - xmpp.sendOut(jid.Host, xml); + xmpp.sendOut(jid.getDomain(), xml); } } else { String invalidStanza = XmlUtils.parseToString(parser, true); @@ -183,7 +184,7 @@ public class ConnectionRouter extends Connection implements Runnable, AutoClosea } for (String jid : jids) { - msg.to = new JID(jid); + msg.to = Jid.of(jid); xmpp.sendOut(msg); } } @@ -214,7 +215,7 @@ public class ConnectionRouter extends Connection implements Runnable, AutoClosea msg.addChild(jmsg); for (User user : users) { for (String jid : xmpp.userService.getJIDsbyUID(user.getUid())) { - msg.to = new JID(jid); + msg.to = Jid.of(jid); xmpp.sendOut(msg); } } @@ -262,7 +263,7 @@ public class ConnectionRouter extends Connection implements Runnable, AutoClosea for (User user : users) { for (String jid : xmpp.userService.getJIDsbyUID(user.getUid())) { - msg.to = new JID(jid); + msg.to = Jid.of(jid); xmpp.sendOut(msg); } } |