diff options
Diffstat (limited to 'juick-server/src/main/java/com/juick/server/CommandsManager.java')
| -rw-r--r-- | juick-server/src/main/java/com/juick/server/CommandsManager.java | 193 |
1 files changed, 98 insertions, 95 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); } } |