From b642c55f053583533e23b1fc7fc5ac318fcbd7f0 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 10 May 2018 15:04:57 +0300
Subject: using User::isAnonymous where possible

---
 juick-server/src/main/java/com/juick/server/api/PM.java | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

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

diff --git a/juick-server/src/main/java/com/juick/server/api/PM.java b/juick-server/src/main/java/com/juick/server/api/PM.java
index 3649bb5e..045d465e 100644
--- a/juick-server/src/main/java/com/juick/server/api/PM.java
+++ b/juick-server/src/main/java/com/juick/server/api/PM.java
@@ -51,8 +51,7 @@ public class PM {
     public List<com.juick.Message> doGetPM(
             @RequestParam(required = false) String uname) {
         User visitor = UserUtils.getCurrentUser();
-        int vuid = visitor.getUid();
-        if (vuid == 0) {
+        if (visitor.isAnonymous()) {
             throw new HttpForbiddenException();
         }
         int uid = 0;
@@ -64,7 +63,7 @@ public class PM {
             throw new HttpBadRequestException();
         }
 
-        return pmQueriesService.getPMMessages(vuid, uid);
+        return pmQueriesService.getPMMessages(visitor.getUid(), uid);
     }
 
     @RequestMapping(value = "/pm", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@@ -72,8 +71,7 @@ public class PM {
             @RequestParam String uname,
             @RequestParam String body) {
         User visitor = UserUtils.getCurrentUser();
-        int vuid = visitor.getUid();
-        if (vuid == 0) {
+        if (visitor.isAnonymous()) {
             throw new HttpForbiddenException();
         }
         User userTo = AnonymousUser.INSTANCE;
@@ -85,11 +83,11 @@ public class PM {
             throw new HttpBadRequestException();
         }
 
-        if (userService.isInBLAny(userTo.getUid(), vuid)) {
+        if (userService.isInBLAny(userTo.getUid(), visitor.getUid())) {
             throw new HttpForbiddenException();
         }
 
-        if (pmQueriesService.createPM(vuid, userTo.getUid(), body)) {
+        if (pmQueriesService.createPM(visitor.getUid(), userTo.getUid(), body)) {
             com.juick.Message jmsg = new com.juick.Message();
             jmsg.setUser(visitor);
             jmsg.setText(body);
@@ -104,8 +102,7 @@ public class PM {
     public PrivateChats doGetGroupsPMs(
             @RequestParam(defaultValue = "5") int cnt) {
         User visitor = UserUtils.getCurrentUser();
-        int vuid = visitor.getUid();
-        if (vuid == 0) {
+        if (visitor.isAnonymous()) {
             throw new HttpForbiddenException();
         }
         if (cnt < 3) {
@@ -115,7 +112,7 @@ public class PM {
             cnt = 10;
         }
 
-        List<User> lastconv = pmQueriesService.getPMLastConversationsUsers(vuid, cnt);
+        List<User> lastconv = pmQueriesService.getPMLastConversationsUsers(visitor.getUid(), cnt);
         if (lastconv != null && !lastconv.isEmpty()) {
             PrivateChats pms = new PrivateChats();
             pms.setUsers(lastconv);
-- 
cgit v1.2.3