using User::isAnonymous where possible

1 files changed, 6 insertions, 8 deletions

diff --git a/juick-server/src/main/java/com/juick/server/api/Messages.java b/juick-server/src/main/java/com/juick/server/api/Messages.java
index 666bab0a..b4d16937 100644
--- a/juick-server/src/main/java/com/juick/server/api/Messages.java
+++ b/juick-server/src/main/java/com/juick/server/api/Messages.java
@@ -93,7 +93,6 @@ public class Messages {
             @RequestParam(required = false) String tag) {
 
         User visitor = UserUtils.getCurrentUser();
-        int vuid = visitor.getUid();
 
         List<Integer> mids;
         if (!StringUtils.isEmpty(uname)) {
@@ -120,18 +119,18 @@ public class Messages {
             }
         } else {
             if (!StringUtils.isEmpty(popular)) {
-                mids = messagesService.getPopular(vuid, before);
+                mids = messagesService.getPopular(visitor.getUid(), before);
             } else if (!StringUtils.isEmpty(media)) {
-                mids = messagesService.getPhotos(vuid, before);
+                mids = messagesService.getPhotos(visitor.getUid(), before);
             } else if (!StringUtils.isEmpty(tag)) {
                 Tag tagObject = tagService.getTag(tag, false);
                 if (tagObject != null) {
-                    mids = messagesService.getTag(tagObject.TID, vuid, before, 20);
+                    mids = messagesService.getTag(tagObject.TID, visitor.getUid(), before, 20);
                 } else {
                     return NOT_FOUND;
                 }
             } else {
-                mids = messagesService.getAll(vuid, before);
+                mids = messagesService.getAll(visitor.getUid(), before);
             }
         }
         return ResponseEntity.ok(messagesService.getMessages(mids));
@@ -145,10 +144,9 @@ public class Messages {
     public ResponseEntity<List<com.juick.Message>> getThread(
             @RequestParam(defaultValue = "0") int mid) {
         User visitor = UserUtils.getCurrentUser();
-        int vuid = visitor.getUid();
         com.juick.Message msg = messagesService.getMessage(mid);
         if (msg != null) {
-            if (!messagesService.canViewThread(mid, vuid)) {
+            if (!messagesService.canViewThread(mid, visitor.getUid())) {
                 return FORBIDDEN;
             } else {
                 List<com.juick.Message> replies = messagesService.getReplies(visitor, mid);
@@ -162,7 +160,7 @@ public class Messages {
     @GetMapping(value = "/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();
-        if (visitor.getUid() > 0) {
+        if (!visitor.isAnonymous()) {
             messagesService.setLastReadComment(visitor, mid, rid);
             Message msg = messagesService.getMessage(mid);
             applicationEventPublisher.publishEvent(new MessageReadEvent(this, visitor, msg));