Skip to content
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void createComment(User user, Feed feed, String commentContent) {

private void sendCommentPushMessageToFeedOwner(User user, Feed feed) {
User feedOwner = feed.getUser();
if (isUserCommentOwner(user, feedOwner)) {
if (isUserCommentOwner(user, feedOwner) || blockService.isBlocked(feedOwner.getUserId(), user.getUserId())) {
return;
}

Expand Down Expand Up @@ -112,6 +112,8 @@ private void sendCommentPushMessageToCommenters(User user, Feed feed) {
.stream()
.map(Comment::getUserId)
.filter(userId -> !userId.equals(user.getUserId()))
.filter(userId -> !blockService.isBlocked(userId, user.getUserId())
&& !blockService.isBlocked(userId, feed.getUser().getUserId()))
.distinct()
.map(userService::getUserOrException)
.toList();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public void likeFeed(User user, Long feedId) {

private void sendLikePushMessage(User liker, Feed feed) {
User feedOwner = feed.getUser();
if (liker.equals(feedOwner)) {
if (liker.equals(feedOwner) || blockService.isBlocked(feedOwner.getUserId(), liker.getUserId())) {
return;
}

Expand Down
Loading