fix: refactor badge.ts to use volume system for image loading (#251)

* fix: refactor badge.ts to use volume system for image loading * fix: lint * fix: update env --------- Co-authored-by: Antoine D <[email protected]>
ungdev · Oct 10, 2024 · 5ca1e21 · 5ca1e21
1 parent 02531a5
commit 5ca1e21
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 44 deletions.
diff --git a/.env.example b/.env.example
@@ -71,13 +71,3 @@ DISCORD_WEBHOOK_CONTACT=
 # Some more random variables
 API_RATE_LIMIT=12
 API_CART_LIFESPAN=3600
-
-# Base 64 encoded image for the badge template
-BADGE_RESTRICTED="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
-BADGE_RESTRICTED_BACK="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
-BADGE_FULLACCESS="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
-BADGE_FULLACCESS_BACK="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
-BADGE_ORGAPRICE="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
-BADGE_ORGAPRICE_BACK="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
-BADGE_INVITE="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
-BADGE_INVITE_BACK="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
diff --git a/.env.test.example b/.env.test.example
@@ -8,12 +8,3 @@ DATABASE_URL=mysql://dev:dev@localhost/arena_test
 
 LOG_LEVEL=silly
 LOG_IN_TEST=false
-
-BADGE_RESTRICTED="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
-BADGE_RESTRICTED_BACK="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
-BADGE_FULLACCESS="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
-BADGE_FULLACCESS_BACK="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
-BADGE_ORGAPRICE="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
-BADGE_ORGAPRICE_BACK="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
-BADGE_INVITE="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
-BADGE_INVITE_BACK="UklGRjYAAABXRUJQVlA4ICoAAACwAQCdASoFAAUAA8BiJZwAAp1sr3oAAPv++hpsEWcij+2s5Q/cZFuOAAA="
diff --git a/assets/badges/blank.png b/assets/badges/blank.png
diff --git a/src/utils/badge.ts b/src/utils/badge.ts
@@ -1,28 +1,30 @@
 import axios, { AxiosResponse } from 'axios';
+import { readFileSync } from 'fs';
 import PDFkit from 'pdfkit';
 import sharp from 'sharp';
 import { Badge } from '../types';
-import env from './env';
 
-const imageBase = async (base64: string) => {
-  // convert webp base64 to png base64
-  const Image = sharp(Buffer.from(base64, 'base64'));
-  return `data:image/png;base64,${(await Image.toFormat('png').toBuffer()).toString('base64')}`;
+const getImage = (filename: string) => {
+  try {
+    return `data:image/png;base64,${readFileSync(`assets/badges/${filename}`, 'base64')}`;
+  } catch {
+    return `data:image/png;base64,${readFileSync(`assets/badges/blank.png`, 'base64')}`;
+  }
 };
 
-const loadImageBadgeRestricted = () => imageBase(env.badge.badge_restricted);
-const loadImageBadgeOrgaPrice = () => imageBase(env.badge.badge_orgaprice);
-const loadImageBadgeFullAccess = () => imageBase(env.badge.badge_fullaccess);
-const loadImageBadgeInvite = () => imageBase(env.badge.badge_invite);
+const loadImageBadgeRestricted = () => getImage('badge-restricted.png');
+const loadImageBadgeOrgaPrice = () => getImage('badge-orgaprice.png');
+const loadImageBadgeFullAccess = () => getImage('badge-fullaccess.png');
+const loadImageBadgeInvite = () => getImage('badge-invite.png');
 
-const loadBackRestricted = () => imageBase(env.badge.badge_restricted_back);
-const loadBackOrgaPrice = () => imageBase(env.badge.badge_orgaprice_back);
-const loadBackFullAccess = () => imageBase(env.badge.badge_fullaccess_back);
-const loadBackInvite = () => imageBase(env.badge.badge_invite_back);
+const loadBackRestricted = () => getImage('back-restricted.png');
+const loadBackOrgaPrice = () => getImage('back-orgaprice.png');
+const loadBackFullAccess = () => getImage('back-fullaccess.png');
+const loadBackInvite = () => getImage('back-invite.png');
 
 type BadgePermission = 'restricted' | 'orgaprice' | 'fullaccess' | 'invite';
 
-const getBack = (permission: BadgePermission): Promise<string> => {
+const getBack = (permission: BadgePermission): string => {
   switch (permission) {
     case 'restricted': {
       return loadBackRestricted();
@@ -46,7 +48,7 @@ const getBack = (permission: BadgePermission): Promise<string> => {
   }
 };
 
-const getBadge = (permission: BadgePermission): Promise<string> => {
+const getBadge = (permission: BadgePermission): string => {
   switch (permission) {
     case 'restricted': {
       return loadImageBadgeRestricted();

diff --git a/src/utils/env.ts b/src/utils/env.ts
@@ -142,16 +142,6 @@ const env = {
     enabledInTest: loadEnv('LOG_IN_TEST') === 'true',
     sentryDsn: loadEnv('LOG_SENTRY_DSN'),
   },
-  badge: {
-    badge_restricted: loadEnv('BADGE_RESTRICTED'),
-    badge_orgaprice: loadEnv('BADGE_ORGAPRICE'),
-    badge_fullaccess: loadEnv('BADGE_FULLACCESS'),
-    badge_invite: loadEnv('BADGE_INVITE'),
-    badge_restricted_back: loadEnv('BADGE_RESTRICTED_BACK'),
-    badge_orgaprice_back: loadEnv('BADGE_ORGAPRICE_BACK'),
-    badge_fullaccess_back: loadEnv('BADGE_FULLACCESS_BACK'),
-    badge_invite_back: loadEnv('BADGE_INVITE_BACK'),
-  },
 };
 
 // Create a warn log array to use it after winsotn initialization