aboutsummaryrefslogtreecommitdiff
path: root/juick-server/src
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-12-19 23:39:25 +0300
committerGravatar Vitaly Takmazov2016-12-19 23:39:25 +0300
commit03a03639514bfb586555a3367fd3ea58da0f2a94 (patch)
treea8e62458bda9f0e99d5685b8e1c42a1a82226051 /juick-server/src
parente8552c9b162daa5cf4e651330e278dee4ea5198f (diff)
juick-server: fix tags in getSubscribedUsers
Diffstat (limited to 'juick-server/src')
-rw-r--r--juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java b/juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java
index 767c62fc..decfe59d 100644
--- a/juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java
+++ b/juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java
@@ -58,14 +58,16 @@ public class SubscriptionServiceImpl extends BaseJdbcService implements Subscrip
User author = messagesService.getMessageAuthor(mid);
List<User> userids = userService.getUserReaders(uid);
+ List<Integer> tags = tagService.getMessageTagsIDs(mid);
+ List<String> tagsStr = tagService.getMessageTags(mid).stream().map(t -> t.getTag().getName()).collect(Collectors.toList());
Set<Integer> set = new HashSet<>();
set.addAll(
userids.stream()
- .map(User::getUid)
+ .map(User::getUid).filter(u -> Collections.disjoint(tagService.getUserBLTags(u), tagsStr))
.collect(Collectors.toList()));
- List<Integer> tags = tagService.getMessageTagsIDs(mid);
+
if (!tags.isEmpty()) {
List<Integer> tagUsers = getNamedParameterJdbcTemplate().queryForList(
"SELECT st.suser_id FROM subscr_tags st " +