From 65818c2f4073030339bf1e83b93a3bb3e8b2bebe Mon Sep 17 00:00:00 2001
From: Flummi <flummi@f0ck.space>
Date: Fri, 28 Jun 2024 06:31:06 +0200
Subject: [PATCH] user aliases

---
 src/inc/routeinc/f0cklib.mjs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/inc/routeinc/f0cklib.mjs b/src/inc/routeinc/f0cklib.mjs
index aabab30..a734d6b 100644
--- a/src/inc/routeinc/f0cklib.mjs
+++ b/src/inc/routeinc/f0cklib.mjs
@@ -26,12 +26,13 @@ export default {
       left join tags on tags.id = tags_assign.tag_id
       left join favorites on favorites.item_id = items.id
       left join "user" on "user".id = favorites.user_id
+      left join user_alias on user_alias.alias = lower("items".username)
       where
         ${ db.unsafe(modequery) }
         and items.active = 'true'
         ${ tag ? db`and tags.normalized ilike '%' || slugify(${tag}) || '%'` : db`` }
         ${ o.fav ? db`and "user".user ilike ${'%'+user+'%'}` : db`` }
-        ${ !o.fav && user ? db`and items.username ilike ${'%'+user+'%'}` : db`` }
+        ${ !o.fav && user ? db`and (items.username ilike ${'%'+user+'%'} or items.username ilike user_alias.alias)` : db`` }
         ${ mime ? db`and items.mime ilike ${smime}` : db`` }
         ${ !o.session && globalfilter ? db`and items.id not in (select item_id from tags_assign where item_id = items.id and (${db.unsafe(globalfilter)}))` : db`` }
       group by items.id, tags.tag
@@ -59,13 +60,14 @@ export default {
       left join tags on tags.id = tags_assign.tag_id
       left join favorites on favorites.item_id = items.id
       left join "user" on "user".id = favorites.user_id
+      left join user_alias on user_alias.alias = lower("items".username)
       left join tags_assign ta on ta.item_id = items.id and (ta.tag_id = 1 or ta.tag_id = 2)
       where
         ${ db.unsafe(modequery) }
         and items.active = 'true'
         ${ tag ? db`and tags.normalized ilike '%' || slugify(${tag}) || '%'` : db`` }
         ${ o.fav ? db`and "user".user ilike ${'%'+user+'%'}` : db`` }
-        ${ !o.fav && user ? db`and items.username ilike ${'%'+user+'%'}` : db`` }
+        ${ !o.fav && user ? db`and (items.username ilike ${'%'+user+'%'} or items.username ilike user_alias.alias)` : db`` }
         ${ mime ? db`and items.mime ilike ${smime}` : db`` }
         ${ !o.session && globalfilter ? db`and items.id not in (select item_id from tags_assign where item_id = items.id and (${db.unsafe(globalfilter)}))` : db`` }
       group by items.id, tags.tag, ta.tag_id
@@ -121,13 +123,14 @@ export default {
       left join tags on tags.id = tags_assign.tag_id
       left join favorites on favorites.item_id = items.id
       left join "user" on "user".id = favorites.user_id
+      left join user_alias on user_alias.alias = lower("items".username)
       left join tags_assign ta on ta.item_id = items.id and (ta.tag_id = 1 or ta.tag_id = 2)
       where
         ${ db.unsafe(modequery) }
         and items.active = 'true'
         ${ tag ? db`and tags.normalized ilike '%' || slugify(${tag}) || '%'` : db`` }
         ${ o.fav ? db`and "user".user ilike ${'%'+user+'%'}` : db`` }
-        ${ !o.fav && user ? db`and items.username ilike ${'%'+user+'%'}` : db`` }
+        ${ !o.fav && user ? db`and (items.username ilike ${'%'+user+'%'} or items.username ilike user_alias.alias)` : db`` }
         ${ mime ? db`and items.mime ilike ${smime}` : db`` }
         ${ !o.session && globalfilter ? db`and items.id not in (select item_id from tags_assign where item_id = items.id and (${db.unsafe(globalfilter)}))` : db`` }
       group by items.id, tags.tag, ta.tag_id