1 files changed, 10 insertions, 23 deletions
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<User> 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<User> subscribedUsers) {
         if (msg.isService()) {
             return;
         }
@@ -78,30 +85,10 @@ 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<String, String> headers = new HashMap<>();
         if (!MessageUtils.isPM(msg)) {