aboutsummaryrefslogtreecommitdiff
path: root/juick-server
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-03-29 10:01:19 +0300
committerGravatar Vitaly Takmazov2018-03-29 10:01:34 +0300
commit63004df541aafd06bdd10025ef55ab614f8cd5cc (patch)
tree7aef76f01c943e1a4cc281231cdd12d8e61b69b2 /juick-server
parent8372395b016f2285a4c531f6cd8b766e60f25f64 (diff)
server: XMPPBot -> CommandsManager
Diffstat (limited to 'juick-server')
-rw-r--r--juick-server/src/main/java/com/juick/server/CommandsManager.java (renamed from juick-server/src/main/java/com/juick/server/XMPPBot.java)314
-rw-r--r--juick-server/src/main/java/com/juick/server/NotificationListener.java3
-rw-r--r--juick-server/src/main/java/com/juick/server/TelegramBotManager.java7
-rw-r--r--juick-server/src/main/java/com/juick/server/XMPPConnection.java322
-rw-r--r--juick-server/src/main/java/com/juick/server/api/Post.java6
-rw-r--r--juick-server/src/test/java/com/juick/server/tests/ServerTests.java51
6 files changed, 352 insertions, 351 deletions
diff --git a/juick-server/src/main/java/com/juick/server/XMPPBot.java b/juick-server/src/main/java/com/juick/server/CommandsManager.java
index e2c6cfac..6b6b3e53 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPBot.java
+++ b/juick-server/src/main/java/com/juick/server/CommandsManager.java
@@ -22,29 +22,20 @@ import com.juick.User;
import com.juick.formatters.PlainTextFormatter;
import com.juick.server.component.LikeEvent;
import com.juick.server.component.MessageEvent;
+import com.juick.server.component.PingEvent;
import com.juick.server.component.SubscribeEvent;
import com.juick.server.helpers.TagStats;
-import com.juick.server.util.TagUtils;
import com.juick.server.xmpp.helpers.annotation.UserCommand;
-import com.juick.server.xmpp.s2s.StanzaListener;
import com.juick.service.*;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.commons.lang3.reflect.MethodUtils;
import org.ocpsoft.prettytime.PrettyTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Component;
import rocks.xmpp.addr.Jid;
-import rocks.xmpp.core.stanza.model.*;
-import rocks.xmpp.core.stanza.model.client.ClientMessage;
-import rocks.xmpp.core.stanza.model.client.ClientPresence;
-import rocks.xmpp.core.stanza.model.errors.Condition;
import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import javax.inject.Inject;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -58,19 +49,8 @@ import java.util.stream.Collectors;
* @author ugnich
*/
@Component
-public class XMPPBot implements StanzaListener, NotificationListener {
-
- private static final Logger logger = LoggerFactory.getLogger(XMPPBot.class);
-
- @Inject
- private XMPPServer xmpp;
- @Inject
- private XMPPConnection router;
- @Value("${xmppbot_jid:juick@localhost}")
- private Jid jid;
-
+public class CommandsManager {
private PrettyTime pt;
-
@Inject
private MessagesService messagesService;
@Inject
@@ -90,187 +70,9 @@ public class XMPPBot implements StanzaListener, NotificationListener {
@PostConstruct
public void init() {
- xmpp.addStanzaListener(this);
- broadcastPresence(null);
pt = new PrettyTime(new Locale("ru"));
}
- public Jid getJid() {
- return jid;
- }
-
- public boolean incomingPresence(Presence p) {
- final String username = p.getTo().getLocal();
- final boolean toJuick = username.equals(jid.getLocal());
-
- if (p.getType() == null) {
- Presence reply = new Presence();
- reply.setFrom(p.getTo().asBareJid());
- reply.setTo(p.getFrom().asBareJid());
- reply.setType(Presence.Type.UNSUBSCRIBE);
- xmpp.sendOut(ClientPresence.from(reply));
- return true;
- } else if (p.getType().equals(Presence.Type.PROBE)) {
- int uid_to = 0;
- if (!toJuick) {
- uid_to = userService.getUIDbyName(username);
- }
-
- if (toJuick || uid_to > 0) {
- Presence reply = new Presence();
- reply.setFrom(p.getTo().withResource(jid.getResource()));
- reply.setTo(p.getFrom());
- reply.setPriority((byte)10);
- if (!userService.getActiveJIDs().contains(p.getFrom().asBareJid().toEscapedString())) {
- reply.setStatus("Send ON to enable notifications");
- }
- xmpp.sendOut(ClientPresence.from(reply));
- } else {
- Presence reply = new Presence();
- reply.setFrom(p.getTo());
- reply.setTo(p.getFrom());
- reply.setType(Presence.Type.ERROR);
- reply.setId(p.getId());
- reply.setError(new StanzaError(StanzaError.Type.CANCEL, Condition.ITEM_NOT_FOUND));
- xmpp.sendOut(ClientPresence.from(reply));
- return true;
- }
- return true;
- } else if (p.getType().equals(Presence.Type.SUBSCRIBE)) {
- boolean canSubscribe = false;
- if (toJuick) {
- canSubscribe = true;
- } else {
- int uid_to = userService.getUIDbyName(username);
- if (uid_to > 0) {
- pmQueriesService.addPMinRoster(uid_to, p.getFrom().asBareJid().toEscapedString());
- canSubscribe = true;
- }
- }
-
- if (canSubscribe) {
- Presence reply = new Presence();
- reply.setFrom(p.getTo());
- reply.setTo(p.getFrom());
- reply.setType(Presence.Type.SUBSCRIBED);
- xmpp.sendOut(ClientPresence.from(reply));
-
- reply.setFrom(reply.getFrom().withResource(jid.getResource()));
- reply.setPriority((byte) 10);
- reply.setType(null);
- xmpp.sendOut(ClientPresence.from(reply));
-
- return true;
- } else {
- Presence reply = new Presence();
- reply.setFrom(p.getTo());
- reply.setTo(p.getFrom());
- reply.setType(Presence.Type.ERROR);
- reply.setId(p.getId());
- reply.setError(new StanzaError(StanzaError.Type.CANCEL, Condition.ITEM_NOT_FOUND));
- xmpp.sendOut(ClientPresence.from(reply));
- return true;
- }
- } else if (p.getType().equals(Presence.Type.UNSUBSCRIBE)) {
- if (!toJuick) {
- int uid_to = userService.getUIDbyName(username);
- if (uid_to > 0) {
- pmQueriesService.removePMinRoster(uid_to, p.getFrom().asBareJid().toEscapedString());
- }
- }
-
- Presence reply = new Presence();
- reply.setFrom(p.getTo());
- reply.setTo(p.getFrom());
- reply.setType(Presence.Type.UNSUBSCRIBED);
- xmpp.sendOut(ClientPresence.from(reply));
- }
-
- return false;
- }
-
- public boolean incomingMessage(Message msg) {
- if (msg.getType() != null && msg.getType().equals(Message.Type.ERROR)) {
- StanzaError error = msg.getError();
- if (error != null && error.getCondition().equals(Condition.RESOURCE_CONSTRAINT)) {
- // offline query is full, deactivating this jid
- if (userService.setActiveStatusForJID(msg.getFrom().toEscapedString(), UserService.ActiveStatus.Inactive)) {
- logger.info("{} is inactive now", msg.getFrom());
- return true;
- }
- }
- return false;
- }
- if (StringUtils.isBlank(msg.getBody())) {
- return false;
- }
- String username = msg.getTo().getLocal();
-
- User user_from;
- String signuphash = StringUtils.EMPTY;
- user_from = userService.getUserByJID(msg.getFrom().asBareJid().toEscapedString());
- if (user_from == null) {
- signuphash = userService.getSignUpHashByJID(msg.getFrom().asBareJid().toEscapedString());
- }
-
- if (user_from == null) {
- Message reply = new Message();
- reply.setFrom(msg.getTo());
- reply.setTo(msg.getFrom());
- reply.setType(Message.Type.CHAT);
- if (username.equals(jid.getLocal())) {
- reply.setBody("Для того, чтобы начать пользоваться сервисом, пожалуйста пройдите быструю регистрацию: 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.");
- } else {
- reply.setBody("Внимание, системное сообщение!\nВаш JabberID не обнаружен в списке доверенных. Для того, чтобы отправить сообщение пользователю " + username + "@juick.com, пожалуйста зарегистрируйте свой JabberID в системе: http://juick.com/signup?type=xmpp&hash=" + signuphash + "\nЕсли у вас уже есть учетная запись на Juick, вы сможете присоединить этот JabberID к ней.\n\nWarning, system message!\nYour JabberID is not found in our server's white list. To send a message to " + username + "@juick.com, 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.");
- }
- xmpp.sendOut(ClientMessage.from(reply));
- return true;
- }
-
- if (username.equals(jid.getLocal())) {
- try {
- return incomingMessageJuick(user_from, msg.getFrom(), msg.getBody().trim());
- } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
- return false;
- }
- }
-
- int uid_to = userService.getUIDbyName(username);
-
- if (uid_to == 0) {
- Message reply = new Message();
- reply.setFrom(msg.getTo());
- reply.setTo(msg.getFrom());
- reply.setType(Message.Type.ERROR);
- reply.setId(msg.getId());
- reply.setError(new StanzaError(StanzaError.Type.CANCEL, Condition.ITEM_NOT_FOUND));
- xmpp.sendOut(ClientMessage.from(reply));
- return true;
- }
-
- boolean success = false;
- if (!userService.isInBLAny(uid_to, user_from.getUid())) {
- success = pmQueriesService.createPM(user_from.getUid(), uid_to, msg.getBody());
- }
-
- if (success) {
- com.juick.Message jmsg = new com.juick.Message();
- jmsg.setUser(user_from);
- jmsg.setTo(userService.getUserByUID(uid_to).get());
- jmsg.setText(msg.getBody());
- applicationEventPublisher.publishEvent(new MessageEvent(this, jmsg));
- } else {
- Message reply = new Message();
- reply.setFrom(msg.getTo());
- reply.setTo(msg.getFrom());
- reply.setType(Message.Type.ERROR);
- reply.setId(msg.getId());
- reply.setError(new StanzaError(StanzaError.Type.CANCEL, Condition.NOT_ALLOWED));
- xmpp.sendOut(ClientMessage.from(reply));
- }
-
- return false;
- }
public Optional<String> processCommand(User user, Jid from, String input) throws InvocationTargetException,
IllegalAccessException, NoSuchMethodException {
@@ -292,73 +94,11 @@ public class XMPPBot implements StanzaListener, NotificationListener {
}
return Optional.empty();
}
- public boolean incomingMessageJuick(User user_from, Jid from, String command) throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {
- int commandlen = command.length();
-
- // COMPATIBILITY
- if (commandlen > 7 && command.substring(0, 3).equalsIgnoreCase("PM ")) {
- command = command.substring(3).trim();
- }
-
- Optional<String> result = processCommand(user_from, from, command);
- if (result.isPresent()) {
- sendReply(from, result.get());
- } else {
- // new message
- List<Tag> tags = tagService.fromString(command, false);
- String body = command.substring(TagUtils.toString(tags).length());
- int mid = messagesService.createMessage(user_from.getUid(), body, null, tags);
- subscriptionService.subscribeMessage(mid, user_from.getUid());
- applicationEventPublisher.publishEvent(new MessageEvent(this, messagesService.getMessage(mid)));
- }
- return true;
- }
-
- @Override
- public void processMessageEvent(MessageEvent event) {
- com.juick.Message msg = event.getMessage();
- boolean isPM = msg.getMid() == 0;
- boolean isReply = msg.getRid() > 0;
- if (isPM) {
- userService.getJIDsbyUID(msg.getTo().getUid())
- .forEach(userJid -> {
- Message mm = new Message();
- mm.setTo(Jid.of(userJid));
- mm.setType(Message.Type.CHAT);
- boolean inroster = pmQueriesService.havePMinRoster(msg.getUser().getUid(), userJid);
- if (inroster) {
- mm.setFrom(Jid.of(msg.getUser().getName(), "juick.com", "Juick"));
- mm.setBody(msg.getText());
- } else {
- mm.setFrom(jid);
- mm.setBody("Private message from @" + msg.getUser().getName() + ":\n" + msg.getText());
- }
- xmpp.sendOut(ClientMessage.from(mm));
- });
- } else if (!isReply) {
- String notify = "New message posted.\n#" + msg.getMid() + " https://juick.com/" + msg.getMid();
- userService.getJIDsbyUID(msg.getUser().getUid())
- .forEach(jid -> sendReply(Jid.of(jid), notify));
- }
- }
-
- @Override
- public void processSubscribeEvent(SubscribeEvent subscribeEvent) {
-
- }
-
- @Override
- public void processLikeEvent(LikeEvent likeEvent) {
-
- }
@UserCommand(pattern = "^ping$", patternFlags = Pattern.CASE_INSENSITIVE,
help = "PING - returns you a PONG")
public String commandPing(User user, Jid from, String[] input) {
- Presence p = new Presence(from);
- p.setFrom(jid);
- p.setPriority((byte) 10);
- xmpp.sendOut(ClientPresence.from(p));
+ applicationEventPublisher.publishEvent(new PingEvent(this, user));
return "PONG";
}
@@ -721,57 +461,9 @@ public class XMPPBot implements StanzaListener, NotificationListener {
}
}
- void sendReply(Jid jidTo, String txt) {
- Message reply = new Message();
- reply.setFrom(jid);
- reply.setTo(jidTo);
- reply.setType(Message.Type.CHAT);
- reply.setBody(txt);
- xmpp.sendOut(ClientMessage.from(reply));
- }
-
- @Override
- public void stanzaReceived(Stanza xmlValue) {
- if (xmlValue instanceof Presence) {
- Presence p = (Presence) xmlValue;
- if (p.getType() == null || !p.getType().equals(Presence.Type.ERROR)) {
- incomingPresence(p);
- }
- } else if (xmlValue instanceof Message) {
- Message msg = (Message) xmlValue;
- if (!incomingMessage(msg)) {
- router.sendStanza(msg);
- }
- } else if (xmlValue instanceof IQ) {
- IQ iq = (IQ) xmlValue;
- router.sendStanza(iq);
- }
- }
-
String printMessages(List<Integer> mids, boolean crop) {
return messagesService.getMessages(mids).stream()
.sorted(Collections.reverseOrder())
.map(PlainTextFormatter::formatPostSummary).collect(Collectors.joining("\n\n"));
}
-
- void broadcastPresence(Presence.Type type) {
- Presence presence = new Presence();
- presence.setFrom(jid);
- if (type != null) {
- presence.setType(type);
- }
- userService.getActiveJIDs().forEach(j -> {
- try {
- presence.setTo(Jid.of(j));
- xmpp.sendOut(ClientPresence.from(presence));
- } catch (IllegalArgumentException ex) {
- logger.warn("Invalid jid: {}", j, ex);
- }
- });
- }
-
- @PreDestroy
- public void close() {
- broadcastPresence(Presence.Type.UNAVAILABLE);
- }
}
diff --git a/juick-server/src/main/java/com/juick/server/NotificationListener.java b/juick-server/src/main/java/com/juick/server/NotificationListener.java
index d5cdc14f..f6330570 100644
--- a/juick-server/src/main/java/com/juick/server/NotificationListener.java
+++ b/juick-server/src/main/java/com/juick/server/NotificationListener.java
@@ -2,6 +2,7 @@ package com.juick.server;
import com.juick.server.component.LikeEvent;
import com.juick.server.component.MessageEvent;
+import com.juick.server.component.PingEvent;
import com.juick.server.component.SubscribeEvent;
import org.springframework.context.event.EventListener;
@@ -12,4 +13,6 @@ public interface NotificationListener {
void processSubscribeEvent(SubscribeEvent subscribeEvent);
@EventListener
void processLikeEvent(LikeEvent likeEvent);
+ @EventListener
+ void ProcessPingEvent(PingEvent pingEvent);
}
diff --git a/juick-server/src/main/java/com/juick/server/TelegramBotManager.java b/juick-server/src/main/java/com/juick/server/TelegramBotManager.java
index 1ea71ebb..c1ccc8ff 100644
--- a/juick-server/src/main/java/com/juick/server/TelegramBotManager.java
+++ b/juick-server/src/main/java/com/juick/server/TelegramBotManager.java
@@ -20,6 +20,7 @@ package com.juick.server;
import com.juick.User;
import com.juick.server.component.LikeEvent;
import com.juick.server.component.MessageEvent;
+import com.juick.server.component.PingEvent;
import com.juick.server.component.SubscribeEvent;
import com.juick.server.util.HttpUtils;
import com.juick.service.MessagesService;
@@ -333,6 +334,12 @@ public class TelegramBotManager implements NotificationListener {
.forEach(c -> telegramNotify(c, String.format("%s recommends your [post](%s)",
MessageUtils.getMarkdownUser(liker), formatUrl(message)),null));
}
+
+ @Override
+ public void ProcessPingEvent(PingEvent pingEvent) {
+
+ }
+
@Override
public void processSubscribeEvent(SubscribeEvent subscribeEvent) {
User subscriber = subscribeEvent.getUser();
diff --git a/juick-server/src/main/java/com/juick/server/XMPPConnection.java b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
index e4d2db04..eb459ee1 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPConnection.java
+++ b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
@@ -17,14 +17,17 @@
package com.juick.server;
+import com.juick.Tag;
import com.juick.User;
import com.juick.server.component.LikeEvent;
import com.juick.server.component.MessageEvent;
+import com.juick.server.component.PingEvent;
+import com.juick.server.component.SubscribeEvent;
+import com.juick.server.util.TagUtils;
import com.juick.server.xmpp.s2s.BasicXmppSession;
import com.juick.server.helpers.UserInfo;
-import com.juick.service.MessagesService;
-import com.juick.service.SubscriptionService;
-import com.juick.service.UserService;
+import com.juick.server.xmpp.s2s.StanzaListener;
+import com.juick.service.*;
import com.juick.util.MessageUtils;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.FilenameUtils;
@@ -38,10 +41,9 @@ import org.springframework.stereotype.Component;
import rocks.xmpp.addr.Jid;
import rocks.xmpp.core.XmppException;
import rocks.xmpp.core.stanza.AbstractIQHandler;
-import rocks.xmpp.core.stanza.model.IQ;
-import rocks.xmpp.core.stanza.model.Message;
-import rocks.xmpp.core.stanza.model.Stanza;
+import rocks.xmpp.core.stanza.model.*;
import rocks.xmpp.core.stanza.model.client.ClientMessage;
+import rocks.xmpp.core.stanza.model.client.ClientPresence;
import rocks.xmpp.core.stanza.model.errors.Condition;
import rocks.xmpp.extensions.caps.model.EntityCapabilities;
import rocks.xmpp.extensions.component.accept.ExternalComponent;
@@ -56,12 +58,14 @@ import rocks.xmpp.extensions.version.model.SoftwareVersion;
import rocks.xmpp.util.XmppUtils;
import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.xml.bind.JAXBException;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
import java.io.IOException;
import java.io.StringWriter;
+import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -70,6 +74,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
@@ -77,13 +82,15 @@ import java.util.concurrent.ExecutorService;
* @author ugnich
*/
@Component
-public class XMPPConnection implements AutoCloseable {
+public class XMPPConnection implements StanzaListener, NotificationListener {
private static final Logger logger = LoggerFactory.getLogger(XMPPConnection.class);
private ExternalComponent router;
@Inject
private XMPPServer xmpp;
+ @Inject
+ private CommandsManager commandsManager;
@Value("${xmppbot_jid:juick@localhost}")
private Jid jid;
@@ -105,6 +112,10 @@ public class XMPPConnection implements AutoCloseable {
@Inject
private SubscriptionService subscriptionService;
@Inject
+ private PMQueriesService pmQueriesService;
+ @Inject
+ private TagService tagService;
+ @Inject
private BasicXmppSession session;
@Inject
private ExecutorService service;
@@ -114,6 +125,8 @@ public class XMPPConnection implements AutoCloseable {
@PostConstruct
public void init() {
logger.info("stream router start connecting to {}", componentPort);
+ xmpp.addStanzaListener(this);
+ broadcastPresence(null);
router = ExternalComponent.create(componentName, password, session.getConfiguration(), "localhost",
componentPort);
PingManager pingManager = router.getManager(PingManager.class);
@@ -166,7 +179,6 @@ public class XMPPConnection implements AutoCloseable {
com.juick.Message jmsg = message.getExtension(com.juick.Message.class);
if (jmsg != null) {
if (jid.getLocal().equals("recomm")) {
- sendJuickRecommendation(jmsg);
User fromUser = jmsg.getUser();
com.juick.Message msg = messagesService.getMessage(jmsg.getMid());
applicationEventPublisher.publishEvent(new LikeEvent(this, fromUser, msg));
@@ -377,13 +389,57 @@ public class XMPPConnection implements AutoCloseable {
}
}
- public void sendJuickRecommendation(com.juick.Message recomm) {
+ @Override
+ public void processMessageEvent(MessageEvent event) {
+ com.juick.Message msg = event.getMessage();
+ boolean isPM = msg.getMid() == 0;
+ boolean isReply = msg.getRid() > 0;
+ if (isPM) {
+ userService.getJIDsbyUID(msg.getTo().getUid())
+ .forEach(userJid -> {
+ Message mm = new Message();
+ mm.setTo(Jid.of(userJid));
+ mm.setType(Message.Type.CHAT);
+ boolean inroster = pmQueriesService.havePMinRoster(msg.getUser().getUid(), userJid);
+ if (inroster) {
+ mm.setFrom(Jid.of(msg.getUser().getName(), "juick.com", "Juick"));
+ mm.setBody(msg.getText());
+ } else {
+ mm.setFrom(jid);
+ mm.setBody("Private message from @" + msg.getUser().getName() + ":\n" + msg.getText());
+ }
+ xmpp.sendOut(ClientMessage.from(mm));
+ });
+ } else if (!isReply) {
+ String notify = "New message posted.\n#" + msg.getMid() + " https://juick.com/" + msg.getMid();
+ userService.getJIDsbyUID(msg.getUser().getUid())
+ .forEach(jid -> sendReply(Jid.of(jid), notify));
+ }
+ }
+
+ void sendReply(Jid jidTo, String txt) {
+ Message reply = new Message();
+ reply.setFrom(jid);
+ reply.setTo(jidTo);
+ reply.setType(Message.Type.CHAT);
+ reply.setBody(txt);
+ xmpp.sendOut(ClientMessage.from(reply));
+ }
+
+ @Override
+ public void processSubscribeEvent(SubscribeEvent subscribeEvent) {
+
+ }
+
+ @Override
+ public void processLikeEvent(LikeEvent likeEvent) {
List<User> users;
- com.juick.Message jmsg = messagesService.getMessage(recomm.getMid());
- users = subscriptionService.getUsersSubscribedToUserRecommendations(recomm.getUser().getUid(),
- recomm.getMid(), jmsg.getUser().getUid());
+ com.juick.Message jmsg = likeEvent.getMessage();
+ User liker = likeEvent.getUser();
+ users = subscriptionService.getUsersSubscribedToUserRecommendations(liker.getUid(),
+ jmsg.getMid(), jmsg.getUser().getUid());
- String txt = "Recommended by @" + recomm.getUser().getName() + ":\n";
+ String txt = "Recommended by @" + liker.getName() + ":\n";
txt += "@" + jmsg.getUser().getName() + ":" + MessageUtils.getTagsString(jmsg) + "\n";
String attachmentUrl = MessageUtils.attachmentUrl(jmsg);
if (StringUtils.isNotEmpty(attachmentUrl)) {
@@ -427,7 +483,247 @@ public class XMPPConnection implements AutoCloseable {
}
@Override
+ public void ProcessPingEvent(PingEvent pingEvent) {
+ userService.getJIDsbyUID(pingEvent.getPinger().getUid())
+ .forEach(userJid -> {
+ Presence p = new Presence(Jid.of(userJid));
+ p.setFrom(jid);
+ p.setPriority((byte) 10);
+ xmpp.sendOut(ClientPresence.from(p));
+ });
+ }
+
+ public boolean incomingPresence(Presence p) {
+ final String username = p.getTo().getLocal();
+ final boolean toJuick = username.equals(jid.getLocal());
+
+ if (p.getType() == null) {
+ Presence reply = new Presence();
+ reply.setFrom(p.getTo().asBareJid());
+ reply.setTo(p.getFrom().asBareJid());
+ reply.setType(Presence.Type.UNSUBSCRIBE);
+ xmpp.sendOut(ClientPresence.from(reply));
+ return true;
+ } else if (p.getType().equals(Presence.Type.PROBE)) {
+ int uid_to = 0;
+ if (!toJuick) {
+ uid_to = userService.getUIDbyName(username);
+ }
+
+ if (toJuick || uid_to > 0) {
+ Presence reply = new Presence();
+ reply.setFrom(p.getTo().withResource(jid.getResource()));
+ reply.setTo(p.getFrom());
+ reply.setPriority((byte)10);
+ if (!userService.getActiveJIDs().contains(p.getFrom().asBareJid().toEscapedString())) {
+ reply.setStatus("Send ON to enable notifications");
+ }
+ xmpp.sendOut(ClientPresence.from(reply));
+ } else {
+ Presence reply = new Presence();
+ reply.setFrom(p.getTo());
+ reply.setTo(p.getFrom());
+ reply.setType(Presence.Type.ERROR);
+ reply.setId(p.getId());
+ reply.setError(new StanzaError(StanzaError.Type.CANCEL, Condition.ITEM_NOT_FOUND));
+ xmpp.sendOut(ClientPresence.from(reply));
+ return true;
+ }
+ return true;
+ } else if (p.getType().equals(Presence.Type.SUBSCRIBE)) {
+ boolean canSubscribe = false;
+ if (toJuick) {
+ canSubscribe = true;
+ } else {
+ int uid_to = userService.getUIDbyName(username);
+ if (uid_to > 0) {
+ pmQueriesService.addPMinRoster(uid_to, p.getFrom().asBareJid().toEscapedString());
+ canSubscribe = true;
+ }
+ }
+
+ if (canSubscribe) {
+ Presence reply = new Presence();
+ reply.setFrom(p.getTo());
+ reply.setTo(p.getFrom());
+ reply.setType(Presence.Type.SUBSCRIBED);
+ xmpp.sendOut(ClientPresence.from(reply));
+
+ reply.setFrom(reply.getFrom().withResource(jid.getResource()));
+ reply.setPriority((byte) 10);
+ reply.setType(null);
+ xmpp.sendOut(ClientPresence.from(reply));
+
+ return true;
+ } else {
+ Presence reply = new Presence();
+ reply.setFrom(p.getTo());
+ reply.setTo(p.getFrom());
+ reply.setType(Presence.Type.ERROR);
+ reply.setId(p.getId());
+ reply.setError(new StanzaError(StanzaError.Type.CANCEL, Condition.ITEM_NOT_FOUND));
+ xmpp.sendOut(ClientPresence.from(reply));
+ return true;
+ }
+ } else if (p.getType().equals(Presence.Type.UNSUBSCRIBE)) {
+ if (!toJuick) {
+ int uid_to = userService.getUIDbyName(username);
+ if (uid_to > 0) {
+ pmQueriesService.removePMinRoster(uid_to, p.getFrom().asBareJid().toEscapedString());
+ }
+ }
+
+ Presence reply = new Presence();
+ reply.setFrom(p.getTo());
+ reply.setTo(p.getFrom());
+ reply.setType(Presence.Type.UNSUBSCRIBED);
+ xmpp.sendOut(ClientPresence.from(reply));
+ }
+
+ return false;
+ }
+
+ public boolean incomingMessage(Message msg) {
+ if (msg.getType() != null && msg.getType().equals(Message.Type.ERROR)) {
+ StanzaError error = msg.getError();
+ if (error != null && error.getCondition().equals(Condition.RESOURCE_CONSTRAINT)) {
+ // offline query is full, deactivating this jid
+ if (userService.setActiveStatusForJID(msg.getFrom().toEscapedString(), UserService.ActiveStatus.Inactive)) {
+ logger.info("{} is inactive now", msg.getFrom());
+ return true;
+ }
+ }
+ return false;
+ }
+ if (StringUtils.isBlank(msg.getBody())) {
+ return false;
+ }
+ String username = msg.getTo().getLocal();
+
+ User user_from;
+ String signuphash = StringUtils.EMPTY;
+ user_from = userService.getUserByJID(msg.getFrom().asBareJid().toEscapedString());
+ if (user_from == null) {
+ signuphash = userService.getSignUpHashByJID(msg.getFrom().asBareJid().toEscapedString());
+ }
+
+ if (user_from == null) {
+ Message reply = new Message();
+ reply.setFrom(msg.getTo());
+ reply.setTo(msg.getFrom());
+ reply.setType(Message.Type.CHAT);
+ if (username.equals(jid.getLocal())) {
+ reply.setBody("Для того, чтобы начать пользоваться сервисом, пожалуйста пройдите быструю регистрацию: 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.");
+ } else {
+ reply.setBody("Внимание, системное сообщение!\nВаш JabberID не обнаружен в списке доверенных. Для того, чтобы отправить сообщение пользователю " + username + "@juick.com, пожалуйста зарегистрируйте свой JabberID в системе: http://juick.com/signup?type=xmpp&hash=" + signuphash + "\nЕсли у вас уже есть учетная запись на Juick, вы сможете присоединить этот JabberID к ней.\n\nWarning, system message!\nYour JabberID is not found in our server's white list. To send a message to " + username + "@juick.com, 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.");
+ }
+ xmpp.sendOut(ClientMessage.from(reply));
+ return true;
+ }
+
+ if (username.equals(jid.getLocal())) {
+ try {
+ return incomingMessageJuick(user_from, msg.getFrom(), msg.getBody().trim());
+ } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+ return false;
+ }
+ }
+
+ int uid_to = userService.getUIDbyName(username);
+
+ if (uid_to == 0) {
+ Message reply = new Message();
+ reply.setFrom(msg.getTo());
+ reply.setTo(msg.getFrom());
+ reply.setType(Message.Type.ERROR);
+ reply.setId(msg.getId());
+ reply.setError(new StanzaError(StanzaError.Type.CANCEL, Condition.ITEM_NOT_FOUND));
+ xmpp.sendOut(ClientMessage.from(reply));
+ return true;
+ }
+
+ boolean success = false;
+ if (!userService.isInBLAny(uid_to, user_from.getUid())) {
+ success = pmQueriesService.createPM(user_from.getUid(), uid_to, msg.getBody());
+ }
+
+ if (success) {
+ com.juick.Message jmsg = new com.juick.Message();
+ jmsg.setUser(user_from);
+ jmsg.setTo(userService.getUserByUID(uid_to).get());
+ jmsg.setText(msg.getBody());
+ applicationEventPublisher.publishEvent(new MessageEvent(this, jmsg));
+ } else {
+ Message reply = new Message();
+ reply.setFrom(msg.getTo());
+ reply.setTo(msg.getFrom());
+ reply.setType(Message.Type.ERROR);
+ reply.setId(msg.getId());
+ reply.setError(new StanzaError(StanzaError.Type.CANCEL, Condition.NOT_ALLOWED));
+ xmpp.sendOut(ClientMessage.from(reply));
+ }
+
+ return false;
+ }
+ public boolean incomingMessageJuick(User user_from, Jid from, String command) throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+ int commandlen = command.length();
+
+ // COMPATIBILITY
+ if (commandlen > 7 && command.substring(0, 3).equalsIgnoreCase("PM ")) {
+ command = command.substring(3).trim();
+ }
+
+ Optional<String> result = commandsManager.processCommand(user_from, from, command);
+ if (result.isPresent()) {
+ sendReply(from, result.get());
+ } else {
+ // new message
+ List<Tag> tags = tagService.fromString(command, false);
+ String body = command.substring(TagUtils.toString(tags).length());
+ int mid = messagesService.createMessage(user_from.getUid(), body, null, tags);
+ subscriptionService.subscribeMessage(mid, user_from.getUid());
+ applicationEventPublisher.publishEvent(new MessageEvent(this, messagesService.getMessage(mid)));
+ }
+ return true;
+ }
+
+ @Override
+ public void stanzaReceived(Stanza xmlValue) {
+ if (xmlValue instanceof Presence) {
+ Presence p = (Presence) xmlValue;
+ if (p.getType() == null || !p.getType().equals(Presence.Type.ERROR)) {
+ incomingPresence(p);
+ }
+ } else if (xmlValue instanceof Message) {
+ Message msg = (Message) xmlValue;
+ if (!incomingMessage(msg)) {
+ sendStanza(msg);
+ }
+ } else if (xmlValue instanceof IQ) {
+ IQ iq = (IQ) xmlValue;
+ sendStanza(iq);
+ }
+ }
+
+ void broadcastPresence(Presence.Type type) {
+ Presence presence = new Presence();
+ presence.setFrom(jid);
+ if (type != null) {
+ presence.setType(type);
+ }
+ userService.getActiveJIDs().forEach(j -> {
+ try {
+ presence.setTo(Jid.of(j));
+ xmpp.sendOut(ClientPresence.from(presence));
+ } catch (IllegalArgumentException ex) {
+ logger.warn("Invalid jid: {}", j, ex);
+ }
+ });
+ }
+
+ @PreDestroy
public void close() throws Exception {
+ broadcastPresence(Presence.Type.UNAVAILABLE);
if (router != null) {
router.close();
}
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 f7298def..301f6e37 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
@@ -21,7 +21,7 @@ import com.juick.Status;
import com.juick.User;
import com.juick.server.EmailManager;
import com.juick.server.ServerManager;
-import com.juick.server.XMPPBot;
+import com.juick.server.CommandsManager;
import com.juick.server.util.*;
import com.juick.service.MessagesService;
import com.juick.service.SubscriptionService;
@@ -81,7 +81,7 @@ public class Post {
@Value("${api_user:juick}")
private String serviceUser;
@Inject
- XMPPBot bot;
+ CommandsManager commandsManager;
@RequestMapping(value = "/post", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseStatus(value = HttpStatus.OK)
@@ -303,7 +303,7 @@ public class Post {
if (msg.getUser().getUid() == visitor.getUid()) {
throw new HttpForbiddenException();
}
- String status = bot.commandRecommend(visitor, null, String.valueOf(mid));
+ String status = commandsManager.commandRecommend(visitor, null, String.valueOf(mid));
return Status.getStatus(status);
}
}
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 d3dc7b58..6c232167 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
@@ -24,7 +24,8 @@ import com.juick.Message;
import com.juick.Tag;
import com.juick.User;
import com.juick.server.EmailManager;
-import com.juick.server.XMPPBot;
+import com.juick.server.CommandsManager;
+import com.juick.server.XMPPConnection;
import com.juick.server.XMPPServer;
import com.juick.server.helpers.AnonymousUser;
import com.juick.server.helpers.TagStats;
@@ -94,7 +95,9 @@ public class ServerTests {
@Inject
private XMPPServer server;
@Inject
- private XMPPBot bot;
+ private CommandsManager commandsManager;
+ @Inject
+ private XMPPConnection router;
@Inject
private SubscriptionService subscriptionService;
@Inject
@@ -509,15 +512,15 @@ public class ServerTests {
assertThat(from, equalTo(msg.getFrom()));
boolean isActive = jdbcTemplate.queryForObject("SELECT active FROM jids WHERE user_id=?", Integer.class, renhaId) == 1;
assertThat(isActive, equalTo(true));
- bot.incomingMessage((ServerMessage)msg);
+ router.incomingMessage((ServerMessage)msg);
isActive = jdbcTemplate.queryForObject("SELECT active FROM jids WHERE user_id=?", Integer.class, renhaId) == 1;
assertThat(isActive, equalTo(false));
}
@Test
public void botCommandsTests() throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {
- assertThat(bot.processCommand(new User(), Jid.of("test@localhost"), "PING").get(), is("PONG"));
+ assertThat(commandsManager.processCommand(new User(), Jid.of("test@localhost"), "PING").get(), is("PONG"));
// subscription commands have two lines, others have 1
- assertThat(bot.processCommand(new User(), Jid.of("test@localhost"), "help").get().split("\n").length, is(32));
+ assertThat(commandsManager.processCommand(new User(), Jid.of("test@localhost"), "help").get().split("\n").length, is(32));
}
@Test
@@ -525,10 +528,10 @@ public class ServerTests {
int uid = userService.createUser("me", "secret");
User user = userService.getUserByUID(uid).orElse(new User());
Tag yo = tagService.getTag("yo", true);
- bot.incomingMessageJuick(user, Jid.of("test@localhost"), "*yo yoyo");
+ router.incomingMessageJuick(user, Jid.of("test@localhost"), "*yo yoyo");
int mid = messagesService.createMessage(uid, "yoyo", null, Collections.singletonList(yo));
assertEquals("should be message", true,
- bot.processCommand(user, Jid.of("test@localhost"), String.format("#%d", mid)).get().startsWith("@me"));
+ commandsManager.processCommand(user, Jid.of("test@localhost"), String.format("#%d", mid)).get().startsWith("@me"));
mid = messagesService.getUserBlog(user.getUid(), -1, 0).stream().reduce((first, second) -> second).get();
assertEquals("text should match", "yoyo",
messagesService.getMessage(mid).getText());
@@ -538,9 +541,9 @@ public class ServerTests {
User readerUser = userService.getUserByUID(readerUid).orElse(new User());
Jid dummyJid = Jid.of("dummy@localhost");
assertEquals("should be subscribed", "Subscribed",
- bot.processCommand(readerUser, dummyJid, "S #" + mid).get());
+ commandsManager.processCommand(readerUser, dummyJid, "S #" + mid).get());
assertEquals("should be favorited", "Message is added to your recommendations",
- bot.processCommand(readerUser, dummyJid, "! #" + mid).get());
+ commandsManager.processCommand(readerUser, dummyJid, "! #" + mid).get());
int rid = messagesService.createReply(mid, 0, uid, "comment", null);
assertEquals("number of subscribed users should match", 1,
subscriptionService.getUsersSubscribedToComments(
@@ -552,7 +555,7 @@ public class ServerTests {
messagesService.getMessage(mid),
messagesService.getReply(mid, rid)).size());
assertEquals("should be subscribed", "Subscribed to @" + user.getName(),
- bot.processCommand(readerUser, Jid.of("dummy@localhost"), "S @" + user.getName()).get());
+ commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "S @" + user.getName()).get());
List<User> friends = userService.getUserFriends(readerUid);
assertEquals("number of friend users should match", 2,
friends.size());
@@ -563,57 +566,57 @@ public class ServerTests {
String expectedThirdReply = "Reply posted.\n#" + mid + "/3 "
+ "https://juick.com/" + mid + "#3";
assertEquals("should be second reply", expectedSecondReply,
- bot.processCommand(user, Jid.of("test@localhost"), "#" + mid + " yoyo").get());
+ commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid + " yoyo").get());
assertEquals("should be third reply", expectedThirdReply,
- bot.processCommand(user, Jid.of("test@localhost"), "#" + mid + "/2 yoyo").get());
+ commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid + "/2 yoyo").get());
Message reply = messagesService.getReplies(mid).stream().filter(m -> m.getRid() == 3).findFirst()
.orElse(new Message());
assertEquals("should be reply to second comment", 2, reply.getReplyto());
assertEquals("tags should NOT be updated", "It is not your message",
- bot.processCommand(readerUser, Jid.of("dummy@localhost"), "#" + mid + " *yo *there").get());
+ commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "#" + mid + " *yo *there").get());
assertEquals("tags should be updated", "Tags are updated",
- bot.processCommand(user, Jid.of("test@localhost"), "#" + mid + " *there").get());
+ commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid + " *there").get());
assertEquals("number of tags should match", 2,
tagService.getMessageTags(mid).size());
assertEquals("should be blacklisted", "Tag added to your blacklist",
- bot.processCommand(readerUser, Jid.of("dummy@localhost"), "BL *there").get());
+ commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "BL *there").get());
assertEquals("number of subscribed users should match", 0,
subscriptionService.getSubscribedUsers(uid, mid).size());
assertEquals("tags should be updated", "Tags are updated",
- bot.processCommand(user, Jid.of("test@localhost"), "#" + mid + " *there").get());
+ commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid + " *there").get());
assertEquals("number of tags should match", 1,
tagService.getMessageTags(mid).size());
int taggerUid = userService.createUser("dummyTagger", "dummySecret");
User taggerUser = userService.getUserByUID(taggerUid).orElse(new User());
assertEquals("should be subscribed", "Subscribed",
- bot.processCommand(taggerUser, Jid.of("tagger@localhost"), "S *yo").get());
+ commandsManager.processCommand(taggerUser, Jid.of("tagger@localhost"), "S *yo").get());
assertEquals("number of subscribed users should match", 2,
subscriptionService.getSubscribedUsers(uid, mid).size());
assertEquals("should be unsubscribed", "Unsubscribed from yo",
- bot.processCommand(taggerUser, Jid.of("tagger@localhost"), "U *yo").get());
+ commandsManager.processCommand(taggerUser, Jid.of("tagger@localhost"), "U *yo").get());
assertEquals("number of subscribed users should match", 1,
subscriptionService.getSubscribedUsers(uid, mid).size());
assertEquals("number of readers should match", 1,
userService.getUserReaders(uid).size());
- String readerFeed = bot.processCommand(readerUser, Jid.of("dummy@localhost"), "#").get();
+ String readerFeed = commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "#").get();
assertEquals("description should match", true, readerFeed.startsWith("Your feed"));
assertEquals("should be unsubscribed", "Unsubscribed from @" + user.getName(),
- bot.processCommand(readerUser, Jid.of("dummy@localhost"), "U @" + user.getName()).get());
+ commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "U @" + user.getName()).get());
assertEquals("number of readers should match", 0,
userService.getUserReaders(uid).size());
assertEquals("number of friends should match", 1,
userService.getUserFriends(uid).size());
assertEquals("should be unsubscribed", "Unsubscribed from #" + mid,
- bot.processCommand(readerUser, Jid.of("dummy@localhost"), "u #" + mid).get());
+ commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "u #" + mid).get());
assertEquals("number of subscribed users should match", 0,
subscriptionService.getUsersSubscribedToComments(messagesService.getMessage(mid),
messagesService.getReply(mid, rid)).size());
assertNotEquals("should NOT be deleted", String.format("Message %s deleted", mid),
- bot.processCommand(readerUser, Jid.of("dummy@localhost"), "D #" + mid).get());
+ commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "D #" + mid).get());
assertEquals("should be deleted", "Message deleted",
- bot.processCommand(user, Jid.of("test@localhost"), "D #" + mid).get());
+ commandsManager.processCommand(user, Jid.of("test@localhost"), "D #" + mid).get());
assertEquals("should be not found", "Message not found",
- bot.processCommand(user, Jid.of("test@localhost"), "#" + mid).get());
+ commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid).get());
}
@Test
public void mailParserTest() throws Exception {