1 files changed, 8 insertions, 7 deletions

diff --git a/juick-common/src/main/java/com/juick/server/CommandsManager.java b/juick-common/src/main/java/com/juick/server/CommandsManager.java
index 13d9b436..7c4692d2 100644
--- a/juick-common/src/main/java/com/juick/server/CommandsManager.java
+++ b/juick-common/src/main/java/com/juick/server/CommandsManager.java
@@ -33,6 +33,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.commons.lang3.reflect.MethodUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
@@ -100,12 +101,12 @@ public class CommandsManager {
                 return commandResult;
             }
         }
-        List<Tag> tags = tagService.fromString(input);
-        if (tags.size() > 5) {
+        Pair<String, List<Tag>> tags = tagService.fromString(input);
+        if (tags.getRight().size() > 5) {
             return CommandResult.fromString("Sorry, 5 tags maximum.");
         }
         // new message
-        String body = TagUtils.toString(tags).equals(input) ? StringUtils.EMPTY : input.substring(TagUtils.toString(tags).length()).trim();
+        String body = tags.getLeft().trim();
         boolean haveAttachment = StringUtils.isNotEmpty(attachment.toString());
         String attachmentFName = null;
         String attachmentType = null;
@@ -114,7 +115,7 @@ public class CommandsManager {
                     : HttpUtils.downloadImage(attachment.toURL(), tmpDir).getHost();
              attachmentType = attachmentFName.substring(attachmentFName.length() - 3);
         }
-        int mid = messagesService.createMessage(user.getUid(), body, attachmentType, tags);
+        int mid = messagesService.createMessage(user.getUid(), body, attachmentType, tags.getRight());
         if (haveAttachment) {
             String fname = String.format("%d.%s", mid, attachmentType);
             imagesService.saveImageWithPreviews(attachmentFName, fname);
@@ -488,12 +489,12 @@ public class CommandsManager {
         int rid = NumberUtils.toInt(args[4], 0);
         String txt = StringUtils.defaultString(args[5]);
         Message msg = messagesService.getMessage(mid);
-        List<Tag> messageTags = tagService.fromString(txt);
-        if (messageTags.size() > 0) {
+        Pair<String, List<Tag>> messageTags = tagService.fromString(txt);
+        if (messageTags.getRight().size() > 0) {
             if (user.getUid() != msg.getUser().getUid()) {
                 return CommandResult.fromString("It is not your message");
             }
-            if (!CollectionUtils.isEqualCollection(tagService.updateTags(mid, messageTags), msg.getTags())) {
+            if (!CollectionUtils.isEqualCollection(tagService.updateTags(mid, messageTags.getRight()), msg.getTags())) {
                 return CommandResult.fromString("Tags are updated");
             } else {
                 return CommandResult.fromString("Tags are NOT updated (5 tags maximum?)");