1 files changed, 15 insertions, 12 deletions

diff --git a/src/main/java/com/juick/server/api/Messages.java b/src/main/java/com/juick/server/api/Messages.java
index 402d2162..3ac272f2 100644
--- a/src/main/java/com/juick/server/api/Messages.java
+++ b/src/main/java/com/juick/server/api/Messages.java
@@ -25,11 +25,10 @@ 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.server.util.HttpNotFoundException;
-import com.juick.server.util.UserUtils;
 import com.juick.service.MessagesService;
 import com.juick.service.TagService;
 import com.juick.service.UserService;
+import com.juick.service.security.annotation.Visitor;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Value;
@@ -78,8 +77,8 @@ public class Messages {
 
     @GetMapping("/api/home")
     public ResponseEntity<List<com.juick.Message>> getHome(
+            @Visitor User visitor,
             @RequestParam(defaultValue = "0") int before_mid) {
-        User visitor = UserUtils.getCurrentUser();
         if (!visitor.isAnonymous()) {
             int vuid = visitor.getUid();
             List<Integer> mids = messagesService.getMyFeed(vuid, before_mid, true);
@@ -92,6 +91,7 @@ public class Messages {
 
     @GetMapping("/api/messages")
     public ResponseEntity<List<com.juick.Message>> getMessages(
+            @Visitor User visitor,
             @RequestParam(required = false) String uname,
             @RequestParam(name = "before_mid", defaultValue = "0") Integer before,
             @RequestParam(required = false, defaultValue = "0") Integer daysback,
@@ -101,8 +101,6 @@ public class Messages {
             @RequestParam(required = false, defaultValue = "0") Integer page,
             @RequestParam(required = false) String media,
             @RequestParam(required = false) String tag) {
-
-        User visitor = UserUtils.getCurrentUser();
         List<Integer> mids;
         if (!StringUtils.isEmpty(uname)) {
             User user = userService.getUserByName(uname);
@@ -151,8 +149,9 @@ public class Messages {
         return ResponseEntity.ok(msgs);
     }
     @DeleteMapping("/api/messages")
-    public CommandResult deleteMessage(@RequestParam int mid, @RequestParam(required = false, defaultValue = "0") int rid) {
-        User visitor = UserUtils.getCurrentUser();
+    public CommandResult deleteMessage(
+            @Visitor User visitor,
+            @RequestParam int mid, @RequestParam(required = false, defaultValue = "0") int rid) {
         if (rid > 0) {
             if (messagesService.deleteReply(visitor.getUid(), mid, rid)) {
                 return CommandResult.fromString("Reply deleted");
@@ -163,17 +162,20 @@ public class Messages {
         }
         throw new HttpBadRequestException();
     }
+
     @GetMapping("/api/messages/discussions")
     public List<Message> getDiscussions(
-        @RequestParam(required = false, defaultValue = "0") Long to) {
-        List<Message> msgs = messagesService.getMessages(UserUtils.getCurrentUser(), messagesService.getDiscussions(UserUtils.getCurrentUser().getUid(), to));
+            @Visitor User visitor,
+            @RequestParam(required = false, defaultValue = "0") Long to) {
+        List<Message> msgs = messagesService.getMessages(visitor,
+                messagesService.getDiscussions(visitor.getUid(), to));
         msgs.forEach(m -> m.getUser().setAvatar(webApp.getAvatarUrl(m.getUser())));
         return msgs;
     }
     @GetMapping("/api/thread")
     public ResponseEntity<List<com.juick.Message>> getThread(
+            @Visitor User visitor,
             @RequestParam(defaultValue = "0") int mid) {
-        User visitor = UserUtils.getCurrentUser();
         Optional<Message> message = messagesService.getMessage(mid);
         if (message.isPresent()) {
             Message msg = message.get();
@@ -199,8 +201,9 @@ public class Messages {
         return NOT_FOUND;
     }
     @GetMapping(value = "/api/thread/mark_read/{mid}-{rid}.gif", produces = MediaType.IMAGE_GIF_VALUE)
-    public byte[] markThreadRead(@PathVariable int mid, @PathVariable int rid) throws IOException {
-        User visitor = UserUtils.getCurrentUser();
+    public byte[] markThreadRead(
+            @Visitor User visitor,
+            @PathVariable int mid, @PathVariable int rid) throws IOException {
         if (!visitor.isAnonymous()) {
             messagesService.setLastReadComment(visitor, mid, rid);
             Message msg = messagesService.getMessage(mid).orElseThrow(IllegalStateException::new);