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/api/Messages.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com/juick/server/api/Messages.java')

diff --git a/src/main/java/com/juick/server/api/Messages.java b/src/main/java/com/juick/server/api/Messages.java
index 3ac272f2..1c9e37ad 100644
--- a/src/main/java/com/juick/server/api/Messages.java
+++ b/src/main/java/com/juick/server/api/Messages.java
@@ -22,12 +22,12 @@ import com.juick.Tag;
 import com.juick.User;
 import com.juick.server.Utils;
 import com.juick.server.www.WebApp;
-import com.juick.service.component.MessageReadEvent;
 import com.juick.model.CommandResult;
 import com.juick.server.util.HttpBadRequestException;
 import com.juick.service.MessagesService;
 import com.juick.service.TagService;
 import com.juick.service.UserService;
+import com.juick.service.component.SystemEvent;
 import com.juick.service.security.annotation.Visitor;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.tuple.Pair;
@@ -192,7 +192,7 @@ public class Messages {
                 if (!visitor.isAnonymous()) {
                     userService.updateLastSeen(visitor);
                     applicationEventPublisher.publishEvent(
-                            new MessageReadEvent(this, visitor, msg));
+                            new SystemEvent(this, SystemActivity.read(visitor, msg)));
                 }
                 replies.add(0, msg);
                 return ResponseEntity.ok(replies);
@@ -209,7 +209,7 @@ public class Messages {
             Message msg = messagesService.getMessage(mid).orElseThrow(IllegalStateException::new);
             userService.updateLastSeen(visitor);
             applicationEventPublisher.publishEvent(
-                    new MessageReadEvent(this, visitor, msg));
+                    new SystemEvent(this, SystemActivity.read(visitor, msg)));
             return IOUtils.toByteArray(invisiblePixel.getInputStream());
         }
         throw new HttpBadRequestException();
-- 
cgit v1.2.3