fix: measurements sometimes missing for vanity metadata (#3)

* fix: `measurements` sometimes missing for vanity metadata

* fix: type `memberCount` in vanity info interface

* chore: lint, format

.eslintrc.js

@@ -3,7 +3,13 @@ module.exports = {
         project: "./tsconfig.json",
     },
     extends: "@sapphire",
-    ignorePatterns: ["**/node_modules/**", "**/dist/**", "**/types/**", "**/scripts/**", "*.d.ts"],
+    ignorePatterns: [
+        "**/node_modules/**",
+        "**/dist/**",
+        "**/types/**",
+        "**/scripts/**",
+        "*.d.ts",
+    ],
     rules: {
         "@typescript-eslint/member-ordering": "off",
         "@typescript-eslint/no-floating-promises": "off",

.prettierrc.json

@@ -1,6 +1,6 @@
 {
-  "singleQuote": false,
-  "semi": true,
-  "trailingComma": "all",
-  "tabWidth": 4
+    "singleQuote": false,
+    "semi": true,
+    "trailingComma": "all",
+    "tabWidth": 4
 }

_config.yml

@@ -1 +1 @@
-theme: jekyll-theme-slate
+theme: jekyll-theme-slate

docker-compose.dev.yml

@@ -3,4 +3,4 @@ services:
     api:
         command: ["npm", "run", "start:dev"]
         volumes:
-            - "./src:/usr/app/src"
+            - "./src:/usr/app/src"

src/controllers/shield.ts

@@ -31,8 +31,10 @@ export const getMemberCountFromGuilded = async (
 
     let returnData;
     if (type === "vanity")
-        returnData = (data.metadata as VanityInviteInfo)?.team?.measurements
-            ?.numMembers;
+        returnData =
+            (data.metadata as VanityInviteInfo)?.team?.measurements
+                ?.numMembers ??
+            (data.metadata as VanityInviteInfo)?.team?.memberCount;
     else if (type === "i")
         returnData = (data.metadata as IInviteInfo)?.inviteInfo?.team
             ?.memberCount;
@@ -67,9 +69,11 @@ export const generateSvg = async (
             label: "Guilded",
             message: `${msg} members`,
         });
-        await redis.set(`badge:${type}:${inviteId}:${color}:${style}`, svg, {
-            EX: 900,
-        }).catch(() => void 0);
+        await redis
+            .set(`badge:${type}:${inviteId}:${color}:${style}`, svg, {
+                EX: 900,
+            })
+            .catch(() => void 0);
         return svg;
     } catch (e) {
         return internalError(res, (e as Error).message);

src/routes/shields.ts

@@ -31,16 +31,18 @@ export const getServerShield = async (
             return badRequest(res, "Invalid style.");
     }
 
-    const cachedBadge = await redis.get(
-        `badge:${type}:${inviteId}:${color}:${receivedStyle}`,
-    ).catch(() => null);
+    const cachedBadge = await redis
+        .get(`badge:${type}:${inviteId}:${color}:${receivedStyle}`)
+        .catch(() => null);
     if (cachedBadge) {
         res.header("Content-Type", "image/svg+xml");
         return res.status(200).send(cachedBadge);
     }
 
     let memberCount: string | null;
-    const cachedGuildedReq = await redis.get(`req:${type}:${inviteId}`).catch(() => null);
+    const cachedGuildedReq = await redis
+        .get(`req:${type}:${inviteId}`)
+        .catch(() => null);
     if (cachedGuildedReq) memberCount = cachedGuildedReq;
     else {
         const memberCountReq = await getMemberCountFromGuilded(inviteId, type);
@@ -51,7 +53,9 @@ export const getServerShield = async (
             );
 
         memberCount = memberCountReq.toString();
-        await redis.set(`req:${type}:${inviteId}`, memberCount, { EX: 900 }).catch(() => void 0);
+        await redis
+            .set(`req:${type}:${inviteId}`, memberCount, { EX: 900 })
+            .catch(() => void 0);
     }
 
     const svg = await generateSvg(redis, res, {

src/types.ts

@@ -25,7 +25,8 @@ export interface VanityInviteInfo {
     team: {
         id: string;
         name: string;
-        measurements: { numMembers: number };
+        measurements?: { numMembers: number };
+        memberCount: number;
     };
 }