Do not send subscriptions to banned users

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/juick/service/SubscriptionServiceImpl.java b/src/main/java/com/juick/service/SubscriptionServiceImpl.java
index c14b258a..b8d32c6a 100644
--- a/src/main/java/com/juick/service/SubscriptionServiceImpl.java
+++ b/src/main/java/com/juick/service/SubscriptionServiceImpl.java
@@ -67,10 +67,10 @@ public class SubscriptionServiceImpl extends BaseJdbcService implements Subscrip
         List<String> tagsStr = tagService.getMessageTags(mid).stream().map(t -> t.getTag().getName()).collect(Collectors.toList());
 
         Set<Integer> set = new HashSet<>(users.stream()
+                .filter(u -> !u.isBanned())
                 .map(User::getUid).filter(u -> Collections.disjoint(tagService.getUserBLTags(u), tagsStr))
                 .collect(Collectors.toList()));
 
-
         if (!tags.isEmpty()) {
             List<Integer> tagUsers = getNamedParameterJdbcTemplate().queryForList(
                     "SELECT st.suser_id FROM subscr_tags st " +
@@ -104,7 +104,7 @@ public class SubscriptionServiceImpl extends BaseJdbcService implements Subscrip
         List<User> users = IteratorUtils.toList(CollectionUtils.union(subscribers, mentionedUsers).iterator());
         if (!users.isEmpty()) {
             return users.stream()
-                    .filter(u -> blacklisted ||  !userService.isReplyToBL(u, reply))
+                    .filter(u -> blacklisted || !u.isBanned() && !userService.isReplyToBL(u, reply))
                     .collect(Collectors.toList());
         }
         return Collections.emptyList();