aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/juick/server/api/Messages.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/juick/server/api/Messages.java')
-rw-r--r--src/main/java/com/juick/server/api/Messages.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/com/juick/server/api/Messages.java b/src/main/java/com/juick/server/api/Messages.java
index 67e2ca3e..ffe55d3f 100644
--- a/src/main/java/com/juick/server/api/Messages.java
+++ b/src/main/java/com/juick/server/api/Messages.java
@@ -17,9 +17,9 @@
package com.juick.server.api;
-import com.juick.Message;
-import com.juick.Tag;
-import com.juick.User;
+import com.juick.model.Message;
+import com.juick.model.Tag;
+import com.juick.model.User;
import com.juick.server.Utils;
import com.juick.server.www.WebApp;
import com.juick.model.CommandResult;
@@ -52,11 +52,11 @@ import java.util.stream.Collectors;
@RequestMapping(produces = MediaType.APPLICATION_JSON_VALUE)
public class Messages {
- private static final ResponseEntity<List<com.juick.Message>> NOT_FOUND = ResponseEntity
+ private static final ResponseEntity<List<Message>> NOT_FOUND = ResponseEntity
.status(HttpStatus.NOT_FOUND)
.body(Collections.emptyList());
- private static final ResponseEntity<List<com.juick.Message>> FORBIDDEN = ResponseEntity
+ private static final ResponseEntity<List<Message>> FORBIDDEN = ResponseEntity
.status(HttpStatus.FORBIDDEN)
.body(Collections.emptyList());
@@ -76,7 +76,7 @@ public class Messages {
// TODO: serialize image urls
@GetMapping("/api/home")
- public ResponseEntity<List<com.juick.Message>> getHome(
+ public ResponseEntity<List<Message>> getHome(
@Visitor User visitor,
@RequestParam(defaultValue = "0") int before_mid) {
if (!visitor.isAnonymous()) {
@@ -90,7 +90,7 @@ public class Messages {
}
@GetMapping("/api/messages")
- public ResponseEntity<List<com.juick.Message>> getMessages(
+ public ResponseEntity<List<Message>> getMessages(
@Visitor User visitor,
@RequestParam(required = false) String uname,
@RequestParam(name = "before_mid", defaultValue = "0") Integer before,
@@ -173,7 +173,7 @@ public class Messages {
return msgs;
}
@GetMapping("/api/thread")
- public ResponseEntity<List<com.juick.Message>> getThread(
+ public ResponseEntity<List<Message>> getThread(
@Visitor User visitor,
@RequestParam(defaultValue = "0") int mid) {
Optional<Message> message = messagesService.getMessage(mid);
@@ -187,7 +187,7 @@ public class Messages {
Collections.singletonList(msg.getMid()))
.stream().map(Pair::getRight).collect(Collectors.toList())));
msg.getRecommendations().forEach(r -> r.setAvatar(webApp.getAvatarUrl(r)));
- List<com.juick.Message> replies = messagesService.getReplies(visitor, mid);
+ List<Message> replies = messagesService.getReplies(visitor, mid);
replies.forEach(m -> m.getUser().setAvatar(webApp.getAvatarUrl(m.getUser())));
if (!visitor.isAnonymous()) {
userService.updateLastSeen(visitor);