From 3870fd009e13d728a343d2ebe79c4f6cd113f2ab Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Sun, 15 Jul 2018 11:43:36 +0300 Subject: Api: read and readers in /me --- juick-server/src/main/java/com/juick/server/api/Users.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'juick-server/src/main/java/com/juick/server/api/Users.java') diff --git a/juick-server/src/main/java/com/juick/server/api/Users.java b/juick-server/src/main/java/com/juick/server/api/Users.java index a7ea7ea0..9a2b25d7 100644 --- a/juick-server/src/main/java/com/juick/server/api/Users.java +++ b/juick-server/src/main/java/com/juick/server/api/Users.java @@ -78,6 +78,8 @@ public class Users { me.setName(visitor.getName()); me.setAuthHash(getAuthToken()); me.setUnreadCount(messagesService.getUnread(visitor).size()); + me.setRead(userService.getUserFriends(visitor.getUid())); + me.setReaders(userService.getUserReaders(visitor.getUid())); return me; } @@ -101,13 +103,7 @@ public class Users { } if (uid > 0) { - List uids = userService.getUserRead(uid); - if (uids.size() > 0) { - List users = userService.getUsersByID(uids); - if (users.size() > 0) { - return users; - } - } + return userService.getUserFriends(uid); } throw new HttpNotFoundException(); } -- cgit v1.2.3