✔ Fix Berkas Publik ~

bifeldy · Aug 13, 2023 · 96095f9 · 96095f9
1 parent ba91ce7
commit 96095f9
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 2 deletions.
diff --git a/dist/fansubid/browser/ngsw.json b/dist/fansubid/browser/ngsw.json
@@ -1,6 +1,6 @@
 {
   "configVersion": 1,
-  "timestamp": 1691917704687,
+  "timestamp": 1691934840526,
   "index": "/index.html",
   "assetGroups": [
     {

diff --git a/dist/fansubid/server/main.js b/dist/fansubid/server/main.js
diff --git a/src/api/controllers/anime-/anime-berkas.controller.ts b/src/api/controllers/anime-/anime-berkas.controller.ts
@@ -33,6 +33,16 @@ export class AnimeBerkasController {
       const animeId = req.query['id'] ? (req.query['id'] as string).split(',').map(Number) : req.body.id;
       if (Array.isArray(animeId) && animeId.length > 0) {
         const sqlWhere = [
+          {
+            private: false,
+            name: ILike(`%${req.query['q'] ? req.query['q'] : ''}%`),
+            anime_: {
+              id: In(animeId)
+            },
+            user_: {
+              private: true
+            }
+          },
           {
             ...((user?.verified) ? {
               // Verified User Can See Private Berkas From Public Profile

diff --git a/src/api/controllers/berkas.controller.ts b/src/api/controllers/berkas.controller.ts
@@ -64,6 +64,14 @@ export class BerkasController {
       const queryPage = parseInt(req.query['page'] as string);
       const queryRow = parseInt(req.query['row'] as string);
       const sqlWhere: any = [
+        {
+          private: false,
+          name: ILike(`%${req.query['q'] ? req.query['q'] : ''}%`),
+          r18: false,
+          user_: {
+            private: true
+          }
+        },
         {
           ...((user?.verified) ? {
             // Verified User Can See Private Berkas From Public Profile

diff --git a/src/api/controllers/dorama-/dorama-berkas.controller.ts b/src/api/controllers/dorama-/dorama-berkas.controller.ts
@@ -33,6 +33,16 @@ export class DoramaBerkasController {
       const doramaId = req.query['id'] ? (req.query['id'] as string).split(',') : req.body.id;
       if (Array.isArray(doramaId) && doramaId.length > 0) {
         const sqlWhere = [
+          {
+            private: false,
+            name: ILike(`%${req.query['q'] ? req.query['q'] : ''}%`),
+            dorama_: {
+              id: In(doramaId)
+            },
+            user_: {
+              private: true
+            }
+          },
           {
             ...((user?.verified) ? {
               // Verified User Can See Private Berkas From Public Profile

diff --git a/src/api/controllers/user.controller.ts b/src/api/controllers/user.controller.ts
@@ -345,6 +345,13 @@ export class UserController {
       const user: UserModel = res.locals['user'];
       const [files, count] = await this.berkasRepo.findAndCount({
         where: [
+          {
+            private: false,
+            name: ILike(`%${req.query['q'] ? req.query['q'] : ''}%`),
+            user_: {
+              username: ILike(req.params['username'])
+            }
+          },
           {
             name: ILike(`%${req.query['q'] ? req.query['q'] : ''}%`),
             user_: {