From c7d73736fc0d22103c490d704858ad401568ba16 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 22 Mar 2018 12:51:44 +0300 Subject: server: ws.juick.com not receiving xmpp anymore --- juick-server/src/main/java/com/juick/server/XMPPBot.java | 4 ---- juick-server/src/main/java/com/juick/server/api/PM.java | 2 -- juick-server/src/main/java/com/juick/server/api/Post.java | 3 --- juick-www/src/main/java/com/juick/www/controllers/NewMessage.java | 8 -------- 4 files changed, 17 deletions(-) diff --git a/juick-server/src/main/java/com/juick/server/XMPPBot.java b/juick-server/src/main/java/com/juick/server/XMPPBot.java index f9cdf9c8..a3335596 100644 --- a/juick-server/src/main/java/com/juick/server/XMPPBot.java +++ b/juick-server/src/main/java/com/juick/server/XMPPBot.java @@ -261,8 +261,6 @@ public class XMPPBot implements StanzaListener, AutoCloseable { jmsg.setTo(userService.getUserByUID(uid_to).get()); jmsg.setText(msg.getBody()); m.addExtension(jmsg); - m.setTo(Jid.of(Integer.toString(uid_to), "ws.juick.com", null)); - router.sendStanza(m); List jids; boolean inroster = false; @@ -400,8 +398,6 @@ public class XMPPBot implements StanzaListener, AutoCloseable { jmsg.setTo(user_to); jmsg.setText(body); msg.addExtension(jmsg); - msg.setTo(Jid.of(Integer.toString(user_to.getUid()), "ws.juick.com", null)); - router.sendStanza(msg); for (String userJid : jids_to) { Message mm = new Message(); diff --git a/juick-server/src/main/java/com/juick/server/api/PM.java b/juick-server/src/main/java/com/juick/server/api/PM.java index 15bd8b5b..6797c7fd 100644 --- a/juick-server/src/main/java/com/juick/server/api/PM.java +++ b/juick-server/src/main/java/com/juick/server/api/PM.java @@ -97,8 +97,6 @@ public class PM { jmsg.setText(body); jmsg.setTo(userTo); msg.addExtension(jmsg); - msg.setTo(Jid.of(String.format("%d@ws.juick.com", userTo.getUid()))); - serverManager.sendMessage(msg); List jids = userService.getJIDsbyUID(userTo.getUid()); for (String jid : jids) { diff --git a/juick-server/src/main/java/com/juick/server/api/Post.java b/juick-server/src/main/java/com/juick/server/api/Post.java index 4405c889..e09de900 100644 --- a/juick-server/src/main/java/com/juick/server/api/Post.java +++ b/juick-server/src/main/java/com/juick/server/api/Post.java @@ -202,9 +202,6 @@ public class Post { xmsg.setTo(Jid.of("juick@s2s.juick.com")); serverManager.sendMessage(xmsg); - xmsg.setTo(Jid.of("juick@ws.juick.com")); - serverManager.sendMessage(xmsg); - return jmsg; } diff --git a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java b/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java index 531babd2..2669c5ec 100644 --- a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java +++ b/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java @@ -157,9 +157,6 @@ public class NewMessage { xmsg.setTo(Jid.of("juick@s2s.juick.com")); xmpp.send(xmsg); - xmsg.setTo(Jid.of("juick@ws.juick.com")); - xmpp.send(xmsg); - xmsg.setTo(Jid.of("jubo@nologin.ru")); xmpp.send(xmsg); } else { @@ -285,9 +282,6 @@ public class NewMessage { xmsg.setTo(Jid.of("juick@s2s.juick.com")); xmpp.send(xmsg); - - xmsg.setTo(Jid.of("juick@ws.juick.com")); - xmpp.send(xmsg); } else { logger.warn("XMPP unavailable"); } @@ -363,8 +357,6 @@ public class NewMessage { jmsg.setText(body); jmsg.setTo(userTo); msg.addExtension(jmsg); - msg.setTo(Jid.of(String.format("%d@ws.juick.com", userTo.getUid()))); - xmpp.send(msg); List jids = userService.getJIDsbyUID(userTo.getUid()); for (String jid : jids) { -- cgit v1.2.3