From fa18c234d6e6f425bd0f036b85e9283aaf752375 Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Sat, 14 Aug 2021 14:41:34 +0300
Subject: [PATCH] Fixes to Invite types/type guard functions

---
 backend/src/utils.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/utils.ts b/backend/src/utils.ts
index 6f0edca8..370bf048 100644
--- a/backend/src/utils.ts
+++ b/backend/src/utils.ts
@@ -8,6 +8,7 @@ import {
   GuildChannel,
   GuildMember,
   Invite,
+  InviteGuild,
   LimitedCollection,
   Message,
   MessageAttachment,
@@ -248,9 +249,8 @@ export function nonNullish<V>(v: V): v is NonNullable<V> {
   return v != null;
 }
 
-export type InviteOpts = "withMetadata" | "withCount" | "withoutCount";
-export type GuildInvite<CT extends InviteOpts = "withMetadata"> = Invite & { guild: Guild };
-export type GroupDMInvite<CT extends InviteOpts = "withMetadata"> = Invite & {
+export type GuildInvite = Invite & { guild: InviteGuild | Guild };
+export type GroupDMInvite = Invite & {
   channel: PartialChannelData;
   type: typeof Constants.ChannelTypes.GROUP_DM;
 };
@@ -1480,11 +1480,11 @@ export function isFullMessage(msg: Message | PartialMessage): msg is Message {
   return (msg as Message).createdAt != null;
 }
 
-export function isGuildInvite<CT extends InviteOpts>(invite: Invite): invite is GuildInvite<CT> {
+export function isGuildInvite(invite: Invite): invite is GuildInvite {
   return invite.guild != null;
 }
 
-export function isGroupDMInvite<CT extends InviteOpts>(invite: Invite): invite is GroupDMInvite<CT> {
+export function isGroupDMInvite(invite: Invite): invite is GroupDMInvite {
   return invite.guild == null && invite.channel?.type === ChannelTypeStrings.GROUP;
 }