server: process everything in one place

8 files changed, 179 insertions, 217 deletions

diff --git a/juick-server/src/main/java/com/juick/server/CommandsManager.java b/juick-server/src/main/java/com/juick/server/CommandsManager.java
index a6a3a6e1..74c443cf 100644
--- a/juick-server/src/main/java/com/juick/server/CommandsManager.java
+++ b/juick-server/src/main/java/com/juick/server/CommandsManager.java
@@ -17,6 +17,7 @@
 
 package com.juick.server;
 
+import com.juick.Message;
 import com.juick.Tag;
 import com.juick.User;
 import com.juick.formatters.PlainTextFormatter;
@@ -27,6 +28,7 @@ import com.juick.server.component.SubscribeEvent;
 import com.juick.server.helpers.TagStats;
 import com.juick.server.util.HttpUtils;
 import com.juick.server.util.ImageUtils;
+import com.juick.server.xmpp.helpers.CommandResult;
 import com.juick.server.xmpp.helpers.annotation.UserCommand;
 import com.juick.service.*;
 import org.apache.commons.lang3.StringUtils;
@@ -84,7 +86,7 @@ public class CommandsManager {
     }
 
 
-    public Optional<String> processCommand(User user, Jid from, String input, URI attachment) throws InvocationTargetException,
+    public Optional<CommandResult> processCommand(User user, Jid from, String input, URI attachment) throws InvocationTargetException,
             IllegalAccessException, NoSuchMethodException {
         Optional<Method> cmd = MethodUtils.getMethodsListWithAnnotation(getClass(), UserCommand.class).stream()
                 .filter(m -> Pattern.compile(m.getAnnotation(UserCommand.class).pattern(),
@@ -99,7 +101,7 @@ public class CommandsManager {
                     groups.add(matcher.group(i));
                 }
             }
-            return Optional.of((String) getClass().getMethod(cmd.get().getName(), User.class, Jid.class, URI.class, String[].class)
+            return Optional.of((CommandResult) getClass().getMethod(cmd.get().getName(), User.class, Jid.class, URI.class, String[].class)
                     .invoke(this, user, from, attachment, groups.toArray(new String[groups.size()])));
         }
         return Optional.empty();
@@ -107,27 +109,27 @@ public class CommandsManager {
 
     @UserCommand(pattern = "^ping$", patternFlags = Pattern.CASE_INSENSITIVE,
             help = "PING - returns you a PONG")
-    public String commandPing(User user, Jid from, URI attachment, String[] input) {
+    public CommandResult commandPing(User user, Jid from, URI attachment, String[] input) {
         applicationEventPublisher.publishEvent(new PingEvent(this, user));
-        return "PONG";
+        return CommandResult.fromString("PONG");
     }
 
     @UserCommand(pattern = "^help$", patternFlags = Pattern.CASE_INSENSITIVE,
             help = "HELP - returns this help message")
-    public String commandHelp(User user, Jid from, URI attachment, String[] input) {
-        return Arrays.stream(getClass().getDeclaredMethods())
+    public CommandResult commandHelp(User user, Jid from, URI attachment, String[] input) {
+        return CommandResult.fromString(Arrays.stream(getClass().getDeclaredMethods())
                 .filter(m -> m.isAnnotationPresent(UserCommand.class))
                 .map(m -> m.getAnnotation(UserCommand.class).help())
-                .collect(Collectors.joining("\n"));
+                .collect(Collectors.joining("\n")));
     }
 
     @UserCommand(pattern = "^login$", patternFlags = Pattern.CASE_INSENSITIVE,
             help = "LOGIN - log in to Juick website")
-    public String commandLogin(User user_from, Jid from, URI attachment, String[] input) {
-        return "http://juick.com/login?hash=" + userService.getHashByUID(user_from.getUid());
+    public CommandResult commandLogin(User user_from, Jid from, URI attachment, String[] input) {
+        return CommandResult.fromString("http://juick.com/login?hash=" + userService.getHashByUID(user_from.getUid()));
     }
     @UserCommand(pattern = "^\\@(\\S+)\\s+([\\s\\S]+)$", help = "@username message - send PM to username")
-    public String commandPM(User user_from, Jid from, URI attachment, String... arguments) {
+    public CommandResult commandPM(User user_from, Jid from, URI attachment, String... arguments) {
         String body = arguments[1];
 
         User user_to = userService.getUserByName(arguments[0]);
@@ -140,15 +142,15 @@ public class CommandsManager {
                     jmsg.setTo(user_to);
                     jmsg.setText(body);
                     applicationEventPublisher.publishEvent(new MessageEvent(this, jmsg));
-                    return "Private message sent";
+                    return CommandResult.fromString("Private message sent");
                 }
             }
         }
-        return "Error";
+        return CommandResult.fromString("Error");
     }
     @UserCommand(pattern = "^bl$", patternFlags = Pattern.CASE_INSENSITIVE,
             help = "BL - Show your blacklist")
-    public String commandBLShow(User user_from, Jid from, URI attachment, String... arguments) {
+    public CommandResult commandBLShow(User user_from, Jid from, URI attachment, String... arguments) {
         List<User> blusers = userService.getUserBLUsers(user_from.getUid());
         List<String> bltags = tagService.getUserBLTags(user_from.getUid());
 
@@ -171,17 +173,17 @@ public class CommandsManager {
             txt = "You don't have any users or tags in your blacklist.";
         }
 
-        return txt;
+        return CommandResult.fromString(txt);
     }
 
     @UserCommand(pattern = "^#\\+$", help = "#+ - Show last Juick messages")
-    public String commandLast(User user_from, Jid from, URI attachment, String... arguments) {
-        return "Last messages:\n"
-                + printMessages(messagesService.getAll(user_from.getUid(), 0), true);
+    public CommandResult commandLast(User user_from, Jid from, URI attachment, String... arguments) {
+        return CommandResult.fromString("Last messages:\n"
+                + printMessages(messagesService.getAll(user_from.getUid(), 0), true));
     }
 
     @UserCommand(pattern = "@", help = "@ - Show recommendations and popular personal blogs")
-    public String commandUsers(User user_from, Jid from, URI attachment, String... arguments) {
+    public CommandResult commandUsers(User user_from, Jid from, URI attachment, String... arguments) {
         StringBuilder msg = new StringBuilder();
         msg.append("Recommended blogs");
         List<String> recommendedUsers = showQueriesService.getRecommendedUsers(user_from);
@@ -201,49 +203,49 @@ public class CommandsManager {
         } else {
             msg.append("\nNo top users. Empty DB? ;)");
         }
-        return msg.toString();
+        return CommandResult.fromString(msg.toString());
     }
     @UserCommand(pattern = "^bl\\s+@([^\\s\\n\\+]+)", patternFlags = Pattern.CASE_INSENSITIVE,
             help = "BL @username - add @username to your blacklist")
-    public String blacklistUser(User user_from, Jid from, URI attachment, String... arguments) {
+    public CommandResult blacklistUser(User user_from, Jid from, URI attachment, String... arguments) {
         User blUser = userService.getUserByName(arguments[0]);
         if (blUser != null) {
             PrivacyQueriesService.PrivacyResult result = privacyQueriesService.blacklistUser(user_from, blUser);
             if (result == PrivacyQueriesService.PrivacyResult.Added) {
-                return "User added to your blacklist";
+                return CommandResult.fromString("User added to your blacklist");
             } else {
-                return "User removed from your blacklist";
+                return CommandResult.fromString("User removed from your blacklist");
             }
         }
-        return "User not found";
+        return CommandResult.fromString("User not found");
     }
     @UserCommand(pattern = "^bl\\s\\*(\\S+)$", patternFlags = Pattern.CASE_INSENSITIVE,
             help = "BL *tag - add *tag to your blacklist")
-    public String blacklistTag(User user_from, Jid from, URI attachment, String... arguments) {
+    public CommandResult blacklistTag(User user_from, Jid from, URI attachment, String... arguments) {
         User blUser = userService.getUserByName(arguments[0]);
         if (blUser != null) {
             Tag tag = tagService.getTag(arguments[0], false);
             if (tag != null) {
                 PrivacyQueriesService.PrivacyResult result = privacyQueriesService.blacklistTag(user_from, tag);
                 if (result == PrivacyQueriesService.PrivacyResult.Added) {
-                    return "Tag added to your blacklist";
+                    return CommandResult.fromString("Tag added to your blacklist");
                 } else {
-                    return "Tag removed from your blacklist";
+                    return CommandResult.fromString("Tag removed from your blacklist");
                 }
             }
         }
-        return "Tag not found";
+        return CommandResult.fromString("Tag not found");
     }
     @UserCommand(pattern = "\\*", help = "* - Show your tags")
-    public String commandTags(User currentUser, Jid from, URI attachment, String... args) {
+    public CommandResult commandTags(User currentUser, Jid from, URI attachment, String... args) {
         List<TagStats> tags = tagService.getUserTagStats(currentUser.getUid());
         String msg = "Your tags: (tag - messages)\n" +
                 tags.stream()
                         .map(t -> String.format("\n*%s - %d", t.getTag().getName(), t.getUsageCount())).collect(Collectors.joining());
-        return msg;
+        return CommandResult.fromString(msg);
     }
     @UserCommand(pattern = "S", help = "S - Show your subscriptions")
-    public String commandSubscriptions(User currentUser, Jid from, URI attachment, String... args) {
+    public CommandResult commandSubscriptions(User currentUser, Jid from, URI attachment, String... args) {
         List<User> friends = userService.getUserFriends(currentUser.getUid());
         List<String> tags = subscriptionService.getSubscribedTags(currentUser);
         String msg = friends.size() > 0 ? "You are subscribed to users:" + friends.stream().map(u -> "\n@" + u.getName())
@@ -252,97 +254,97 @@ public class CommandsManager {
         msg += tags.size() > 0 ? "\nYou are subscribed to tags:" + tags.stream().map(t -> "\n*" + t)
                 .collect(Collectors.joining())
                 : "\nYou are not subscribed to any tag.";
-        return msg;
+        return CommandResult.fromString(msg);
     }
     @UserCommand(pattern = "!", help = "! - Show your favorite messages")
-    public String commandFavorites(User currentUser, Jid from, URI attachment, String... args) {
+    public CommandResult commandFavorites(User currentUser, Jid from, URI attachment, String... args) {
         List<Integer> mids = messagesService.getUserRecommendations(currentUser.getUid(), 0);
         if (mids.size() > 0) {
-            return "Favorite messages: \n" + printMessages(mids, false);
+            return CommandResult.fromString("Favorite messages: \n" + printMessages(mids, false));
         }
-        return "No favorite messages, try to \"like\" something ;)";
+        return CommandResult.fromString("No favorite messages, try to \"like\" something ;)");
     }
     @UserCommand(pattern = "^\\!\\s+#(\\d+)", help = "! #12345 - recommend message")
-    public String commandRecommend(User user, Jid from, URI attachment, String... arguments) {
+    public CommandResult commandRecommend(User user, Jid from, URI attachment, String... arguments) {
         int mid = NumberUtils.toInt(arguments[0], 0);
         if (mid > 0) {
             com.juick.Message msg = messagesService.getMessage(mid);
             if (msg != null) {
                 if (msg.getUser() == user) {
-                    return "You can't recommend your own messages.";
+                    return CommandResult.fromString("You can't recommend your own messages.");
                 }
                 MessagesService.RecommendStatus status = messagesService.recommendMessage(mid, user.getUid());
                 switch (status) {
                     case Added:
                         applicationEventPublisher.publishEvent(new LikeEvent(this, user, msg));
-                        return "Message is added to your recommendations";
+                        return CommandResult.fromString("Message is added to your recommendations");
                     case Deleted:
-                        return "Message deleted from your recommendations.";
+                        return CommandResult.fromString("Message deleted from your recommendations.");
                 }
             }
-            return "Message not found";
+            return CommandResult.fromString("Message not found");
         }
-        return "Message not found";
+        return CommandResult.fromString("Message not found");
     }
     // TODO: target notification
     @UserCommand(pattern = "^(s|u)\\s+\\@(\\S+)$", help = "S @username - subscribe to user" +
             "\nU @username - unsubscribe from user", patternFlags = Pattern.CASE_INSENSITIVE)
-    public String commandSubscribeUser(User user, Jid from, URI attachment, String... args) {
+    public CommandResult commandSubscribeUser(User user, Jid from, URI attachment, String... args) {
         boolean subscribe = args[0].equalsIgnoreCase("s");
         User toUser = userService.getUserByName(args[1]);
         if (subscribe) {
             if (subscriptionService.subscribeUser(user, toUser)) {
                 // TODO: already subscribed case
                 applicationEventPublisher.publishEvent(new SubscribeEvent(this, user, toUser));
-                return "Subscribed to @" + toUser.getName();
+                return CommandResult.fromString("Subscribed to @" + toUser.getName());
             }
         } else {
             if (subscriptionService.unSubscribeUser(user, toUser)) {
-                return "Unsubscribed from @" + toUser.getName();
+                return CommandResult.fromString("Unsubscribed from @" + toUser.getName());
             }
-            return "You was not subscribed to @" + toUser.getName();
+            return CommandResult.fromString("You was not subscribed to @" + toUser.getName());
         }
-        return "Error";
+        return CommandResult.fromString("Error");
     }
     @UserCommand(pattern = "^(s|u)\\s+\\*(\\S+)$", help = "S *tag - subscribe to tag" +
             "\nU *tag - unsubscribe from tag", patternFlags = Pattern.CASE_INSENSITIVE)
-    public String commandSubscribeTag(User user, Jid from, URI attachment, String... args) {
+    public CommandResult commandSubscribeTag(User user, Jid from, URI attachment, String... args) {
         boolean subscribe = args[0].equalsIgnoreCase("s");
         Tag tag = tagService.getTag(args[1], true);
         if (subscribe) {
             if (subscriptionService.subscribeTag(user, tag)) {
-                return "Subscribed";
+                return CommandResult.fromString("Subscribed");
             }
         } else {
             if (subscriptionService.unSubscribeTag(user, tag)) {
-                return "Unsubscribed from " + tag.getName();
+                return CommandResult.fromString("Unsubscribed from " + tag.getName());
             }
-            return "You was not subscribed to " + tag.getName();
+            return CommandResult.fromString("You was not subscribed to " + tag.getName());
         }
-        return "Error";
+        return CommandResult.fromString("Error");
     }
     @UserCommand(pattern = "^(s|u)\\s+#(\\d+)$", help = "S #1234 - subscribe to comments" +
             "\nU #1234 - unsubscribe from comments", patternFlags = Pattern.CASE_INSENSITIVE)
-    public String commandSubscribeMessage(User user, Jid from, URI attachment, String... args) {
+    public CommandResult commandSubscribeMessage(User user, Jid from, URI attachment, String... args) {
         boolean subscribe = args[0].equalsIgnoreCase("s");
         int mid = NumberUtils.toInt(args[1], 0);
         if (messagesService.getMessage(mid) != null) {
             if (subscribe) {
                 if (subscriptionService.subscribeMessage(mid, user.getUid())) {
-                    return "Subscribed";
+                    return CommandResult.fromString("Subscribed");
                 }
             } else {
                 if (subscriptionService.unSubscribeMessage(mid, user.getUid())) {
-                    return "Unsubscribed from #" + mid;
+                    return CommandResult.fromString("Unsubscribed from #" + mid);
                 }
-                return "You was not subscribed to #" + mid;
+                return CommandResult.fromString("You was not subscribed to #" + mid);
             }
         }
-        return "Error";
+        return CommandResult.fromString("Error");
     }
     @UserCommand(pattern = "^(on|off)$", patternFlags = Pattern.CASE_INSENSITIVE,
             help = "ON/OFF - Enable/disable subscriptions delivery")
-    public String commandOnOff(User user, Jid from, URI attachment, String[] input) {
+    public CommandResult commandOnOff(User user, Jid from, URI attachment, String[] input) {
         UserService.ActiveStatus newStatus;
         String retValUpdated;
         if (input[0].toLowerCase().equals("on")) {
@@ -354,115 +356,115 @@ public class CommandsManager {
         }
 
         if (userService.setActiveStatusForJID(from.asBareJid().toEscapedString(), newStatus)) {
-            return retValUpdated;
+            return CommandResult.fromString(retValUpdated);
         } else {
-            return String.format("Subscriptions status for %s was not changed", from.toEscapedString());
+            return CommandResult.fromString(String.format("Subscriptions status for %s was not changed", from.toEscapedString()));
         }
     }
     @UserCommand(pattern = "^\\@([^\\s\\n\\+]+)(\\+?)$",
             help = "@username+ - Show user's info and last 20 messages")
-    public String commandUser(User user, Jid from, URI attachment, String... arguments) {
+    public CommandResult commandUser(User user, Jid from, URI attachment, String... arguments) {
         User blogUser = userService.getUserByName(arguments[0]);
         int page = arguments[1].length();
         if (blogUser.getUid() > 0) {
             List<Integer> mids = messagesService.getUserBlog(blogUser.getUid(), 0, 0);
-            return String.format("Last messages from @%s:\n%s", arguments[0],
-                    printMessages(mids, false));
+            return CommandResult.fromString(String.format("Last messages from @%s:\n%s", arguments[0],
+                    printMessages(mids, false)));
         }
-        return "User not found";
+        return CommandResult.fromString("User not found");
     }
     @UserCommand(pattern = "^#(\\d+)(\\+?)$", help = "#1234 - Show message (#1234+ - message with replies)")
-    public String commandShow(User user, Jid from, URI attachment, String... arguments) {
+    public CommandResult commandShow(User user, Jid from, URI attachment, String... arguments) {
         boolean showReplies = arguments[1].length() > 0;
         int mid = NumberUtils.toInt(arguments[0], 0);
         if (mid == 0) {
-            return "Error";
+            return CommandResult.fromString("Error");
         }
         com.juick.Message msg = messagesService.getMessage(mid);
         if (msg != null) {
             if (showReplies) {
                 List<com.juick.Message> replies = messagesService.getReplies(mid);
                 replies.add(0, msg);
-                return String.join("\n",
-                        replies.stream().map(PlainTextFormatter::formatPostSummary).collect(Collectors.toList()));
+                return CommandResult.fromString(String.join("\n",
+                        replies.stream().map(PlainTextFormatter::formatPostSummary).collect(Collectors.toList())));
             }
-            return PlainTextFormatter.formatPost(msg);
+            return CommandResult.fromString(PlainTextFormatter.formatPost(msg));
         }
-        return "Message not found";
+        return CommandResult.fromString("Message not found");
     }
     @UserCommand(pattern = "^#(\\d+)\\/(\\d+)$", help = "#1234/5 - Show reply")
-    public String commandShowReply(User user, Jid from, URI attachment, String... arguments) {
+    public CommandResult commandShowReply(User user, Jid from, URI attachment, String... arguments) {
         int mid = NumberUtils.toInt(arguments[0], 0);
         int rid = NumberUtils.toInt(arguments[1], 0);
         com.juick.Message reply = messagesService.getReply(mid, rid);
         if (reply != null) {
-            return PlainTextFormatter.formatPost(reply);
+            return CommandResult.fromString(PlainTextFormatter.formatPost(reply));
         }
-        return "Reply not found";
+        return CommandResult.fromString("Reply not found");
     }
     @UserCommand(pattern = "^\\*(\\S+)(\\+?)$", help = "*tag - Show last messages with tag")
-    public String commandShowTag(User user, Jid from, URI attachment, String... arguments) {
+    public CommandResult commandShowTag(User user, Jid from, URI attachment, String... arguments) {
         Tag tag = tagService.getTag(arguments[0], false);
         if (tag != null) {
             // TODO: synonims
             List<Integer> mids = messagesService.getTag(tag.TID, user.getUid(), 0, 10);
-            return "Last messages with *" + tag.getName() + ":\n" + printMessages(mids, true);
+            return CommandResult.fromString("Last messages with *" + tag.getName() + ":\n" + printMessages(mids, true));
         }
-        return "Tag not found";
+        return CommandResult.fromString("Tag not found");
     }
     @UserCommand(pattern = "^D #(\\d+)$", help = "D #1234 - Delete post", patternFlags = Pattern.CASE_INSENSITIVE)
-    public String commandDeletePost(User user, Jid from, URI attachment, String... args) {
+    public CommandResult commandDeletePost(User user, Jid from, URI attachment, String... args) {
         int mid = Integer.valueOf(args[0]);
         if (messagesService.deleteMessage(user.getUid(), mid)) {
-            return "Message deleted";
+            return CommandResult.fromString("Message deleted");
         }
-        return "This is not your message";
+        return CommandResult.fromString("This is not your message");
     }
     @UserCommand(pattern = "^D #(\\d+)(\\.|\\-|\\/)(\\d+)$", help = "D #1234/5 - Delete comment", patternFlags = Pattern.CASE_INSENSITIVE)
-    public String commandDeleteReply(User user, Jid from, URI attachment, String... args) {
+    public CommandResult commandDeleteReply(User user, Jid from, URI attachment, String... args) {
         int mid = Integer.valueOf(args[0]);
         int rid = Integer.valueOf(args[2]);
         if (messagesService.deleteReply(user.getUid(), mid, rid)) {
-            return "Reply deleted";
+            return CommandResult.fromString("Reply deleted");
         } else {
-            return "This is not your reply";
+            return CommandResult.fromString("This is not your reply");
         }
     }
     @UserCommand(pattern = "^(D L|DL|D LAST)$", help = "D L - Delete last message", patternFlags = Pattern.CASE_INSENSITIVE)
-    public String commandDeleteLast(User user, Jid from, URI attachment, String... args) {
-        return "Temporarily unavailable";
+    public CommandResult commandDeleteLast(User user, Jid from, URI attachment, String... args) {
+        return CommandResult.fromString("Temporarily unavailable");
     }
     @UserCommand(pattern = "^\\?\\s+\\@([a-zA-Z0-9\\-\\.\\@]+)\\s+([\\s\\S]+)$", help = "? @user string - search in user messages")
-    public String commandSearch(User user, Jid from, URI attachment, String... args) {
-        return "Temporarily unavailable";
+    public CommandResult commandSearch(User user, Jid from, URI attachment, String... args) {
+        return CommandResult.fromString("Temporarily unavailable");
     }
     @UserCommand(pattern = "^\\?\\s+([\\s\\S]+)$", help = "? string - search in all messages")
-    public String commandSearchAll(User user, Jid from, URI attachment, String... args) {
-        return "Temporarily unavailable";
+    public CommandResult commandSearchAll(User user, Jid from, URI attachment, String... args) {
+        return CommandResult.fromString("Temporarily unavailable");
     }
     @UserCommand(pattern = "^(#+)$", help = "# - Show last messages from your feed (## - second page, ...)")
-    public String commandMyFeed(User user, Jid from, URI attachment, String... arguments) {
+    public CommandResult commandMyFeed(User user, Jid from, URI attachment, String... arguments) {
         // number of # is the page count
         int page = arguments[0].length() - 1;
         List<Integer> mids = messagesService.getMyFeed(user.getUid(), page, false);
         if (mids.size() > 0) {
-            return "Your feed: \n" + printMessages(mids, true);
+            return CommandResult.fromString("Your feed: \n" + printMessages(mids, true));
         }
-        return "Your feed is empty";
+        return CommandResult.fromString("Your feed is empty");
     }
     @UserCommand(pattern = "^(#|\\.)(\\d+)((\\.|\\-|\\/)(\\d+))?\\s([\\s\\S]+)",
             help = "#1234 *tag *tag2 - edit tags\n#1234 text - reply to message")
-    public String EditOrReply(User user, Jid from, URI attachment, String... args) throws Exception {
+    public CommandResult EditOrReply(User user, Jid from, URI attachment, String... args) throws Exception {
         int mid = NumberUtils.toInt(args[1]);
         int rid = NumberUtils.toInt(args[4], 0);
         String txt = args[5];
         List<Tag> messageTags = tagService.fromString(txt, true);
         if (messageTags.size() > 0) {
             if (user.getUid() != messagesService.getMessageAuthor(mid).getUid()) {
-                return "It is not your message";
+                return CommandResult.fromString("It is not your message");
             }
             tagService.updateTags(mid, messageTags);
-            return "Tags are updated";
+            return CommandResult.fromString("Tags are updated");
         } else {
             String attachmentType = attachment != null ? attachment.toString().substring(attachment.toString().length() - 3) : null;
             int newrid = messagesService.createReply(mid, rid, user.getUid(), txt, attachmentType);
@@ -472,9 +474,10 @@ public class CommandsManager {
                 String fname = String.format("%d-%d.%s", mid, newrid, attachmentType);
                 ImageUtils.saveImageWithPreviews(attachmentFName, fname, tmpDir, imgDir);
             }
-            applicationEventPublisher.publishEvent(new MessageEvent(this, messagesService.getReply(mid, newrid)));
-            return "Reply posted.\n#" + mid + "/" + newrid + " "
-                    + "https://juick.com/" + mid + "#" + newrid;
+            Message reply = messagesService.getReply(mid, newrid);
+            applicationEventPublisher.publishEvent(new MessageEvent(this, reply));
+            return CommandResult.fromMessage(reply,"Reply posted.\n#" + mid + "/" + newrid + " "
+                    + "https://juick.com/" + mid + "#" + newrid);
         }
     }
 
diff --git a/juick-server/src/main/java/com/juick/server/MessengerManager.java b/juick-server/src/main/java/com/juick/server/MessengerManager.java
index 1fe04aca..adef1e22 100644
--- a/juick-server/src/main/java/com/juick/server/MessengerManager.java
+++ b/juick-server/src/main/java/com/juick/server/MessengerManager.java
@@ -96,7 +96,11 @@ public class MessengerManager implements ApplicationListener<MessageEvent> {
                     final String text = textMessageEvent.text();
                     logger.info("Received text message from '{}' at '{}' with content: {} (mid: {})",
                             senderId, timestamp, text, messageId);
-                    serverManager.processMessage(user_from, text, null);
+                    try {
+                        serverManager.processMessage(user_from, text, null);
+                    } catch (Exception e) {
+                        logger.warn("messenger error", e);
+                    }
                     messengerNotify(senderId, "Message sent", null);
                 }
             }
diff --git a/juick-server/src/main/java/com/juick/server/ServerManager.java b/juick-server/src/main/java/com/juick/server/ServerManager.java
index 22b78905..6cac270c 100644
--- a/juick-server/src/main/java/com/juick/server/ServerManager.java
+++ b/juick-server/src/main/java/com/juick/server/ServerManager.java
@@ -30,13 +30,10 @@ import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
 import org.springframework.web.socket.TextMessage;
 import rocks.xmpp.addr.Jid;
-import rocks.xmpp.core.stanza.model.Message;
-import rocks.xmpp.extensions.oob.model.x.OobX;
 
 import javax.inject.Inject;
 import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -58,31 +55,16 @@ public class ServerManager implements ApplicationListener<MessageEvent> {
     @Value("${service_user:juick}")
     private String serviceUser;
     @Inject
-    private XMPPConnection xmppConnection;
+    private XMPPConnection router;
 
-    public void sendMessage(Message message) {
-        xmppConnection.getRouter().sendMessage(message);
-    }
-
-    public void processMessage(User visitor, String body, String attachmentName) {
-        Message xmsg = new Message();
-        xmsg.setFrom(Jid.of(String.valueOf(visitor.getUid()), "uid.juick.com", "perl"));
-        xmsg.setTo(Jid.of("juick@juick.com/Juick"));
-        xmsg.setBody(body);
-        try {
-            if (StringUtils.isNotEmpty(attachmentName)) {
-                URI httpUri = URI.create(attachmentName);
-                if (httpUri.isAbsolute()) {
-                    xmsg.addExtension(new OobX(httpUri));
-                } else {
-                    String attachmentUrl = String.format("juick://%s", attachmentName);
-                    xmsg.addExtension(new OobX(new URI(attachmentUrl), "!!!!Juick!!"));
-                }
+    public com.juick.Message processMessage(User visitor, String body, String attachmentName) throws Exception {
+        if (StringUtils.isNotEmpty(attachmentName)) {
+            URI httpUri = URI.create(attachmentName);
+            if (!httpUri.isAbsolute()) {
+                attachmentName = String.format("juick://%s", attachmentName);
             }
-        } catch (URISyntaxException e1) {
-            logger.warn("attachment error", e1);
         }
-        sendMessage(xmsg);
+        return router.incomingMessageJuick(visitor, Jid.of(String.valueOf(visitor.getUid()), "uid.juick.com", "perl"), body, URI.create(attachmentName));
     }
 
     private void onJuickPM(final int uid_to, final com.juick.Message jmsg) {
diff --git a/juick-server/src/main/java/com/juick/server/WebsocketManager.java b/juick-server/src/main/java/com/juick/server/WebsocketManager.java
index b63377aa..309f605c 100644
--- a/juick-server/src/main/java/com/juick/server/WebsocketManager.java
+++ b/juick-server/src/main/java/com/juick/server/WebsocketManager.java
@@ -153,7 +153,7 @@ public class WebsocketManager extends TextWebSocketHandler {
                         String attachmentFileName = draft.getAttachment() == null ? "" : draft.getAttachment().getUrl();
                         serverManager.processMessage(draft.getUser(), draft.getText(), attachmentFileName);
                     }
-                } catch (IOException e) {
+                } catch (Exception e) {
                     throw new HttpBadRequestException();
                 }
             } else {
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 942b4787..c45fc7cd 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPConnection.java
+++ b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
@@ -27,6 +27,7 @@ import com.juick.server.helpers.UserInfo;
 import com.juick.server.util.HttpUtils;
 import com.juick.server.util.ImageUtils;
 import com.juick.server.util.TagUtils;
+import com.juick.server.xmpp.helpers.CommandResult;
 import com.juick.server.xmpp.s2s.BasicXmppSession;
 import com.juick.server.xmpp.s2s.StanzaListener;
 import com.juick.service.*;
@@ -123,6 +124,8 @@ public class XMPPConnection implements StanzaListener, NotificationListener {
     @Inject
     private ExecutorService service;
     @Inject
+    private ServerManager serverManager;
+    @Inject
     private ApplicationEventPublisher applicationEventPublisher;
 
     @PostConstruct
@@ -237,18 +240,12 @@ public class XMPPConnection implements StanzaListener, NotificationListener {
                         logger.debug("{}: received {} of {}", e.getName(), st.getBytesTransferred(), e.getSize());
                         if (st.getStatus().equals(FileTransfer.Status.COMPLETED)) {
                             logger.info("transfer completed");
-                            Message msg = new Message();
-                            msg.setType(Message.Type.CHAT);
-                            msg.setFrom(e.getInitiator());
-                            msg.setTo(jid);
-                            msg.setBody(e.getDescription());
                             try {
-                                String attachmentUrl = String.format("juick://%s", targetFilename);
-                                msg.addExtension(new OobX(new URI(attachmentUrl), "!!!!Juick!!"));
-                                router.sendMessage(msg);
-                            } catch (URISyntaxException e1) {
-                                logger.warn("attachment error", e1);
+                                serverManager.processMessage(userService.getUserByJID(e.getInitiator().toEscapedString()),  e.getDescription(), targetFilename);
+                            } catch (Exception e1) {
+                                logger.error("ft error", e1);
                             }
+
                         } else if (st.getStatus().equals(FileTransfer.Status.FAILED)) {
                             logger.info("transfer failed", ft.getException());
                             Message msg = new Message();
@@ -660,17 +657,15 @@ public class XMPPConnection implements StanzaListener, NotificationListener {
             command = command.substring(3).trim();
         }
 
-        Optional<String> result = commandsManager.processCommand(user_from, from, command, attachment);
+        Optional<CommandResult> result = commandsManager.processCommand(user_from, from, command, attachment);
         if (result.isPresent()) {
-            sendReply(from, result.get());
-            com.juick.Message msg = new com.juick.Message();
-            msg.setText(result.get());
-            return msg;
+            sendReply(from, result.get().getText());
+            return result.get().getNewMessage();
         } else {
             // new message
             List<Tag> tags = tagService.fromString(command, false);
             String body = command.substring(TagUtils.toString(tags).length());
-            String attachmentType = attachment != null ? attachment.toString().substring(attachment.toString().length() - 3) : null;
+            String attachmentType = StringUtils.isNotEmpty(attachment.toString()) ? attachment.toString().substring(attachment.toString().length() - 3) : null;
             int mid = messagesService.createMessage(user_from.getUid(), body, attachmentType, tags);
             subscriptionService.subscribeMessage(mid, user_from.getUid());
             if (StringUtils.isNotEmpty(attachmentType)) {
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 6bab5b41..3d9703fd 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
@@ -22,7 +22,9 @@ import com.juick.User;
 import com.juick.server.EmailManager;
 import com.juick.server.ServerManager;
 import com.juick.server.CommandsManager;
+import com.juick.server.XMPPConnection;
 import com.juick.server.util.*;
+import com.juick.server.xmpp.helpers.CommandResult;
 import com.juick.service.MessagesService;
 import com.juick.service.SubscriptionService;
 import com.juick.service.UserService;
@@ -88,7 +90,7 @@ public class Post {
     public void doPostMessage(
             @RequestParam String body,
             @RequestParam(required = false) String img,
-            @RequestParam(required = false) MultipartFile attach) throws IOException {
+            @RequestParam(required = false) MultipartFile attach) throws Exception {
         User visitor = UserUtils.getCurrentUser();
 
         if (visitor.isAnonymous())
@@ -124,7 +126,7 @@ public class Post {
             @RequestParam String body,
             @RequestParam(required = false) String img,
             @RequestParam(required = false) MultipartFile attach)
-            throws IOException {
+            throws Exception {
         User visitor = UserUtils.getCurrentUser();
         int vuid = visitor.getUid();
         if (vuid == 0) {
@@ -167,46 +169,7 @@ public class Post {
             }
         }
 
-        String attachmentType = StringUtils.isNotEmpty(attachmentFName) ? attachmentFName.substring(attachmentFName.length() - 3) : null;
-        int ridnew = messagesService.createReply(mid, rid, vuid, body, attachmentType);
-        subscriptionService.subscribeMessage(mid, vuid);
-
-        com.juick.Message jmsg = messagesService.getReply(mid, ridnew);
-
-        Message xmsg = new Message();
-        xmsg.setFrom(Jid.of("juick@juick.com"));
-        xmsg.setType(Message.Type.CHAT);
-        xmsg.setThread("juick-" + mid);
-        xmsg.addExtension(jmsg);
-
-        String quote = reply != null ? StringUtils.defaultString(reply.getText()) : StringUtils.defaultString(msg.getText());
-        if (quote.length() >= 50) {
-            quote = quote.substring(0, 47) + "...";
-        }
-
-        xmsg.addExtension(new Nickname("@" + jmsg.getUser().getName()));
-
-        if (StringUtils.isNotEmpty(attachmentFName)) {
-            String fname = mid + "-" + ridnew + "." + attachmentType;
-            String attachmentURL = "http://i.juick.com/photos-1024/" + fname;
-
-            ImageUtils.saveImageWithPreviews(attachmentFName, fname, tmpDir, imgDir);
-
-            body = attachmentURL + "\n" + body;
-            try {
-                xmsg.addExtension(new OobX(new URI(attachmentURL)));
-            } catch (URISyntaxException e) {
-                logger.error("invalid uri: {}, exception {}", attachmentURL, e);
-            }
-        }
-
-        xmsg.setBody("Reply by @" + jmsg.getUser().getName() + ":\n>" + quote + "\n" + body + "\n\n#" +
-                mid + "/" + ridnew + " http://juick.com/" + mid + "#" + ridnew);
-
-        xmsg.setTo(Jid.of("juick@s2s.juick.com"));
-        serverManager.sendMessage(xmsg);
-
-        return jmsg;
+        return serverManager.processMessage(visitor, body, attachmentFName);
     }
 
     Session session = Session.getDefaultInstance(new Properties());
@@ -268,20 +231,7 @@ public class Post {
                     body[0] = rid > 0 ? String.format("#%d/%d %s", mid, rid, body[0])
                             : String.format("#%d %s", mid, body[0]);
                 }
-                rocks.xmpp.core.stanza.model.Message xmsg = new rocks.xmpp.core.stanza.model.Message();
-                xmsg.setType(rocks.xmpp.core.stanza.model.Message.Type.CHAT);
-                xmsg.setFrom(Jid.of(String.valueOf(visitor.getUid()), "uid.juick.com", "mail"));
-                xmsg.setTo(Jid.of("juick@juick.com/Juick"));
-                xmsg.setBody(body[0]);
-                try {
-                    if (StringUtils.isNotEmpty(attachmentFName[0])) {
-                        String attachmentUrl = String.format("juick://%s", attachmentFName[0]);
-                        xmsg.addExtension(new OobX(new URI(attachmentUrl), "!!!!Juick!!"));
-                    }
-                    serverManager.sendMessage(xmsg);
-                } catch (URISyntaxException e1) {
-                    logger.warn("attachment error", e1);
-                }
+                serverManager.processMessage(visitor, body[0], attachmentFName[0]);
             } else {
                 logger.info("not registered: {}", from);
             }
@@ -303,7 +253,7 @@ public class Post {
         if (msg.getUser().getUid() == visitor.getUid()) {
             throw new HttpForbiddenException();
         }
-        String status = commandsManager.commandRecommend(visitor, null, null, String.valueOf(mid));
-        return Status.getStatus(status);
+        CommandResult status = commandsManager.commandRecommend(visitor, null, null, String.valueOf(mid));
+        return Status.getStatus(status.getText());
     }
 }
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/helpers/CommandResult.java b/juick-server/src/main/java/com/juick/server/xmpp/helpers/CommandResult.java
new file mode 100644
index 00000000..f952b579
--- /dev/null
+++ b/juick-server/src/main/java/com/juick/server/xmpp/helpers/CommandResult.java
@@ -0,0 +1,28 @@
+package com.juick.server.xmpp.helpers;
+
+import com.juick.Message;
+
+public class CommandResult {
+    private String text;
+    private Message newMessage;
+
+    public String getText() {
+        return text;
+    }
+
+    public Message getNewMessage() {
+        return newMessage;
+    }
+    public static CommandResult fromMessage(Message newMessage, String text) {
+        CommandResult result = new CommandResult();
+        result.newMessage = newMessage;
+        result.text = text;
+        return result;
+    }
+    public static CommandResult fromString(String text) {
+        CommandResult result = new CommandResult();
+        result.text = text;
+        return result;
+    }
+
+}
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 92d05828..97c10380 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
@@ -540,9 +540,9 @@ public class ServerTests {
     }
     @Test
     public void botCommandsTests() throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {
-        assertThat(commandsManager.processCommand(new User(), Jid.of("test@localhost"), "PING", null).get(), is("PONG"));
+        assertThat(commandsManager.processCommand(new User(), Jid.of("test@localhost"), "PING", null).get().getText(), is("PONG"));
         // subscription commands have two lines, others have 1
-        assertThat(commandsManager.processCommand(new User(), Jid.of("test@localhost"), "help", null).get().split("\n").length, is(32));
+        assertThat(commandsManager.processCommand(new User(), Jid.of("test@localhost"), "help", null).get().getText().split("\n").length, is(32));
     }
 
     @Test
@@ -553,10 +553,10 @@ public class ServerTests {
         Message msg = router.incomingMessageJuick(user, Jid.of("test@localhost"), "*yo yoyo", URI.create("http://static.juick.com/settings/facebook.png"));
         assertThat(msg.getAttachmentType(), is("png"));
         Message msgreply = router.incomingMessageJuick(user, Jid.of("test@localhost"), "#" + msg.getMid() + " yyy", URI.create("juick://" + HttpUtils.downloadImage(URI.create("http://static.juick.com/settings/xmpp.png").toURL(), tmpDir)));
-        assertThat(messagesService.getReply(msg.getMid(), 1).getAttachmentType(), equalTo("png"));
+        assertThat(msgreply.getAttachmentType(), equalTo("png"));
         int mid = messagesService.createMessage(uid, "yoyo", null, Collections.singletonList(yo));
         assertEquals("should be message", true,
-                commandsManager.processCommand(user, Jid.of("test@localhost"), String.format("#%d", mid), null).get().startsWith("@me"));
+                commandsManager.processCommand(user, Jid.of("test@localhost"), String.format("#%d", mid), null).get().getText().startsWith("@me"));
         assertEquals("text should match", "yoyo",
                 messagesService.getMessage(mid).getText());
         assertEquals("tag should match", "yo",
@@ -565,9 +565,9 @@ public class ServerTests {
         User readerUser = userService.getUserByUID(readerUid).orElse(new User());
         Jid dummyJid = Jid.of("dummy@localhost");
         assertEquals("should be subscribed", "Subscribed",
-                commandsManager.processCommand(readerUser, dummyJid, "S #" + mid, null).get());
+                commandsManager.processCommand(readerUser, dummyJid, "S #" + mid, null).get().getText());
         assertEquals("should be favorited", "Message is added to your recommendations",
-                commandsManager.processCommand(readerUser, dummyJid, "! #" + mid, null).get());
+                commandsManager.processCommand(readerUser, dummyJid, "! #" + mid, null).get().getText());
         int rid = messagesService.createReply(mid, 0, uid, "comment", null);
         assertEquals("number of subscribed users should match", 1,
                 subscriptionService.getUsersSubscribedToComments(
@@ -579,7 +579,7 @@ public class ServerTests {
                         messagesService.getMessage(mid),
                         messagesService.getReply(mid, rid)).size());
         assertEquals("should be subscribed", "Subscribed to @" + user.getName(),
-                commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "S @" + user.getName(), null).get());
+                commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "S @" + user.getName(), null).get().getText());
         List<User> friends = userService.getUserFriends(readerUid);
         assertEquals("number of friend users should match", 2,
                 friends.size());
@@ -590,57 +590,57 @@ public class ServerTests {
         String expectedThirdReply = "Reply posted.\n#" + mid + "/3 "
                 + "https://juick.com/" + mid + "#3";
         assertEquals("should be second reply", expectedSecondReply,
-                commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid + " yoyo", null).get());
+                commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid + " yoyo", null).get().getText());
         assertEquals("should be third reply", expectedThirdReply,
-                commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid + "/2 yoyo", null).get());
+                commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid + "/2 yoyo", null).get().getText());
         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",
-                commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "#" + mid + " *yo *there", null).get());
+                commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "#" + mid + " *yo *there", null).get().getText());
         assertEquals("tags should be updated", "Tags are updated",
-                commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid + " *there", null).get());
+                commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid + " *there", null).get().getText());
         assertEquals("number of tags should match", 2,
                 tagService.getMessageTags(mid).size());
         assertEquals("should be blacklisted", "Tag added to your blacklist",
-                commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "BL *there", null).get());
+                commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "BL *there", null).get().getText());
         assertEquals("number of subscribed users should match", 0,
                 subscriptionService.getSubscribedUsers(uid, mid).size());
         assertEquals("tags should be updated", "Tags are updated",
-                commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid + " *there", null).get());
+                commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid + " *there", null).get().getText());
         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",
-                commandsManager.processCommand(taggerUser, Jid.of("tagger@localhost"), "S *yo", null).get());
+                commandsManager.processCommand(taggerUser, Jid.of("tagger@localhost"), "S *yo", null).get().getText());
         assertEquals("number of subscribed users should match", 2,
                 subscriptionService.getSubscribedUsers(uid, mid).size());
         assertEquals("should be unsubscribed", "Unsubscribed from yo",
-                commandsManager.processCommand(taggerUser, Jid.of("tagger@localhost"), "U *yo", null).get());
+                commandsManager.processCommand(taggerUser, Jid.of("tagger@localhost"), "U *yo", null).get().getText());
         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 = commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "#", null).get();
+        String readerFeed = commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "#", null).get().getText();
         assertEquals("description should match", true, readerFeed.startsWith("Your feed"));
         assertEquals("should be unsubscribed", "Unsubscribed from @" + user.getName(),
-                commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "U @" + user.getName(), null).get());
+                commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "U @" + user.getName(), null).get().getText());
         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,
-                commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "u #" + mid, null).get());
+                commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "u #" + mid, null).get().getText());
         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),
-                commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "D #" + mid, null).get());
+                commandsManager.processCommand(readerUser, Jid.of("dummy@localhost"), "D #" + mid, null).get().getText());
         assertEquals("should be deleted", "Message deleted",
-                commandsManager.processCommand(user, Jid.of("test@localhost"), "D #" + mid, null).get());
+                commandsManager.processCommand(user, Jid.of("test@localhost"), "D #" + mid, null).get().getText());
         assertEquals("should be not found", "Message not found",
-                commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid, null).get());
+                commandsManager.processCommand(user, Jid.of("test@localhost"), "#" + mid, null).get().getText());
     }
     @Test
     public void mailParserTest() throws Exception {