diff options
| author |  Vitaly Takmazov | 2018-04-09 19:24:49 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2018-04-09 19:24:49 +0300 |
| commit | a8094e3b0e3c81d8f77f9ccf07d2d5903a4ff5fa (patch) | |
| tree | 0175256f4ad3900b8f9f39ed139618fab15f8cbf | |
| parent | 7eb191f93473f61febeb8bd195fc1b3127cfcc6d (diff) | |
fix events from web
| -rw-r--r-- | juick-server-xmpp/src/main/java/com/juick/server/XMPPConnection.java | 2 | ||||
| -rw-r--r-- | juick-server/src/test/java/com/juick/server/tests/ServerTests.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/juick-server-xmpp/src/main/java/com/juick/server/XMPPConnection.java b/juick-server-xmpp/src/main/java/com/juick/server/XMPPConnection.java index a96e3180..77861373 100644 --- a/juick-server-xmpp/src/main/java/com/juick/server/XMPPConnection.java +++ b/juick-server-xmpp/src/main/java/com/juick/server/XMPPConnection.java @@ -542,7 +542,7 @@ public class XMPPConnection implements StanzaListener, NotificationListener { } else { user_from = userService.getUserByJID(msg.getFrom().asBareJid().toEscapedString()); } - if (user_from == null || user_from.getUid() == 0) { + if ((user_from == null || user_from.getUid() == 0) && !msg.getFrom().equals(jid)) { String signuphash = userService.getSignUpHashByJID(msg.getFrom().asBareJid().toEscapedString()); return makeReply(msg.getFrom(), "Для того, чтобы начать пользоваться сервисом, пожалуйста пройдите быструю регистрацию: http://juick.com/signup?type=xmpp&hash=" + signuphash + "\nЕсли у вас уже есть учетная запись на Juick, вы сможете присоединить этот JabberID к ней.\n\nTo start using Juick, please sign up: http://juick.com/signup?type=xmpp&hash=" + signuphash + "\nIf you already have an account on Juick, you will be proposed to attach this JabberID to your existing account."); } diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java index 358fac3d..3e17ebce 100644 --- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java +++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java @@ -565,6 +565,14 @@ public class ServerTests { xmppMessage.setBody("What's up?"); result = router.incomingMessage(xmppMessage); assertThat(result.getBody(), startsWith("Private message sent")); + xmppMessage.setFrom(botJid); + xmppMessage.setTo(botJid.withLocal("pm")); + Message pm = new Message(); + pm.setUser(userService.getUserByJID(from.toEscapedString())); + pm.setTo(userService.getUserByUID(secretlySadId).orElseThrow(IllegalAccessError::new)); + xmppMessage.addExtension(pm); + result = router.incomingMessage(xmppMessage); + // TODO: assert events } @Test public void botCommandsTests() throws Exception { |