Typescript fixes

Author: captbaritone

packages/skin-database/cli.ts

@@ -35,7 +35,6 @@ import { setHashesForSkin } from "./skinHash";
 import * as S3 from "./s3";
 import { generateDescription } from "./services/openAi";
 import KeyValue from "./data/KeyValue";
-import detectRepacks from "./tasks/detectRepacks";
 
 async function withHandler(
   cb: (handler: DiscordEventHandler) => Promise<void>
@@ -389,10 +388,6 @@ program
     "Compute the order in which skins should be displayed in the museum"
   )
   .option("--foo", "Learn about missing skins")
-  .option(
-    "--winampskinsinfo",
-    "Detect skins that were broken by winampskins.info injecting an ad file"
-  )
   .option("--test-cloudflare", "Try to upload to cloudflare")
   .action(async (arg) => {
     const {
@@ -404,16 +399,12 @@ program
       configureR2Cors,
       computeMuseumOrder,
       foo,
-      winampskinsinfo,
       testCloudflare,
     } = arg;
     if (testCloudflare) {
       const buffer = new Buffer("testing", "utf8");
       await S3.putTemp("hello", buffer);
     }
-    if (winampskinsinfo) {
-      await detectRepacks();
-    }
     if (computeMuseumOrder) {
       await Skins.computeMuseumOrder();
       console.log("Museum order updated.");
@@ -460,10 +451,12 @@ program
     }
     if (foo) {
       const ctx = new UserContext();
-      const missingModernSkins = await KeyValue.get("missingModernSkins");
+      const missingModernSkins = await KeyValue.get<string[]>(
+        "missingModernSkins"
+      );
       const missingModernSkinsSet = new Set(missingModernSkins);
       const skins = {};
-      for (const md5 of missingModernSkins) {
+      for (const md5 of missingModernSkins!) {
         const skin = await SkinModel.fromMd5(ctx, md5);
         if (skin == null) {
           continue;
@@ -489,7 +482,7 @@ program
         .select();
       console.log(`Found ${skinRows.length} skins to update`);
       const missingModernSkins = new Set(
-        await KeyValue.get("missingModernSkins")
+        await KeyValue.get<string[]>("missingModernSkins")
       );
       const skins = skinRows.map((row) => new SkinModel(ctx, row));
       for (const skin of skins) {

packages/skin-database/data/SkinModel.ts

@@ -249,7 +249,7 @@ export default class SkinModel {
       const response = await fetch(this.getSkinUrl());
       if (!response.ok) {
         const missingModernSkins =
-          (await KeyValue.get("missingModernSkins")) ?? [];
+          (await KeyValue.get<string[]>("missingModernSkins")) ?? [];
         const missingModernSkinsSet = new Set(missingModernSkins);
         missingModernSkinsSet.add(this.getMd5());
         await KeyValue.set(
@@ -410,6 +410,7 @@ export default class SkinModel {
 
   getZip = mem(async (): Promise<JSZip> => {
     const buffer = await this.getBuffer();
+    // @ts-ignore TODO: Is this typing correct?
     return JSZip.loadAsync(buffer);
   });
 

packages/skin-database/package.json

@@ -55,6 +55,7 @@
     "sync": "ts-node --transpile-only ./tasks/syncWithArchive.ts",
     "migrate": "knex migrate:latest",
     "grats": "grats",
+    "typecheck": "tsc --noEmit",
     "dev:next": "next dev",
     "build:next": "next build",
     "start:next": "next start",

packages/skin-database/tasks/DeleteSkin.ts

@@ -103,8 +103,8 @@ export async function followerCount(handler: DiscordEventHandler) {
   const user = response.data;
 
   const followerCount = user.followers_count;
-  const current: { count: number } = await KeyValue.get(FOLLOW_COUNT_KEY);
-  const currentNumber = current.count;
+  const current = await KeyValue.get<{ count: number }>(FOLLOW_COUNT_KEY);
+  const currentNumber = current!.count;
 
   const nextMilestone = currentNumber + FOLLOW_COUNT_BRACKET_SIZE;