From 9e5a6b3f2f6907f18f22718bcb6f0ac7f79c95cd Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 12 Apr 2018 14:17:46 +0300
Subject: server: MessageEvent now have list of subscribers

---
 .../src/main/java/com/juick/server/TelegramBotManager.java    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'juick-server/src/main/java/com/juick/server/TelegramBotManager.java')

diff --git a/juick-server/src/main/java/com/juick/server/TelegramBotManager.java b/juick-server/src/main/java/com/juick/server/TelegramBotManager.java
index e1bdad1f..95d91679 100644
--- a/juick-server/src/main/java/com/juick/server/TelegramBotManager.java
+++ b/juick-server/src/main/java/com/juick/server/TelegramBotManager.java
@@ -77,8 +77,6 @@ public class TelegramBotManager implements NotificationListener {
     @Inject
     private MessagesService messagesService;
     @Inject
-    private SubscriptionService subscriptionService;
-    @Inject
     private UserService userService;
     @Inject
     private CommandsManager commandsManager;
@@ -321,6 +319,7 @@ public class TelegramBotManager implements NotificationListener {
     @Override
     public void processMessageEvent(MessageEvent messageEvent) {
         com.juick.Message jmsg = messageEvent.getMessage();
+        List<User> subscribedUsers = messageEvent.getUsers();
         String msgUrl = formatUrl(jmsg);
         if (MessageUtils.isPM(jmsg)) {
             telegramService.getTelegramIdentifiers(Collections.singletonList(jmsg.getTo()))
@@ -329,12 +328,12 @@ public class TelegramBotManager implements NotificationListener {
             com.juick.Message op = messagesService.getMessage(jmsg.getMid());
             String fmsg = String.format("[%s](%s) %s", MSG_LINK, msgUrl, formatPost(jmsg, true));
             telegramService.getTelegramIdentifiers(
-                    subscriptionService.getUsersSubscribedToComments(op, jmsg)
+                    subscribedUsers
             ).forEach(c -> telegramNotify(c, fmsg, MessageUtils.attachmentUrl(jmsg)));
         } else {
             String msg = String.format("[%s](%s) %s", MSG_LINK, msgUrl, formatPost(jmsg, true));
 
-            List<Long> users = telegramService.getTelegramIdentifiers(subscriptionService.getSubscribedUsers(jmsg.getUser().getUid(), jmsg.getMid()));
+            List<Long> users = telegramService.getTelegramIdentifiers(subscribedUsers);
             List<Long> chats = telegramService.getChats();
             // registered subscribed users
 
@@ -347,12 +346,12 @@ public class TelegramBotManager implements NotificationListener {
     public void processLikeEvent(LikeEvent likeEvent) {
         User liker = likeEvent.getUser();
         com.juick.Message message = likeEvent.getMessage();
+        List<User> subscribers = likeEvent.getSubscribers();
         logger.info("Like received in tg listener");
         telegramService.getTelegramIdentifiers(Collections.singletonList(message.getUser()))
                 .forEach(c -> telegramNotify(c, String.format("%s recommends your [post](%s)",
                         MessageUtils.getMarkdownUser(liker), formatUrl(message)),null));
-        telegramService.getTelegramIdentifiers(subscriptionService.getUsersSubscribedToUserRecommendations(
-                liker.getUid(), message.getMid(), message.getUser().getUid()))
+        telegramService.getTelegramIdentifiers(subscribers)
         .forEach(c -> telegramNotify(c, String.format("%s recommends you someone's [post](%s)",
                 MessageUtils.getMarkdownUser(liker), formatUrl(message)), null));
     }
-- 
cgit v1.2.3