Merge branch 'main' into dev

aura-nw · Sep 18, 2023 · 1ca0be9 · 1ca0be9
2 parents 2a1a62f + 7572153
commit 1ca0be9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/hasura/metadata/databases/punkga-pg/tables/public_authorizer_users.yaml b/hasura/metadata/databases/punkga-pg/tables/public_authorizer_users.yaml
@@ -13,6 +13,10 @@ select_permissions:
   - role: anonymous
     permission:
       columns:
+        - bio
+        - birthdate
+        - email
+        - gender
         - id
         - nickname
         - picture

diff --git a/hasura/metadata/query_collections.yaml b/hasura/metadata/query_collections.yaml
@@ -794,3 +794,16 @@
               }
             }
           }
+      - name: Public - Query User
+        query: |
+          query QueryUser ($user_id: bpchar = "") {
+            authorizer_users(where: {id:{_eq:$user_id}}) {
+              id
+              email
+              nickname
+              birthdate
+              bio
+              picture
+              gender
+            }
+          }
diff --git a/hasura/metadata/rest_endpoints.yaml b/hasura/metadata/rest_endpoints.yaml
@@ -241,6 +241,15 @@
     - GET
   name: Public - Get trending manga
   url: public/trending
+- comment: ""
+  definition:
+    query:
+      collection_name: allowed-queries
+      query_name: Public - Query User
+  methods:
+    - GET
+  name: Public - Query User
+  url: public/users/:user_id
 - comment: ""
   definition:
     query:

diff --git a/src/task/task.service.ts b/src/task/task.service.ts
@@ -72,7 +72,9 @@ export class TasksService {
     const response = await this.runReport();
     const env = this.configService.get<string>('app.env');
 
-    const subdomain_pattern = env !== '' ? `${env}\.` : '';
+    const subdomain_pattern = ['dev', 'staging'].includes(env)
+      ? `${env}\.`
+      : '';
 
     const regex = new RegExp(
       `https://${subdomain_pattern}punkga\.me(\/[A-Za-z]+)?\/comic\/[0-9]+\/chapter\/[0-9]+`,