✔ Ipo-chan Proxy URL ~

bifeldy · Sep 7, 2024 · 5e5c7a5 · 5e5c7a5
1 parent 1d7e696
commit 5e5c7a5
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 9 deletions.
diff --git a/dist/main-site/server/main.js b/dist/main-site/server/main.js
diff --git a/projects/main-site/src/api/controllers/fansub-/fansub-rss-feed.controller.ts b/projects/main-site/src/api/controllers/fansub-/fansub-rss-feed.controller.ts
@@ -5,13 +5,18 @@ import { ILike } from 'typeorm';
 
 import { CONSTANTS } from '../../../constants';
 
+import { environment } from '../../../environments/api/environment';
+
+import { GlobalService } from '../../services/global.service';
+
 import { FansubService } from '../../repository/fansub.service';
 import { RssFeedService } from '../../repository/rss-feed.service';
 
 @Controller('/fansub-rss-feed')
 export class FansubRssFeedController {
 
   constructor(
+    private gs: GlobalService,
     private fansubRepo: FansubService,
     private rssFeedRepo: RssFeedService
   ) {
@@ -80,7 +85,11 @@ export class FansubRssFeedController {
           f.urls = rf.f_urls;
           f.rss_feed = rf.f_rss_feed;
           f.tags = rf.f_tags;
-          f.image_url = rf.f_image_url;
+          let imgUrl = rf.f_image_url;
+          if (imgUrl?.startsWith('http') && this.gs.includesOneOf(imgUrl, environment.ipoChanProxyUrl)) {
+            imgUrl = `https://crawl.${environment.domain}/?url=${encodeURIComponent(imgUrl)}`;
+          }
+          f.image_url = imgUrl;
           f.view_count = rf.f_view_count;
           f.like_count = rf.f_like_count;
           f.dns_id = rf.f_dns_id;

diff --git a/projects/main-site/src/api/controllers/project-type.controller.ts b/projects/main-site/src/api/controllers/project-type.controller.ts
@@ -5,10 +5,14 @@ import { Equal } from 'typeorm';
 
 import { RoleModel } from '../../models/req-res.model';
 
+import { environment } from '../../environments/api/environment';
+
 import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
 import { Roles } from '../decorators/roles.decorator';
 import { VerifiedOnly } from '../decorators/verified-only.decorator';
 
+import { GlobalService } from '../services/global.service';
+
 import { BerkasService } from '../repository/berkas.service';
 import { ProjectTypeService } from '../repository/project-type.service';
 
@@ -17,6 +21,7 @@ import { ProjectTypeService } from '../repository/project-type.service';
 export class ProjectTypeController {
 
   constructor(
+    private gs: GlobalService,
     private berkasRepo: BerkasService,
     private projectTypeRepo: ProjectTypeService
   ) {
@@ -65,6 +70,11 @@ export class ProjectTypeController {
       ORDER BY
         x.name ASC
     `);
+    for (const p of projects) {
+      if (p.image_url?.startsWith('http') && this.gs.includesOneOf(p.image_url, environment.ipoChanProxyUrl)) {
+        p.image_url = `https://crawl.${environment.domain}/?url=${encodeURIComponent(p.image_url)}`;
+      }
+    }
     return {
       info: `😅 200 - Project API :: List All 🤣`,
       count: projects.length,

diff --git a/projects/main-site/src/api/controllers/quiz-/quiz-leaderboard.controller.ts b/projects/main-site/src/api/controllers/quiz-/quiz-leaderboard.controller.ts
@@ -4,12 +4,17 @@ import { Request, Response } from 'express';
 
 import { CONSTANTS } from '../../../constants';
 
+import { environment } from '../../../environments/api/environment';
+
+import { GlobalService } from '../../services/global.service';
+
 import { UserService } from '../../repository/user.service';
 
 @Controller('/quiz-leaderboard')
 export class QuizLeaderboardController {
 
   constructor(
+    private gs: GlobalService,
     private userRepo: UserService
   ) {
     //
@@ -32,7 +37,7 @@ export class QuizLeaderboardController {
         FROM
           (
             SELECT
-              count(*)
+              count(*) count
             FROM
               users u,
               profile p
@@ -69,6 +74,11 @@ export class QuizLeaderboardController {
           }
           delete l.count;
         }
+        if ('image_url' in l) {
+          if (l.image_url?.startsWith('http') && this.gs.includesOneOf(l.image_url, environment.ipoChanProxyUrl)) {
+            l.image_url = `https://crawl.${environment.domain}/?url=${encodeURIComponent(l.image_url)}`;
+          }
+        }
       }
       return {
         info: `😅 200 - Leaderboard API :: List Rank 🤣`,

diff --git a/projects/main-site/src/api/services/global.service.ts b/projects/main-site/src/api/services/global.service.ts
@@ -162,4 +162,13 @@ export class GlobalService {
     return false;
   }
 
+  includesOneOf(text: string, arr: string[]): boolean {
+    for (const a of arr) {
+      if (text?.includes(a)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
 }
diff --git a/projects/main-site/src/api/services/quiz.service.ts b/projects/main-site/src/api/services/quiz.service.ts
@@ -7,6 +7,8 @@ import { EntityManager } from 'typeorm';
 
 import { CONSTANTS } from '../../constants';
 
+import { environment } from '../../environments/api/environment';
+
 import { QuizCategoryModel, QuizHirakataModel, QuizKanjiModel, QuizModel } from '../../models/quiz.model';
 import { RoomInfoInOutModel } from '../../models/socket-io.model';
 
@@ -85,7 +87,13 @@ export class QuizService {
             DROP TABLE IF EXISTS hirakata_quiz;
             CREATE TABLE hirakata_quiz AS
               SELECT
-                *
+                romaji,
+                hiragana,
+                katakana,
+                category,
+                segment,
+                created_at,
+                updated_at
               FROM
                 hirakata
               WHERE
@@ -107,7 +115,13 @@ export class QuizService {
       `);
       hirakatas = await this.manager.query(`
         SELECT
-          *
+          romaji,
+          hiragana,
+          katakana,
+          category,
+          segment,
+          created_at,
+          updated_at
         FROM
           hirakata_quiz
       `);
@@ -155,7 +169,16 @@ export class QuizService {
             DROP TABLE IF EXISTS nihongo_${category}_quiz;
             CREATE TABLE nihongo_${category}_quiz AS
               SELECT
-                *
+                id,
+                romaji,
+                kana,
+                meaning,
+                category,
+                audio,
+                image_url,
+                user_id,
+                created_at,
+                updated_at
               FROM
                 nihongo
               WHERE
@@ -174,14 +197,26 @@ export class QuizService {
       `);
       nihongo = await this.manager.query(`
         SELECT
-          * 
+          id,
+          romaji,
+          kana,
+          meaning,
+          category,
+          audio,
+          image_url,
+          user_id,
+          created_at,
+          updated_at
         FROM
           nihongo_${category}_quiz
       `);
       for (const h of nihongo) {
         delete h.created_at;
         delete h.updated_at;
         delete h.user_id;
+        if (h.image_url?.startsWith('http') && this.gs.includesOneOf(h.image_url, environment.ipoChanProxyUrl)) {
+          h.image_url = `https://crawl.${environment.domain}/?url=${encodeURIComponent(h.image_url)}`;
+        }
       }
       const randomInteger = this.getRandomInt(0, nihongo.length - 1);
       return {

diff --git a/projects/main-site/src/api/transformers/ipo-chan.transformer.ts b/projects/main-site/src/api/transformers/ipo-chan.transformer.ts
@@ -4,6 +4,15 @@ import { environment } from '../../environments/api/environment';
 
 export class IpoChanTransformer implements ValueTransformer {
 
+  private includesOneOf(text: string, arr: string[]): boolean {
+    for (const a of arr) {
+      if (text?.includes(a)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   // Used to marshal data when writing to the database.
   to(data: string): string {
     return data
@@ -12,7 +21,7 @@ export class IpoChanTransformer implements ValueTransformer {
   // Used to unmarshal data when reading from the database.
   from(data: string): string {
     let imgUrl = data;
-    if (imgUrl?.startsWith('http') && !imgUrl?.includes(environment.s3Compatible.bucket)) {
+    if (imgUrl?.startsWith('http') && this.includesOneOf(imgUrl, environment.ipoChanProxyUrl)) {
       imgUrl = `https://crawl.${environment.domain}/?url=${encodeURIComponent(imgUrl)}`;
     }
     return imgUrl;

diff --git a/projects/main-site/src/environments/api/environment.ts b/projects/main-site/src/environments/api/environment.ts
@@ -186,5 +186,8 @@ export const environment = {
     region: 'auto',
     accessKeyId: SECRETS().S3_ACCESS_KEY_ID,                                                                     // '',
     secretAccessKey: SECRETS().S3_SECRET_ACCESS_KEY                                                              // '',
-  }
+  },
+  ipoChanProxyUrl: [
+    'i.ibb.co'
+  ]
 };