Fix FIRE-DHK

Author: GamingGeek

src/commands/Premium/redirect-create.ts

@@ -92,8 +92,8 @@ export default class RedirectCreate extends Command {
           ? "REDIRECT_CREATE_SUCCESS_WITH_LOCATION"
           : "REDIRECT_CREATE_SUCCESS",
         {
-          redirect: `${this.module.redirectDomain}/${created.get("code")}`,
-          url: created.get("redirect"),
+          redirect: `${this.module.redirectDomain}/${created.code}`,
+          url: created.redirect,
           location: location?.toString(),
         }
       );

src/modules/redirects.ts

@@ -7,6 +7,7 @@ import { Message } from "@fire/lib/ws/Message";
 import { EventType } from "@fire/lib/ws/util/constants";
 import { MessageUtil } from "@fire/lib/ws/util/MessageUtil";
 import * as centra from "centra";
+import { Snowflake } from "discord-api-types/globals";
 import { MessageEmbed } from "discord.js";
 
 export default class Redirects extends Module {
@@ -69,7 +70,7 @@ export default class Redirects extends Module {
       return "EXISTS";
     if (!exists) {
       const created = await this.client.db
-        .query(
+        .query<{ uid: Snowflake; code: string; redirect: string }>(
           "INSERT INTO vanity (uid, code, redirect) VALUES ($1, $2, $3) RETURNING *;",
           [user.id, code, url]
         )
@@ -79,7 +80,7 @@ export default class Redirects extends Module {
       return created;
     } else {
       const updated = await this.client.db
-        .query(
+        .query<{ uid: Snowflake; code: string; redirect: string }>(
           "UPDATE vanity SET (code, redirect) = ($1, $2) WHERE code=$1 AND uid=$3 RETURNING *;",
           [code, url, user.id]
         )

src/modules/vanityurls.ts

@@ -167,14 +167,16 @@ export default class VanityURLs extends Module {
 
       // and now we actually delete the guild's vanities
       const deleted = await this.client.db
-        .query("DELETE FROM vanity WHERE gid=$1 RETURNING *;", [source.id])
+        .query<{
+          invite: string;
+        }>("DELETE FROM vanity WHERE gid=$1 RETURNING *;", [source.id])
         .catch(() => {});
       if (deleted && deleted.status.startsWith("DELETE ")) {
         this.requestFetch(source.id);
         if (alsoDeleteInvite)
           for await (const vanity of deleted)
             await this.client
-              .fetchInvite(vanity.get("invite") as string)
+              .fetchInvite(vanity.invite)
               // we only want to delete invites *we* created
               .then(
                 (i) =>
@@ -190,14 +192,14 @@ export default class VanityURLs extends Module {
     } else {
       // If we have a code, we delete first and ask questions later
       const deleted = await this.client.db
-        .query(
+        .query<{ gid: Snowflake; invite: string }>(
           "DELETE FROM vanity WHERE (code ILIKE $1 OR invite ILIKE $1) AND gid IS NOT NULL RETURNING *;",
           [source]
         )
         .first()
         .catch(() => {});
-      if (deleted && deleted.get("gid")) {
-        const guildId = deleted.get("gid") as Snowflake;
+      if (deleted && deleted.gid) {
+        const guildId = deleted.gid;
         this.requestFetch(guildId);
 
         const remainingResult = await this.client.db
@@ -235,17 +237,17 @@ export default class VanityURLs extends Module {
 
         if (alsoDeleteInvite) {
           // this should always be true but just in case
-          if (deleted.get("invite")) {
+          if (deleted.invite) {
             const invite = await this.client
-              .fetchInvite(deleted.get("invite") as string)
+              .fetchInvite(deleted.invite)
               .catch(() => {});
             if (invite && invite.inviterId == this.client.user.id)
               await invite.delete().catch(() => {});
           }
         }
       }
 
-      return deleted && deleted.get("gid");
+      return deleted && deleted.gid;
     }
   }