diff options
Diffstat (limited to 'src/main/java/com/juick/www')
-rw-r--r-- | src/main/java/com/juick/www/api/Mastodon.java | 3 | ||||
-rw-r--r-- | src/main/java/com/juick/www/api/Users.java | 6 | ||||
-rw-r--r-- | src/main/java/com/juick/www/controllers/Site.java | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/main/java/com/juick/www/api/Mastodon.java b/src/main/java/com/juick/www/api/Mastodon.java index 91de21622..eeca1fda4 100644 --- a/src/main/java/com/juick/www/api/Mastodon.java +++ b/src/main/java/com/juick/www/api/Mastodon.java @@ -28,7 +28,6 @@ import com.juick.model.Message; import com.juick.model.User; import com.juick.service.ChatService; import com.juick.service.MessagesService; -import com.juick.service.TagService; import com.juick.service.UserService; import com.juick.util.HttpBadRequestException; import com.juick.util.MessageUtils; @@ -214,7 +213,7 @@ public class Mastodon { User user = userService.getUserByUID(Integer.parseInt(userId)).orElseThrow(HttpBadRequestException::new); var readers = userService.getUserReaders(Integer.parseInt(visitorId)); var friends = userService.getUserFriends(Integer.parseInt(visitorId)); - var bl = userService.getUserBLUsers(Integer.parseInt(visitorId)); + var bl = userService.getUserIgnoredUsers(Integer.parseInt(visitorId)); var isFriend = friends.contains(user); var isReader = readers.contains(user); var isMuting = bl.contains(user); diff --git a/src/main/java/com/juick/www/api/Users.java b/src/main/java/com/juick/www/api/Users.java index 4fb53ca1f..34382f8e0 100644 --- a/src/main/java/com/juick/www/api/Users.java +++ b/src/main/java/com/juick/www/api/Users.java @@ -283,5 +283,11 @@ public class Users { public ApplicationStatus getFacebookStatus() { return userService.getFbCrossPostStatus(this.getUid()); } + public List<User> getVip() { + return userService.getUserVipUsers(this.getUid()); + } + public List<User> getIgnored() { + return userService.getUserIgnoredUsers(this.getUid()); + } } } diff --git a/src/main/java/com/juick/www/controllers/Site.java b/src/main/java/com/juick/www/controllers/Site.java index 00c276072..8b35593c3 100644 --- a/src/main/java/com/juick/www/controllers/Site.java +++ b/src/main/java/com/juick/www/controllers/Site.java @@ -87,7 +87,7 @@ public class Site { model.addAttribute("isInBLAny", userService.isInBLAny(user.getUid(), visitor.getUid())); model.addAttribute("statsIRead", userService.getUserFriends(user.getUid()).size()); model.addAttribute("statsMyReaders", userService.getUserReaders(user.getUid()).size()); - model.addAttribute("statsMyBL", userService.getUserBLUsers(user.getUid()).size()); + model.addAttribute("statsMyBL", userService.getUserIgnoredUsers(user.getUid()).size()); model.addAttribute("statsMessages", userService.getStatsMessages(user.getUid())); model.addAttribute("statsReplies", userService.getStatsReplies(user.getUid())); model.addAttribute("iread", userService.getUserReadLeastPopular(user.getUid(), 8)); @@ -388,7 +388,7 @@ public class Site { model.addAttribute("headers", "<meta name=\"robots\" content=\"noindex\"/>"); model.addAttribute("visitor", visitor); fillUserModel(model, user, visitor); - model.addAttribute("users", userService.getUserBLUsers(user.getUid())); + model.addAttribute("users", userService.getUserIgnoredUsers(user.getUid())); return "views/users"; } |