aboutsummaryrefslogtreecommitdiff
path: root/juick-www/src/main/java/com/juick
diff options
context:
space:
mode:
Diffstat (limited to 'juick-www/src/main/java/com/juick')
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/Messages.java25
1 files changed, 14 insertions, 11 deletions
diff --git a/juick-www/src/main/java/com/juick/www/controllers/Messages.java b/juick-www/src/main/java/com/juick/www/controllers/Messages.java
index 75e81b94..ce00433b 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/Messages.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/Messages.java
@@ -418,6 +418,15 @@ public class Messages {
String title = "*" + StringEscapeUtils.escapeHtml4(paramTag.getName());
model.addAttribute("title", title);
List<Integer> mids = messagesService.getTag(paramTag.TID, visitor_uid, before, (visitor_uid == 0) ? 40 : 20);
+ List<com.juick.Message> msgs = messagesService.getMessages(mids);
+ if (visitor.getUid() != 0) {
+ List<Integer> blUIDs = userService.checkBL(
+ visitor.getUid(),
+ msgs.stream().map(m -> m.getUser().getUid()).collect(Collectors.toList())
+ );
+ msgs.forEach(m -> m.ReadOnly |= blUIDs.contains(m.getUser().getUid()));
+ fillUserModel(model, visitor, visitor);
+ }
String head = StringUtils.EMPTY;
if (tagService.getTagNoIndex(paramTag.TID)) {
@@ -427,21 +436,15 @@ public class Messages {
}
model.addAttribute("headers", head);
model.addAttribute("visitor", visitor);
-
- List<com.juick.Message> msgs = messagesService.getMessages(mids);
-
- if (visitor.getUid() != 0) {
- List<Integer> blUIDs = userService.checkBL(visitor.getUid(),
- msgs.stream().map(m -> m.getUser().getUid()).collect(Collectors.toList()));
- msgs.forEach(m -> m.ReadOnly |= blUIDs.contains(m.getUser().getUid()));
- fillUserModel(model, visitor, visitor);
- }
+ model.addAttribute("tag", paramTag);
+ model.addAttribute("title", title);
model.addAttribute("msgs", msgs);
model.addAttribute("tags", tagService.getPopularTags());
- model.addAttribute("headers", head);
model.addAttribute("noindex", before > 0);
- model.addAttribute("showAdv",before == 0 && visitor.getUid() == 0);
+ model.addAttribute("showAdv", before == 0 && visitor.getUid() == 0);
model.addAttribute("isModerator", visitor.getUid() == 3694);
+ model.addAttribute("isSubscribed", tagService.isSubscribed(visitor, paramTag));
+ model.addAttribute("isInBL", tagService.isInBL(visitor, paramTag));
if (mids.size() >= 20) {
String nextpage = "/tag/" + URLEncoder.encode(paramTag.getName(), CharEncoding.UTF_8) + "?before=" + mids.get(mids.size() - 1);
model.addAttribute("nextpage", nextpage);