Support sensitive state mode in tags page

hifiwi-fi · Jun 22, 2022 · 9ecf11e · 9ecf11e
1 parent d57bd8b
commit 9ecf11e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/routes/api/tags.js b/routes/api/tags.js
@@ -5,7 +5,17 @@ export default async function tagsRoutes (fastify, opts) {
     '/tags',
     {
       preHandler: fastify.auth([fastify.verifyJWT]),
-      schema: {},
+      schema: {
+        querystring: {
+          type: 'object',
+          properties: {
+            sensitive: {
+              type: 'boolean',
+              default: false
+            }
+          }
+        }
+      },
       response: {
         200: {
           type: 'object',
@@ -26,14 +36,17 @@ export default async function tagsRoutes (fastify, opts) {
     },
     async function (request, reply) {
       const userId = request.user.id
+      const { sensitive } = request.query
 
       const query = SQL`
-        select name, created_at, count(bookmarks_tags.tag_id) as count
+        select tags.name, tags.created_at, count(bookmarks_tags.tag_id) as count
         from tags
         left outer join bookmarks_tags on (tags.id = bookmarks_tags.tag_id)
-        where owner_id = ${userId}
-        group by (name, created_at)
-        order by created_at desc;
+        left outer join bookmarks on (bookmarks_tags.bookmark_id = bookmarks.id)
+        where tags.owner_id = ${userId}
+        ${!sensitive ? SQL`AND sensitive = false` : SQL``}
+        group by (tags.name, tags.created_at)
+        order by tags.created_at desc;
       `
 
       const results = await fastify.pg.query(query)

diff --git a/web/tags/client.js b/web/tags/client.js
@@ -21,8 +21,9 @@ export const page = Component(() => {
       console.log('getting tags')
       setTagsLoading(true)
       setTagsError(null)
-
-      const response = await fetch(`${state.apiUrl}/tags`, {
+      const pageParams = new URLSearchParams(window.location.search)
+      pageParams.set('sensitive', state.sensitive)
+      const response = await fetch(`${state.apiUrl}/tags?${pageParams.toString()}`, {
         method: 'get',
         headers: {
           'accept-encoding': 'application/json'
@@ -44,7 +45,7 @@ export const page = Component(() => {
         .catch(err => { console.error(err); setTagsError(err) })
         .finally(() => { setTagsLoading(false) })
     }
-  }, [state.apiUrl])
+  }, [state.apiUrl, state.sensitive])
 
   return html`
     <div>