aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/juick
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/juick')
-rw-r--r--src/main/java/com/juick/User.java7
-rw-r--r--src/main/java/com/juick/server/api/Users.java3
2 files changed, 10 insertions, 0 deletions
diff --git a/src/main/java/com/juick/User.java b/src/main/java/com/juick/User.java
index 5407fa95..8c0e68bc 100644
--- a/src/main/java/com/juick/User.java
+++ b/src/main/java/com/juick/User.java
@@ -18,6 +18,7 @@ package com.juick;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.juick.model.TagStats;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -57,9 +58,11 @@ public class User implements Serializable {
private String country;
private String url;
private String description;
+ private List<TagStats> tagStats;
public User() {
tokens = new ArrayList<>();
+ tagStats = new ArrayList<>();
uri = URI.create(StringUtils.EMPTY);
}
@@ -263,4 +266,8 @@ public class User implements Serializable {
public void setDescription(String description) {
this.description = description;
}
+
+ public List<TagStats> getTagStats() {
+ return tagStats;
+ }
}
diff --git a/src/main/java/com/juick/server/api/Users.java b/src/main/java/com/juick/server/api/Users.java
index 1a046ad8..0db710c9 100644
--- a/src/main/java/com/juick/server/api/Users.java
+++ b/src/main/java/com/juick/server/api/Users.java
@@ -55,6 +55,8 @@ public class Users {
@Inject
private EmailService emailService;
@Inject
+ private TagService tagService;
+ @Inject
private WebApp webApp;
@Inject
private ImagesService imagesService;
@@ -101,6 +103,7 @@ public class Users {
me.setRead(userService.getUserFriends(visitor.getUid()));
me.setReaders(userService.getUserReaders(visitor.getUid()));
me.setAvatar(webApp.getAvatarUrl(visitor));
+ me.getTagStats().addAll(tagService.getUserTagStats(me.getUid()));
return (SecureUser)userService.getUserInfo(me);
}
@PostMapping("/api/me/upload")