1 files changed, 4 insertions, 237 deletions
diff --git a/juick-server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java b/juick-server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java
index 1d5b8dbf..9cb37151 100644
--- a/juick-server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java
+++ b/juick-server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java
@@ -21,18 +21,18 @@ import com.juick.Message;
 import com.juick.Tag;
 import com.juick.User;
 import com.juick.formatters.PlainTextFormatter;
-import com.juick.server.helpers.TagStats;
 import com.juick.server.protocol.annotation.UserCommand;
 import com.juick.server.util.TagUtils;
 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 javax.inject.Inject;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -106,150 +106,8 @@ public class JuickProtocol {
         return "New message posted.\n#" + mid + " " + baseUri + mid;
     }
 
-    @UserCommand(pattern = "^#\\+$", help = "#+ - Show last Juick messages")
-    public String commandLast(User user, String... arguments) {
-        List<Integer> mids = messagesService.getAll(user.getUid(), 0);
-        List<Message> messages = messagesService.getMessages(mids);
-        return "Last messages: \n"
-                + messages.stream().sorted(Collections.reverseOrder()).map(PlainTextFormatter::formatPostSummary)
-                .collect(Collectors.joining("\n\n"));
-    }
-
-    @UserCommand(pattern = "^bl$", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "BL - Show your blacklist")
-    public String commandBL(User user_from, String... arguments) {
-        List<User> blusers;
-        List<String> bltags;
-
-        blusers = userService.getUserBLUsers(user_from.getUid());
-        bltags = tagService.getUserBLTags(user_from.getUid());
-
-
-        String txt = StringUtils.EMPTY;
-        if (bltags.size() > 0) {
-            for (String bltag : bltags) {
-                txt += "*" + bltag + "\n";
-            }
-
-            if (blusers.size() > 0) {
-                txt += "\n";
-            }
-        }
-        if (blusers.size() > 0) {
-            for (User bluser : blusers) {
-                txt += "@" + bluser.getName() + "\n";
-            }
-        }
-        if (txt.isEmpty()) {
-            txt = "You don't have any users or tags in your blacklist.";
-        }
-        return txt;
-    }
 
-    @UserCommand(pattern = "^bl\\s+@([^\\s\\n\\+]+)", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "BL @username - add @username to your blacklist")
-    public String blacklistUser(User from, String... arguments) {
-        User blUser = userService.getUserByName(arguments[0]);
-        if (blUser != null) {
-            PrivacyQueriesService.PrivacyResult result = privacyQueriesService.blacklistUser(from, blUser);
-            if (result == PrivacyQueriesService.PrivacyResult.Added) {
-                return "User added to your blacklist";
-            } else {
-                return "User removed from your blacklist";
-            }
-        }
-        return "User not found";
-    }
 
-    @UserCommand(pattern = "^bl\\s\\*(\\S+)$", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "BL *tag - add *tag to your blacklist")
-    public String blacklistTag(User from, 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(from, tag);
-                if (result == PrivacyQueriesService.PrivacyResult.Added) {
-                    return "Tag added to your blacklist";
-                } else {
-                    return "Tag removed from your blacklist";
-                }
-            }
-        }
-        return "Tag not found";
-    }
-
-    @UserCommand(pattern = "@", help = "@ - Show recommendations and popular personal blogs")
-    public String commandUsers(User currentUser, String... args) {
-        StringBuilder msg = new StringBuilder();
-        msg.append("Recommended blogs");
-        List<String> recommendedUsers = showQueriesService.getRecommendedUsers(currentUser);
-        if (recommendedUsers.size() > 0) {
-            for (String user : recommendedUsers) {
-                msg.append("\n@").append(user);
-            }
-        } else {
-            msg.append("\nNo recommendations now. Subscribe to more blogs. ;)");
-        }
-        msg.append("\n\nTop 10 personal blogs:");
-        List<String> topUsers = showQueriesService.getTopUsers();
-        if (topUsers.size() > 0) {
-            for (String user : topUsers) {
-                msg.append("\n@").append(user);
-            }
-        } else {
-            msg.append("\nNo top users. Empty DB? ;)");
-        }
-        return msg.toString();
-    }
-
-    @UserCommand(pattern = "\\*", help = "* - Show your tags")
-    public String commandTags(User currentUser, 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;
-    }
-
-    @UserCommand(pattern = "S", help = "S - Show your subscriptions")
-    public String commandSubscriptions(User currentUser, 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())
-                .collect(Collectors.joining())
-                : "You are not subscribed to any user.";
-        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;
-    }
-
-    @UserCommand(pattern = "!", help = "! - Show your favorite messages")
-    public String commandFavorites(User currentUser, String... args) {
-        List<Integer> mids = messagesService.getUserRecommendations(currentUser.getUid(), 0);
-        if (mids.size() > 0) {
-            List<Message> messages = messagesService.getMessages(mids);
-            return "Favorite messages: \n" + String.join("\n", messages.stream().map(PlainTextFormatter::formatPost)
-                    .collect(Collectors.toList()));
-        }
-        return "No favorite messages, try to \"like\" something ;)";
-    }
-
-    @UserCommand(pattern = "^\\@([^\\s\\n\\+]+)(\\+?)$",
-            help = "@username+ - Show user's info and last 10 messages (@username++ - second page, ..)")
-    public String commandUser(User user, 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, page);
-            List<Message> messages = messagesService.getMessages(mids);
-            return String.format("Last messages from @%s:\n%s", arguments[0],
-                    String.join("\n", messages.stream()
-                            .map(PlainTextFormatter::formatPost).collect(Collectors.toList())));
-        }
-        return "User not found";
-    }
 
     @UserCommand(pattern = "^d\\s*\\#([0-9]+)$", patternFlags = Pattern.CASE_INSENSITIVE,
             help = "D #12345 - delete the message")
@@ -261,11 +119,6 @@ public class JuickProtocol {
         return "Error";
     }
 
-    @UserCommand(pattern = "^login$", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "LOGIN - log in to Juick website")
-    public String commandLogin(User user, String... arguments) {
-        return baseUri + "?" + userService.getHashByUID(user.getUid());
-    }
 
     @UserCommand(pattern = "^(#+)$", help = "# - Show last messages from your feed (## - second page, ...)")
     public String commandMyFeed(User user, String... arguments) {
@@ -278,49 +131,7 @@ public class JuickProtocol {
                 messages.stream().map(PlainTextFormatter::formatPost).collect(Collectors.toList()));
     }
 
-    @UserCommand(pattern = "^(on|off)$", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "ON/OFF - Enable/disable subscriptions delivery")
-    public String commandOnOff(User user, String[] input) {
-        UserService.ActiveStatus newStatus;
-        String retValUpdated;
-        if (input[0].toLowerCase().equals("on")) {
-            newStatus = UserService.ActiveStatus.Active;
-            retValUpdated = "Notifications are activated for " + user.getJid();
-        } else {
-            newStatus = UserService.ActiveStatus.Inactive;
-            retValUpdated = "Notifications are disabled for " + user.getJid();
-        }
-
-        if (userService.setActiveStatusForJID(user.getJid(), newStatus)) {
-            return retValUpdated;
-        } else {
-            return String.format("Subscriptions status for %s was not changed", user.getJid());
-        }
-    }
-
-    @UserCommand(pattern = "^ping$", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "PING - returns you a PONG")
-    public String commandPing(User user, String[] input) {
-        return "PONG";
-    }
-
-    @UserCommand(pattern = "^\\@(\\S+)\\s+([\\s\\S]+)$", help = "@username message - send PM to username")
-    public String commandPM(User user_from, String... arguments) {
-        String user_to = arguments[0];
-        String body = arguments[1];
-
-        User toUser = userService.getUserByName(user_to);
 
-        if (toUser.getUid() > 0) {
-            if (!userService.isInBLAny(toUser.getUid(), user_from.getUid())) {
-                if (pmQueriesService.createPM(user_from.getUid(), toUser.getUid(), body)) {
-                    listener.privateMessage(user_from, toUser, body);
-                    return "Private message sent";
-                }
-            }
-        }
-        return "Error";
-    }
 
     @UserCommand(pattern = "^#(\\d+)(\\+?)$", help = "#1234 - Show message (#1234+ - message with replies)")
     public String commandShow(User user, String... arguments) {
@@ -362,25 +173,7 @@ public class JuickProtocol {
         }
     }
 
-    @UserCommand(pattern = "^(s|u)\\s+#(\\d+)$", help = "S #1234 - subscribe to comments",
-            patternFlags = Pattern.CASE_INSENSITIVE)
-    public String commandSubscribeMessage(User user, 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";
-                }
-            } else {
-                if (subscriptionService.unSubscribeMessage(mid, user.getUid())) {
-                    return "Unsubscribed from #" + mid;
-                }
-                return "You was not subscribed to #" + mid;
-            }
-        }
-        return "Error";
-    }
+
     @UserCommand(pattern = "^(s|u)\\s+\\@(\\S+)$", help = "S @user - subscribe to user's posts",
             patternFlags = Pattern.CASE_INSENSITIVE)
     public String commandSubscribeUser(User user, String... args) {
@@ -402,32 +195,6 @@ public class JuickProtocol {
         }
         return "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, String... args) {
-        boolean subscribe = args[0].equalsIgnoreCase("s");
-        Tag tag = tagService.getTag(args[1], true);
-        if (subscribe) {
-            if (subscriptionService.subscribeTag(user, tag)) {
-                return "Subscribed";
-            }
-        } else {
-            if (subscriptionService.unSubscribeTag(user, tag)) {
-                return "Unsubscribed from " + tag.getName();
-            }
-            return "You was not subscribed to " + tag.getName();
-        }
-        return "Error";
-    }
-
-    @UserCommand(pattern = "^help$", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "HELP - returns this help message")
-    public String commandHelp(User user, String[] input) {
-        return Arrays.stream(getClass().getDeclaredMethods())
-                .filter(m -> m.isAnnotationPresent(UserCommand.class))
-                .map(m -> m.getAnnotation(UserCommand.class).help())
-                .collect(Collectors.joining("\n"));
-    }
 
     public String getBaseUri() {
         return baseUri;