From 162262eb58c4642b7ffb9ed41bc760e0f009d6a6 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 3 Aug 2018 12:38:18 +0300 Subject: replies counter in feeds reflect banned comments --- juick-server/src/main/java/com/juick/server/api/Messages.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'juick-server/src/main/java/com/juick/server/api/Messages.java') 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 eb562103..d7c07391 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 @@ -76,7 +76,7 @@ public class Messages { if (!visitor.isAnonymous()) { int vuid = visitor.getUid(); List mids = messagesService.getMyFeed(vuid, before_mid, true); - return ResponseEntity.ok(messagesService.getMessages(mids)); + return ResponseEntity.ok(messagesService.getMessages(visitor, mids)); } return FORBIDDEN; } @@ -138,7 +138,7 @@ public class Messages { mids = messagesService.getAll(visitor.getUid(), before); } } - return ResponseEntity.ok(messagesService.getMessages(mids)); + return ResponseEntity.ok(messagesService.getMessages(visitor, mids)); } @DeleteMapping("/messages") public CommandResult deleteMessage(@RequestParam int mid, @RequestParam(required = false, defaultValue = "0") int rid) { @@ -156,7 +156,7 @@ public class Messages { @GetMapping("/messages/discussions") public List getDiscussions( @RequestParam(required = false, defaultValue = "0") Long to) { - return messagesService.getMessages(messagesService.getDiscussions(UserUtils.getCurrentUser().getUid(), to)); + return messagesService.getMessages(UserUtils.getCurrentUser(), messagesService.getDiscussions(UserUtils.getCurrentUser().getUid(), to)); } @GetMapping("/thread") public ResponseEntity> getThread( -- cgit v1.2.3