From 97f3b6c5eb5596501ca4dbbf18b01de4ac5f358e Mon Sep 17 00:00:00 2001
From: SpaceEEC <spaceeec@yahoo.com>
Date: Fri, 24 May 2019 15:42:09 +0200
Subject: [PATCH] typings(Guild): remove voiceConnection, add voice, cleanup
 rest

Fixes #3293
---
 typings/index.d.ts | 48 +++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/typings/index.d.ts b/typings/index.d.ts
index c98e7a16c..ee03f4c3b 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -398,21 +398,27 @@ declare module 'discord.js' {
 		public afkTimeout: number;
 		public applicationID: Snowflake;
 		public available: boolean;
+		public banner: string | null;
 		public channels: GuildChannelStore;
 		public readonly createdAt: Date;
 		public readonly createdTimestamp: number;
-		public readonly defaultRole: Role | null;
 		public defaultMessageNotifications: DefaultMessageNotifications | number;
+		public readonly defaultRole: Role | null;
 		public deleted: boolean;
+		public description: string | null;
+		public embedChannel: GuildChannel | null;
+		public embedChannelID: Snowflake | null;
 		public embedEnabled: boolean;
 		public emojis: GuildEmojiStore;
 		public explicitContentFilter: number;
 		public features: GuildFeatures[];
-		public icon: string;
+		public icon: string | null;
 		public id: Snowflake;
 		public readonly joinedAt: Date;
 		public joinedTimestamp: number;
 		public large: boolean;
+		public maximumMembers: number | null;
+		public maximumPresences: number | null;
 		public readonly me: GuildMember | null;
 		public memberCount: number;
 		public members: GuildMemberStore;
@@ -426,24 +432,18 @@ declare module 'discord.js' {
 		public roles: RoleStore;
 		public readonly shard: WebSocketShard;
 		public shardID: number;
-		public splash: string;
+		public splash: string | null;
 		public readonly systemChannel: TextChannel | null;
-		public systemChannelID: Snowflake;
+		public systemChannelID: Snowflake | null;
+		public vanityURLCode: string | null;
 		public verificationLevel: number;
-		public maximumMembers: number;
-		public maximumPresences: number;
-		public vanityURLCode: string;
-		public description: string;
-		public banner: string;
-		public widgetEnabled: boolean;
-		public widgetChannelID: Snowflake;
-		public readonly widgetChannel: TextChannel;
-		public embedChannelID: Snowflake;
-		public readonly embedChannel: TextChannel;
 		public readonly verified: boolean;
-		public readonly voiceConnection: VoiceConnection | null;
+		public readonly voice: VoiceState | null;
+		public readonly widgetChannel: TextChannel | null;
+		public widgetChannelID: Snowflake | null;
+		public widgetEnabled: boolean | null;
 		public addMember(user: UserResolvable, options: AddGuildMemberOptions): Promise<GuildMember>;
-		public bannerURL(options?: AvatarOptions): string;
+		public bannerURL(options?: AvatarOptions): string | null;
 		public createIntegration(data: IntegrationData, reason?: string): Promise<Guild>;
 		public delete(): Promise<Guild>;
 		public edit(data: GuildEditData, reason?: string): Promise<Guild>;
@@ -451,29 +451,29 @@ declare module 'discord.js' {
 		public fetch(): Promise<Guild>;
 		public fetchAuditLogs(options?: GuildAuditLogsFetchOptions): Promise<GuildAuditLogs>;
 		public fetchBans(): Promise<Collection<Snowflake, { user: User, reason: string }>>;
+		public fetchEmbed(): Promise<GuildEmbedData>;
 		public fetchIntegrations(): Promise<Collection<string, Integration>>;
 		public fetchInvites(): Promise<Collection<string, Invite>>;
 		public fetchVanityCode(): Promise<string>;
 		public fetchVoiceRegions(): Promise<Collection<string, VoiceRegion>>;
 		public fetchWebhooks(): Promise<Collection<Snowflake, Webhook>>;
-		public fetchEmbed(): Promise<GuildEmbedData>;
-		public iconURL(options?: AvatarOptions): string;
+		public iconURL(options?: AvatarOptions): string | null;
 		public leave(): Promise<Guild>;
 		public member(user: UserResolvable): GuildMember | null;
-		public setAFKChannel(afkChannel: ChannelResolvable, reason?: string): Promise<Guild>;
+		public setAFKChannel(afkChannel: ChannelResolvable | null, reason?: string): Promise<Guild>;
 		public setAFKTimeout(afkTimeout: number, reason?: string): Promise<Guild>;
 		public setChannelPositions(channelPositions: ChannelPosition[]): Promise<Guild>;
 		public setDefaultMessageNotifications(defaultMessageNotifications: DefaultMessageNotifications | number, reason?: string): Promise<Guild>;
+		public setEmbed(embed: GuildEmbedData, reason?: string): Promise<Guild>;
 		public setExplicitContentFilter(explicitContentFilter: number, reason?: string): Promise<Guild>;
-		public setIcon(icon: Base64Resolvable, reason?: string): Promise<Guild>;
+		public setIcon(icon: Base64Resolvable | null, reason?: string): Promise<Guild>;
 		public setName(name: string, reason?: string): Promise<Guild>;
 		public setOwner(owner: GuildMemberResolvable, reason?: string): Promise<Guild>;
 		public setRegion(region: string, reason?: string): Promise<Guild>;
-		public setSplash(splash: Base64Resolvable, reason?: string): Promise<Guild>;
-		public setSystemChannel(systemChannel: ChannelResolvable, reason?: string): Promise<Guild>;
+		public setSplash(splash: Base64Resolvable | null, reason?: string): Promise<Guild>;
+		public setSystemChannel(systemChannel: ChannelResolvable | null, reason?: string): Promise<Guild>;
 		public setVerificationLevel(verificationLevel: number, reason?: string): Promise<Guild>;
-		public setEmbed(embed: GuildEmbedData, reason?: string): Promise<Guild>;
-		public splashURL(options?: AvatarOptions): string;
+		public splashURL(options?: AvatarOptions): string | null;
 		public toJSON(): object;
 		public toString(): string;
 	}