From 2f2e9aab6194037259625200091949d8648e3409 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Tue, 24 Sep 2019 11:54:21 +0300 Subject: Use single event model for all application events --- src/main/java/com/juick/server/EmailManager.java | 33 +++++++----------------- 1 file changed, 10 insertions(+), 23 deletions(-) (limited to 'src/main/java/com/juick/server/EmailManager.java') diff --git a/src/main/java/com/juick/server/EmailManager.java b/src/main/java/com/juick/server/EmailManager.java index bd77d8d6..edff7b70 100644 --- a/src/main/java/com/juick/server/EmailManager.java +++ b/src/main/java/com/juick/server/EmailManager.java @@ -2,6 +2,7 @@ package com.juick.server; import com.juick.Message; import com.juick.User; +import com.juick.server.api.SystemActivity; import com.juick.service.EmailService; import com.juick.service.MessagesService; import com.juick.service.UserService; @@ -52,9 +53,15 @@ public class EmailManager implements NotificationListener { private PebbleEngine pebbleEngine; @Override - public void processMessageEvent(@Nonnull MessageEvent event) { - Message msg = event.getMessage(); - List subscribedUsers = event.getUsers(); + public void processSystemEvent(@Nonnull SystemEvent systemEvent) { + var activity = systemEvent.getActivity(); + var msg = activity.getMessage(); + var subscribers = activity.getTo(); + if (activity.getType().equals(SystemActivity.ActivityType.message)) { + processMessage(msg, subscribers); + } + } + private void processMessage(com.juick.Message msg, List subscribedUsers) { if (msg.isService()) { return; } @@ -77,31 +84,11 @@ public class EmailManager implements NotificationListener { } } - @Override - public void processSubscribeEvent(SubscribeEvent subscribeEvent) { - - } - - @Override - public void processLikeEvent(LikeEvent likeEvent) { - - } - @Override public void processPingEvent(PingEvent pingEvent) { } - @Override - public void processMessageReadEvent(MessageReadEvent messageReadEvent) { - - } - - @Override - public void processTopEvent(TopEvent topEvent) { - - } - private void emailNotify(String email, String subject, Message msg) { Map headers = new HashMap<>(); if (!MessageUtils.isPM(msg)) { -- cgit v1.2.3