aboutsummaryrefslogtreecommitdiff
path: root/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java
diff options
context:
space:
mode:
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.java57
1 files changed, 28 insertions, 29 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 eec9b8e2..f309bd21 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,13 +2,13 @@ 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.Presence;
import com.juick.xmpp.Stanza;
-import com.juick.xmpp.extensions.Error;
+import com.juick.xmpp.extensions.XMPPError;
import com.juick.xmpp.extensions.JuickMessage;
import org.apache.commons.lang3.StringUtils;
+import rocks.xmpp.addr.Jid;
import javax.inject.Inject;
import java.util.List;
@@ -64,13 +64,13 @@ public class JuickBot implements StanzaListener {
+ "Read more: http://juick.com/help/";
public boolean incomingPresence(Presence p) {
- final String username = p.to.Username.toLowerCase();
+ final String username = p.to.getLocal();
final boolean toJuick = username.equals("juick");
if (p.type == null) {
Presence reply = new Presence();
- reply.from = new JID(p.to.Username, p.to.Host, null);
- reply.to = new JID(p.from.Username, p.from.Host, null);
+ reply.from = p.to.asBareJid();
+ reply.to = p.from.asBareJid();
reply.type = Presence.Type.unsubscribe;
xmpp.sendOut(reply);
return true;
@@ -82,15 +82,14 @@ public class JuickBot implements StanzaListener {
if (toJuick || uid_to > 0) {
Presence reply = new Presence();
- reply.from = p.to;
- reply.from.Resource = "Juick";
+ reply.from = p.to.withResource("Juick");
reply.to = p.from;
reply.priority = 10;
xmpp.sendOut(reply);
} else {
Presence reply = new Presence(p.to, p.from, Presence.Type.error);
reply.id = p.id;
- reply.addChild(new Error(Error.Type.cancel, "item-not-found"));
+ reply.addChild(new XMPPError(XMPPError.Type.cancel, "item-not-found"));
xmpp.sendOut(reply);
return true;
}
@@ -102,7 +101,7 @@ public class JuickBot implements StanzaListener {
} else {
int uid_to = xmpp.userService.getUIDbyName(username);
if (uid_to > 0) {
- xmpp.pmQueriesService.addPMinRoster(uid_to, p.from.Bare());
+ xmpp.pmQueriesService.addPMinRoster(uid_to, p.from.asBareJid().toEscapedString());
canSubscribe = true;
}
}
@@ -111,7 +110,7 @@ public class JuickBot implements StanzaListener {
Presence reply = new Presence(p.to, p.from, Presence.Type.subscribed);
xmpp.sendOut(reply);
- reply.from.Resource = "Juick";
+ reply.from = reply.from.withResource("Juick");
reply.priority = 10;
reply.type = null;
xmpp.sendOut(reply);
@@ -120,7 +119,7 @@ public class JuickBot implements StanzaListener {
} else {
Presence reply = new Presence(p.to, p.from, Presence.Type.error);
reply.id = p.id;
- reply.addChild(new Error(Error.Type.cancel, "item-not-found"));
+ reply.addChild(new XMPPError(XMPPError.Type.cancel, "item-not-found"));
xmpp.sendOut(reply);
return true;
}
@@ -128,7 +127,7 @@ public class JuickBot implements StanzaListener {
if (!toJuick) {
int uid_to = xmpp.userService.getUIDbyName(username);
if (uid_to > 0) {
- xmpp.pmQueriesService.removePMinRoster(uid_to, p.from.Bare());
+ xmpp.pmQueriesService.removePMinRoster(uid_to, p.from.asBareJid().toEscapedString());
}
}
@@ -144,13 +143,13 @@ public class JuickBot implements StanzaListener {
return false;
}
- String username = msg.to.Username.toLowerCase();
+ String username = msg.to.getLocal();
User user_from;
String signuphash = StringUtils.EMPTY;
- user_from = xmpp.userService.getUserByJID(msg.from.Bare());
+ user_from = xmpp.userService.getUserByJID(msg.from.asBareJid().toEscapedString());
if (user_from == null) {
- signuphash = xmpp.userService.getSignUpHashByJID(msg.from.Bare());
+ signuphash = xmpp.userService.getSignUpHashByJID(msg.from.asBareJid().toEscapedString());
}
if (user_from == null) {
@@ -173,7 +172,7 @@ public class JuickBot implements StanzaListener {
if (uid_to == 0) {
Message reply = new Message(msg.to, msg.from, Message.Type.error);
reply.id = msg.id;
- reply.addChild(new Error(Error.Type.cancel, "item-not-found"));
+ reply.addChild(new XMPPError(XMPPError.Type.cancel, "item-not-found"));
xmpp.sendOut(reply);
return true;
}
@@ -185,15 +184,15 @@ public class JuickBot implements StanzaListener {
if (success) {
Message m = new Message();
- m.from = new JID("juick", "juick.com", null);
- m.to = new JID(Integer.toString(uid_to), "push.juick.com", null);
+ m.from = Jid.of("juick@juick.com");
+ m.to = Jid.of(Integer.toString(uid_to), "push.juick.com", null);
JuickMessage jmsg = new JuickMessage();
jmsg.setUser(user_from);
jmsg.setText(msg.body);
m.childs.add(jmsg);
xmpp.getRouter().sendStanza(m.toString());
- m.to.Host = "ws.juick.com";
+ m.to = Jid.of(Integer.toString(uid_to), "ws.juick.com", null);
xmpp.getRouter().sendStanza(m.toString());
List<String> jids;
@@ -201,14 +200,14 @@ public class JuickBot implements StanzaListener {
jids = xmpp.userService.getJIDsbyUID(uid_to);
for (String jid : jids) {
Message mm = new Message();
- mm.to = new JID(jid);
+ mm.to = Jid.of(jid);
mm.type = Message.Type.chat;
inroster = xmpp.pmQueriesService.havePMinRoster(user_from.getUid(), jid);
if (inroster) {
- mm.from = new JID(jmsg.getUser().getName(), "juick.com", "Juick");
+ mm.from = Jid.of(jmsg.getUser().getName(), "juick.com", "Juick");
mm.body = msg.body;
} else {
- mm.from = new JID("juick", "juick.com", "Juick");
+ mm.from = Jid.of("juick", "juick.com", "Juick");
mm.body = "Private message from @" + jmsg.getUser().getName() + ":\n" + msg.body;
}
xmpp.sendOut(mm);
@@ -216,7 +215,7 @@ public class JuickBot implements StanzaListener {
} else {
Message reply = new Message(msg.to, msg.from, Message.Type.error);
reply.id = msg.id;
- reply.addChild(new Error(Error.Type.cancel, "not-allowed"));
+ reply.addChild(new XMPPError(XMPPError.Type.cancel, "not-allowed"));
xmpp.sendOut(reply);
}
@@ -313,27 +312,27 @@ public class JuickBot implements StanzaListener {
if (ret == 200) {
Message msg = new Message();
- msg.from = new JID("juick", "juick.com", null);
- msg.to = new JID(Integer.toString(uid_to), "push.juick.com", null);
+ msg.from = Jid.of("juick", "juick.com", null);
+ msg.to = Jid.of(Integer.toString(uid_to), "push.juick.com", null);
JuickMessage jmsg = new JuickMessage();
jmsg.setUser(user_from);
jmsg.setText(body);
msg.childs.add(jmsg);
xmpp.getRouter().sendStanza(msg.toString());
- msg.to.Host = "ws.juick.com";
+ msg.to = Jid.of(Integer.toString(uid_to), "ws.juick.com", null);
xmpp.getRouter().sendStanza(msg.toString());
for (String jid : jids_to) {
Message mm = new Message();
- mm.to = new JID(jid);
+ mm.to = Jid.of(jid);
mm.type = Message.Type.chat;
haveInRoster = xmpp.pmQueriesService.havePMinRoster(user_from.getUid(), jid);
if (haveInRoster) {
- mm.from = new JID(user_from.getName(), "juick.com", "Juick");
+ mm.from = Jid.of(user_from.getName(), "juick.com", "Juick");
mm.body = body;
} else {
- mm.from = new JID("juick", "juick.com", "Juick");
+ mm.from = Jid.of("juick", "juick.com", "Juick");
mm.body = "Private message from @" + user_from.getName() + ":\n" + body;
}
xmpp.sendOut(mm);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 03:11:14 +0000