aboutsummaryrefslogtreecommitdiff
path: root/juick-common
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-09-25 10:28:54 +0300
committerGravatar Vitaly Takmazov2018-09-25 10:28:54 +0300
commit85abc3e201539f81500754a7fb0e4f3a9d148fc4 (patch)
tree7d2e037fd6d0caea78162b9820b01d89aec1010d /juick-common
parent933e5702864d0babcd9f8cbc1791078f387b24c7 (diff)
fix new message tags extracting
Diffstat (limited to 'juick-common')
-rw-r--r--juick-common/src/main/java/com/juick/server/CommandsManager.java15
-rw-r--r--juick-common/src/main/java/com/juick/service/TagService.java3
2 files changed, 10 insertions, 8 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?)");
diff --git a/juick-common/src/main/java/com/juick/service/TagService.java b/juick-common/src/main/java/com/juick/service/TagService.java
index 17b6c5de..7f89b478 100644
--- a/juick-common/src/main/java/com/juick/service/TagService.java
+++ b/juick-common/src/main/java/com/juick/service/TagService.java
@@ -20,6 +20,7 @@ package com.juick.service;
import com.juick.Tag;
import com.juick.User;
import com.juick.server.helpers.TagStats;
+import org.apache.commons.lang3.tuple.Pair;
import java.util.Collection;
import java.util.List;
@@ -49,7 +50,7 @@ public interface TagService {
List<Tag> updateTags(int mid, Collection<Tag> newTags);
- List<Tag> fromString(String txt);
+ Pair<String, List<Tag>> fromString(String txt);
List<TagStats> getMessageTags(int mid);