hide tagger name from pub

src/inc/lib.mjs

@@ -282,18 +282,22 @@ export default new class {
 
     return false;
   };
-  async getTags(itemid) {
+  async getTags(itemid, session = null) {
+    const hasSession = !!(session && (typeof session === 'object' ? (session.id || session.user) : session));
     const tags = await db`
-      select "tags".id, "tags".tag, "tags".normalized, "user".user, uo.display_name
+      select "tags".id, "tags".tag, "tags".normalized${hasSession ? db`, "user".user, uo.display_name` : db``}
       from "tags_assign"
       left join "tags" on "tags".id = "tags_assign".tag_id
-      left join "user" on "user".id = "tags_assign".user_id
+      ${hasSession ? db`left join "user" on "user".id = "tags_assign".user_id left join user_options uo on uo.user_id = "user".id` : db``}
-      left join user_options uo on uo.user_id = "user".id
       where "tags_assign".item_id = ${+itemid}
       order by (case when "tags".id = 1 then 0 when "tags".id = 2 then 1 when "tags".id = ${cfg.nsfl_tag_id || 3} then 2 else 3 end) asc, "tags".id asc
     `;
     for (let t = 0; t < tags.length; t++) {
       tags[t].badge = this.getBadge(tags[t]);
+      if (!hasSession) {
+        delete tags[t].user;
+        delete tags[t].display_name;
+      }
     }
     return tags;
   };

src/inc/routeinc/f0cklib.mjs

@@ -852,7 +852,7 @@ export default {
     // Cheat array should include current item and neighbors, sorted
     const cheat = [itemid, ...cheatItems.map(i => i.id)].sort((a, b) => a - b);
 
-    const tags = await lib.getTags(itemid);
+    const tags = await lib.getTags(itemid, session);
     const itemHalls = await db`select h.name, h.slug from halls h join halls_assign ha on ha.hall_id = h.id where ha.item_id = ${itemid}`;
     const userHallsForItem = user_id
       ? await db`select uh.name, uh.slug from user_halls uh join user_halls_assign uha on uha.hall_id = uh.id where uha.item_id = ${itemid} and uh.user_id = ${user_id}`

src/inc/routes/apiv2/tags.mjs

@@ -19,7 +19,7 @@ export default router => {
 
       return res.json({
         success: true,
-        tags: await lib.getTags(+req.params.postid)
+        tags: await lib.getTags(+req.params.postid, req.session)
       });
     });
 

views/item-partial-legacy.html

@@ -177,7 +177,7 @@
                     <span class="tags-inner">
                         @if(typeof item.tags !== "undefined")
                         @each(item.tags as tag)
-                        <span tooltip="{!! tag.display_name || tag.user !!}" class="badge {{ tag.badge }}">
+                        <span @if(session && (tag.display_name || tag.user)) tooltip="{!! tag.display_name || tag.user !!}" @endif class="badge {{ tag.badge }}">
                             <a href="/tag/{{ tag.normalized }}">{!! tag.tag !!}</a>@if(is_mod_or_admin)&nbsp;<a class="removetag" href="#"><i class="fa-solid fa-xmark"></i></a>@endif
                         </span>
                         @endeach

views/item-partial-modern.html

@@ -42,7 +42,7 @@
             <span class="badge badge-dark" id="tags" style="display: flex; flex-wrap: wrap; gap: 5px; background: transparent; padding: 0; text-align: left; white-space: normal;">
                 @if(typeof item.tags !== "undefined")
                 @each(item.tags as tag)
-                <span @if(session) tooltip="{!! tag.display_name || tag.user !!}" @endif class="badge {{ tag.badge }}">
+                <span @if(session && (tag.display_name || tag.user)) tooltip="{!! tag.display_name || tag.user !!}" @endif class="badge {{ tag.badge }}">
                     <a href="/tag/{{ tag.normalized }}">{!! tag.tag !!}</a>@if(is_mod_or_admin)&nbsp;<a class="removetag" href="#"><i class="fa-solid fa-xmark"></i></a>@endif
                 </span>
                 @endeach