aboutsummaryrefslogtreecommitdiff
path: root/juick-server/src/main/java/com
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-03-02 17:57:00 +0300
committerGravatar Vitaly Takmazov2017-03-02 17:57:00 +0300
commit4ad9878d536588833838afc3ada1e4e3e19c26f9 (patch)
tree44f1e1174350895c3e02e531999fe3931b678a78 /juick-server/src/main/java/com
parentc2f4735877781313ef0d0960ac3c0403944a495c (diff)
juick-server: protocol cleanup
Diffstat (limited to 'juick-server/src/main/java/com')
-rw-r--r--juick-server/src/main/java/com/juick/server/protocol/JuickProtocol.java159
-rw-r--r--juick-server/src/main/java/com/juick/server/protocol/ProtocolReply.java16
2 files changed, 78 insertions, 97 deletions
diff --git a/juick-server/src/main/java/com/juick/server/protocol/JuickProtocol.java b/juick-server/src/main/java/com/juick/server/protocol/JuickProtocol.java
index 6ad177a8..ef8641f8 100644
--- a/juick-server/src/main/java/com/juick/server/protocol/JuickProtocol.java
+++ b/juick-server/src/main/java/com/juick/server/protocol/JuickProtocol.java
@@ -57,7 +57,7 @@ public class JuickProtocol {
* @throws IllegalAccessException
* @throws NoSuchMethodException
*/
- public ProtocolReply getReply(User user, String userInput) throws InvocationTargetException,
+ public String getReply(User user, String userInput) throws InvocationTargetException,
IllegalAccessException, NoSuchMethodException {
Optional<Method> cmd = MethodUtils.getMethodsListWithAnnotation(getClass(), UserCommand.class).stream()
.filter(m -> Pattern.compile(m.getAnnotation(UserCommand.class).pattern(),
@@ -75,32 +75,32 @@ public class JuickProtocol {
groups.add(matcher.group(i));
}
}
- return (ProtocolReply) getClass().getMethod(cmd.get().getName(), User.class, String[].class)
+ return (String) getClass().getMethod(cmd.get().getName(), User.class, String[].class)
.invoke(this, user, groups.toArray(new String[groups.size()]));
}
}
- public ProtocolReply postMessage(User user, String input) {
+ public String postMessage(User user, String input) {
List<Tag> tags = tagService.fromString(input, false);
String body = input.substring(TagUtils.toString(tags).length());
int mid = messagesService.createMessage(user.getUid(), body, null, tags);
subscriptionService.subscribeMessage(mid, user.getUid());
listener.messagePosted(messagesService.getMessage(mid));
- return new ProtocolReply("New message posted.\n#" + mid + " " + baseUri + mid);
+ return "New message posted.\n#" + mid + " " + baseUri + mid;
}
@UserCommand(pattern = "^#\\+$", help = "#+ - Show last Juick messages")
- public ProtocolReply commandLast(User user, String... arguments) {
+ public String commandLast(User user, String... arguments) {
List<Integer> mids = messagesService.getAll(user.getUid(), 0);
List<Message> messages = messagesService.getMessages(mids);
- return new ProtocolReply("Last messages: \n"
+ return "Last messages: \n"
+ messages.stream().sorted(Collections.reverseOrder()).map(PlainTextFormatter::formatPostSummary)
- .collect(Collectors.joining("\n\n")));
+ .collect(Collectors.joining("\n\n"));
}
@UserCommand(pattern = "^bl$", patternFlags = Pattern.CASE_INSENSITIVE,
help = "BL - Show your blacklist")
- public ProtocolReply commandBL(User user_from, String... arguments) {
+ public String commandBL(User user_from, String... arguments) {
List<User> blusers;
List<String> bltags;
@@ -126,44 +126,44 @@ public class JuickProtocol {
if (txt.isEmpty()) {
txt = "You don't have any users or tags in your blacklist.";
}
- return new ProtocolReply(txt);
+ return txt;
}
@UserCommand(pattern = "^bl\\s+@([^\\s\\n\\+]+)", patternFlags = Pattern.CASE_INSENSITIVE,
help = "BL @username - add @username to your blacklist")
- public ProtocolReply blacklistUser(User from, String... arguments) {
+ 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 new ProtocolReply("User added to your blacklist");
+ return "User added to your blacklist";
} else {
- return new ProtocolReply("User removed from your blacklist");
+ return "User removed from your blacklist";
}
}
- return new ProtocolReply("User not found");
+ return "User not found";
}
@UserCommand(pattern = "^bl\\s\\*(\\S+)$", patternFlags = Pattern.CASE_INSENSITIVE,
help = "BL *tag - add *tag to your blacklist")
- public ProtocolReply blacklistTag(User from, String... arguments) {
+ 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 new ProtocolReply("Tag added to your blacklist");
+ return "Tag added to your blacklist";
} else {
- return new ProtocolReply("Tag removed from your blacklist");
+ return "Tag removed from your blacklist";
}
}
}
- return new ProtocolReply("Tag not found");
+ return "Tag not found";
}
@UserCommand(pattern = "@", help = "@ - Show recommendations and popular personal blogs")
- public ProtocolReply commandUsers(User currentUser, String... args) {
+ public String commandUsers(User currentUser, String... args) {
StringBuilder msg = new StringBuilder();
msg.append("Recommended blogs");
List<String> recommendedUsers = showQueriesService.getRecommendedUsers(currentUser);
@@ -183,20 +183,20 @@ public class JuickProtocol {
} else {
msg.append("\nNo top users. Empty DB? ;)");
}
- return new ProtocolReply(msg.toString());
+ return msg.toString();
}
@UserCommand(pattern = "\\*", help = "* - Show your tags")
- public ProtocolReply commandTags(User currentUser, String... args) {
+ 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 new ProtocolReply(msg);
+ return msg;
}
@UserCommand(pattern = "S", help = "S - Show your subscriptions")
- public ProtocolReply commandSubscriptions(User currentUser, String... args) {
+ 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())
@@ -205,65 +205,65 @@ public class JuickProtocol {
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 new ProtocolReply(msg);
+ return msg;
}
@UserCommand(pattern = "!", help = "! - Show your favorite messages")
- public ProtocolReply commandFavorites(User currentUser, String... args) {
+ 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 new ProtocolReply("Favorite messages: \n" + String.join("\n", messages.stream().map(PlainTextFormatter::formatPost)
- .collect(Collectors.toList())));
+ return "Favorite messages: \n" + String.join("\n", messages.stream().map(PlainTextFormatter::formatPost)
+ .collect(Collectors.toList()));
}
- return new ProtocolReply("No favorite messages, try to \"like\" something ;)");
+ 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 ProtocolReply commandUser(User user, String... arguments) {
+ 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 new ProtocolReply(String.format("Last messages from @%s:\n%s", arguments[0],
+ return String.format("Last messages from @%s:\n%s", arguments[0],
String.join("\n", messages.stream()
- .map(PlainTextFormatter::formatPost).collect(Collectors.toList()))));
+ .map(PlainTextFormatter::formatPost).collect(Collectors.toList())));
}
- return new ProtocolReply("User not found");
+ return "User not found";
}
@UserCommand(pattern = "^d\\s*\\#([0-9]+)$", patternFlags = Pattern.CASE_INSENSITIVE,
help = "D #12345 - delete the message")
- public ProtocolReply commandDel(User user, String... args) {
+ public String commandDel(User user, String... args) {
int mid = NumberUtils.toInt(args[0], 0);
if (messagesService.deleteMessage(user.getUid(), mid)) {
- return new ProtocolReply(String.format("Message %s deleted", mid));
+ return String.format("Message %s deleted", mid);
}
- return new ProtocolReply("Error");
+ return "Error";
}
@UserCommand(pattern = "^login$", patternFlags = Pattern.CASE_INSENSITIVE,
help = "LOGIN - log in to Juick website")
- public ProtocolReply commandLogin(User user, String... arguments) {
- return new ProtocolReply(baseUri + "?" + userService.getHashByUID(user.getUid()));
+ 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 ProtocolReply commandMyFeed(User user, String... arguments) {
+ public String commandMyFeed(User user, String... arguments) {
// number of # is the page count
int page = arguments[0].length() - 1;
List<Integer> mids = messagesService.getMyFeed(user.getUid(), page);
List<Message> messages = messagesService.getMessages(mids);
// TODO: add instructions for empty feed
- return new ProtocolReply("Your feed: \n" + String.join("\n",
- messages.stream().map(PlainTextFormatter::formatPost).collect(Collectors.toList())));
+ return "Your feed: \n" + String.join("\n",
+ messages.stream().map(PlainTextFormatter::formatPost).collect(Collectors.toList()));
}
@UserCommand(pattern = "^(on|off)$", patternFlags = Pattern.CASE_INSENSITIVE,
help = "ON/OFF - Enable/disable subscriptions delivery")
- public ProtocolReply commandOnOff(User user, String[] input) {
+ public String commandOnOff(User user, String[] input) {
UserService.ActiveStatus newStatus;
String retValUpdated;
if (input[0].toLowerCase().equals("on")) {
@@ -275,20 +275,20 @@ public class JuickProtocol {
}
if (userService.setActiveStatusForJID(user.getJid(), newStatus)) {
- return new ProtocolReply(retValUpdated);
+ return retValUpdated;
} else {
- return new ProtocolReply(String.format("Subscriptions status for %s was not changed", user.getJid()));
+ 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 ProtocolReply commandPing(User user, String[] input) {
- return new ProtocolReply("PONG");
+ public String commandPing(User user, String[] input) {
+ return "PONG";
}
@UserCommand(pattern = "^\\@(\\S+)\\s+([\\s\\S]+)$", help = "@username message - send PM to username")
- public ProtocolReply commandPM(User user_from, String... arguments) {
+ public String commandPM(User user_from, String... arguments) {
String user_to = arguments[0];
String body = arguments[1];
@@ -298,121 +298,118 @@ public class JuickProtocol {
if (!userService.isInBLAny(toUser.getUid(), user_from.getUid())) {
if (pmQueriesService.createPM(user_from.getUid(), toUser.getUid(), body)) {
listener.privateMessage(user_from, toUser, body);
- return new ProtocolReply("Private message sent");
+ return "Private message sent";
}
}
}
- return new ProtocolReply("Error");
+ return "Error";
}
@UserCommand(pattern = "^#(\\d+)(\\+?)$", help = "#1234 - Show message (#1234+ - message with replies)")
- public ProtocolReply commandShow(User user, String... arguments) {
+ public String commandShow(User user, String... arguments) {
boolean showReplies = arguments[1].length() > 0;
- int mid;
- try {
- mid = Integer.parseInt(arguments[0]);
- } catch (NumberFormatException e) {
- return new ProtocolReply("Error");
+ int mid = NumberUtils.toInt(arguments[0], 0);
+ if (mid == 0) {
+ return "Error";
}
Message msg = messagesService.getMessage(mid);
if (msg != null) {
if (showReplies) {
List<Message> replies = messagesService.getReplies(mid);
replies.add(0, msg);
- return new ProtocolReply(String.join("\n",
- replies.stream().map(PlainTextFormatter::formatPost).collect(Collectors.toList())));
+ return String.join("\n",
+ replies.stream().map(PlainTextFormatter::formatPost).collect(Collectors.toList()));
}
- return new ProtocolReply(PlainTextFormatter.formatPost(msg));
+ return PlainTextFormatter.formatPost(msg);
}
- return new ProtocolReply("Message not found");
+ return "Message not found";
}
@UserCommand(pattern = "^(#|\\.)(\\d+)((\\.|\\-|\\/)(\\d+))?\\s([\\s\\S]+)",
help = "#1234 *tag *tag2 - edit tags\n#1234 text - reply to message")
- public ProtocolReply EditOrReply(User user, String... args) {
+ public String EditOrReply(User user, String... args) {
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 new ProtocolReply("It is not your message");
+ return "It is not your message";
}
tagService.updateTags(mid, messageTags);
- return new ProtocolReply("Tags are updated");
+ return "Tags are updated";
} else {
int newrid = messagesService.createReply(mid, rid, user.getUid(), txt, null);
listener.messagePosted(messagesService.getReply(mid, newrid));
- return new ProtocolReply("Reply posted.\n#" + mid + "/" + newrid + " "
- + baseUri + mid + "#" + newrid);
+ return "Reply posted.\n#" + mid + "/" + newrid + " "
+ + baseUri + mid + "#" + newrid;
}
}
@UserCommand(pattern = "^(s|u)\\s+#(\\d+)$", help = "S #1234 - subscribe to comments",
patternFlags = Pattern.CASE_INSENSITIVE)
- public ProtocolReply commandSubscribeMessage(User user, String... args) {
+ 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 new ProtocolReply("Subscribed");
+ return "Subscribed";
}
} else {
if (subscriptionService.unSubscribeMessage(mid, user.getUid())) {
- return new ProtocolReply("Unsubscribed from #" + mid);
+ return "Unsubscribed from #" + mid;
}
- return new ProtocolReply("You was not subscribed to #" + mid);
+ return "You was not subscribed to #" + mid;
}
}
- return new ProtocolReply("Error");
+ return "Error";
}
@UserCommand(pattern = "^(s|u)\\s+\\@(\\S+)$", help = "S @user - subscribe to user's posts",
patternFlags = Pattern.CASE_INSENSITIVE)
- public ProtocolReply commandSubscribeUser(User user, String... args) {
+ public String commandSubscribeUser(User user, String... args) {
boolean subscribe = args[0].equalsIgnoreCase("s");
User toUser = userService.getUserByName(args[1]);
if (toUser.getUid() > 0) {
if (subscribe) {
if (subscriptionService.subscribeUser(user, toUser)) {
listener.userSubscribed(user, toUser);
- return new ProtocolReply("Subscribed");
+ return "Subscribed";
// TODO: already subscribed case
}
} else {
if (subscriptionService.unSubscribeUser(user, toUser)) {
- return new ProtocolReply("Unsubscribed from @" + toUser.getName());
+ return "Unsubscribed from @" + toUser.getName();
}
- return new ProtocolReply("You was not subscribed to @" + toUser.getName());
+ return "You was not subscribed to @" + toUser.getName();
}
}
- return new ProtocolReply("Error");
+ return "Error";
}
@UserCommand(pattern = "^(s|u)\\s+\\*(\\S+)$", help = "S *tag - subscribe to tag" +
"\nU *tag - unsubscribe from tag", patternFlags = Pattern.CASE_INSENSITIVE)
- public ProtocolReply commandSubscribeTag(User user, String... args) {
+ 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 new ProtocolReply("Subscribed");
+ return "Subscribed";
}
} else {
if (subscriptionService.unSubscribeTag(user, tag)) {
- return new ProtocolReply("Unsubscribed from " + tag.getName());
+ return "Unsubscribed from " + tag.getName();
}
- return new ProtocolReply("You was not subscribed to " + tag.getName());
+ return "You was not subscribed to " + tag.getName();
}
- return new ProtocolReply("Error");
+ return "Error";
}
@UserCommand(pattern = "^help$", patternFlags = Pattern.CASE_INSENSITIVE,
help = "HELP - returns this help message")
- public ProtocolReply commandHelp(User user, String[] input) {
- List<String> commandsHelp = Arrays.stream(getClass().getDeclaredMethods())
+ 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.toList());
- return new ProtocolReply(String.join("\n", commandsHelp));
+ .collect(Collectors.joining("\n"));
}
public String getBaseUri() {
diff --git a/juick-server/src/main/java/com/juick/server/protocol/ProtocolReply.java b/juick-server/src/main/java/com/juick/server/protocol/ProtocolReply.java
deleted file mode 100644
index f3483187..00000000
--- a/juick-server/src/main/java/com/juick/server/protocol/ProtocolReply.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.juick.server.protocol;
-
-/**
- * Created by vitalyster on 08.04.2016.
- */
-public class ProtocolReply {
-
- private String result;
-
- public ProtocolReply(String text) {
- this.result = text;
- }
- public String getResult() {
- return result;
- }
-}