1 files changed, 7 insertions, 4 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 cde6a4bf..9b7cda32 100644
--- a/juick-common/src/main/java/com/juick/server/CommandsManager.java
+++ b/juick-common/src/main/java/com/juick/server/CommandsManager.java
@@ -110,7 +110,7 @@ public class CommandsManager {
             imagesService.saveImageWithPreviews(attachmentFName, fname);
         }
         com.juick.Message msg = messagesService.getMessage(mid);
-        applicationEventPublisher.publishEvent(new MessageEvent(this, msg));
+        applicationEventPublisher.publishEvent(new MessageEvent(this, msg, subscriptionService.getSubscribedUsers(msg.getUser().getUid(), msg.getMid())));
         return CommandResult.build(msg, "New message posted.\n#" + msg.getMid() + " https://juick.com/" + msg.getMid(), String.format("[New message](%s) posted", PlainTextFormatter.formatUrl(msg)));
     }
 
@@ -148,7 +148,7 @@ public class CommandsManager {
                     jmsg.setUser(user_from);
                     jmsg.setTo(user_to);
                     jmsg.setText(body);
-                    applicationEventPublisher.publishEvent(new MessageEvent(this, jmsg));
+                    applicationEventPublisher.publishEvent(new MessageEvent(this, jmsg, Collections.singletonList(user_to)));
                     return CommandResult.fromString("Private message sent");
                 }
             }
@@ -283,7 +283,9 @@ public class CommandsManager {
                 MessagesService.RecommendStatus status = messagesService.recommendMessage(mid, user.getUid());
                 switch (status) {
                     case Added:
-                        applicationEventPublisher.publishEvent(new LikeEvent(this, user, msg));
+                        applicationEventPublisher.publishEvent(new LikeEvent(this, user, msg,
+                                subscriptionService.getUsersSubscribedToUserRecommendations(
+                                        user.getUid(), msg.getMid(), msg.getUser().getUid())));
                         return CommandResult.fromString("Message is added to your recommendations");
                     case Deleted:
                         return CommandResult.fromString("Message deleted from your recommendations.");
@@ -485,8 +487,9 @@ public class CommandsManager {
                 String fname = String.format("%d-%d.%s", mid, newrid, attachmentType);
                 imagesService.saveImageWithPreviews(attachmentFName, fname);
             }
+            Message original = messagesService.getMessage(mid);
             Message reply = messagesService.getReply(mid, newrid);
-            applicationEventPublisher.publishEvent(new MessageEvent(this, reply));
+            applicationEventPublisher.publishEvent(new MessageEvent(this, reply, subscriptionService.getUsersSubscribedToComments(original, reply)));
             return CommandResult.build(reply,"Reply posted.\n#" + mid + "/" + newrid + " "
                     + "https://juick.com/" + mid + "#" + newrid,
                     String.format("[Reply](%s) posted", PlainTextFormatter.formatUrl(reply)));