diff options
author | Vitaly Takmazov | 2018-07-15 12:10:29 +0300 |
---|---|---|
committer | Vitaly Takmazov | 2018-07-15 12:10:29 +0300 |
commit | 72d6b69ea234a67bb392f21dac9dea1a2d28b6f5 (patch) | |
tree | c608dc043393d79a75470128b54b258749708a11 | |
parent | 3870fd009e13d728a343d2ebe79c4f6cd113f2ab (diff) |
unread in /me
-rw-r--r-- | juick-common/src/main/java/com/juick/User.java | 9 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/api/Users.java | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/juick-common/src/main/java/com/juick/User.java b/juick-common/src/main/java/com/juick/User.java index 3b74f31c..b81739a2 100644 --- a/juick-common/src/main/java/com/juick/User.java +++ b/juick-common/src/main/java/com/juick/User.java @@ -48,6 +48,7 @@ public class User { private List<ExternalToken> tokens; private List<User> read; private List<User> readers; + private List<Integer> unread; public User() { tokens = new ArrayList<>(); @@ -199,4 +200,12 @@ public class User { public void setReaders(List<User> readers) { this.readers = readers; } + + public List<Integer> getUnread() { + return unread; + } + + public void setUnread(List<Integer> unread) { + this.unread = unread; + } } 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 9a2b25d7..41deddb8 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 @@ -77,7 +77,9 @@ public class Users { me.setUid(visitor.getUid()); me.setName(visitor.getName()); me.setAuthHash(getAuthToken()); - me.setUnreadCount(messagesService.getUnread(visitor).size()); + List<Integer> unread = messagesService.getUnread(visitor); + me.setUnread(unread); + me.setUnreadCount(unread.size()); me.setRead(userService.getUserFriends(visitor.getUid())); me.setReaders(userService.getUserReaders(visitor.getUid())); return me; |