From d70127cee69e66e87702a6db4b58ad12aa85f96c Mon Sep 17 00:00:00 2001
From: Zaid <nico.03727@gmail.com>
Date: Sat, 12 Dec 2020 08:50:33 -0500
Subject: [PATCH] feat(GuildMember): make GuildMember#setNickname first param
 nullable (#5070)

* Update index.d.ts

* Update GuildMember.js

* Update src/structures/GuildMember.js

Co-authored-by: Jan <66554238+Vaporox@users.noreply.github.com>

* Update GuildMember.js

* Update index.d.ts

Co-authored-by: Jan <66554238+Vaporox@users.noreply.github.com>
---
 src/structures/GuildMember.js | 4 ++--
 typings/index.d.ts            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/structures/GuildMember.js b/src/structures/GuildMember.js
index 1bd0dfd1d..9d573fc69 100644
--- a/src/structures/GuildMember.js
+++ b/src/structures/GuildMember.js
@@ -274,7 +274,7 @@ class GuildMember extends Base {
   /**
    * The data for editing a guild member.
    * @typedef {Object} GuildMemberEditData
-   * @property {string} [nick] The nickname to set for the member
+   * @property {?string} [nick] The nickname to set for the member
    * @property {Collection<Snowflake, Role>|RoleResolvable[]} [roles] The roles or role IDs to apply
    * @property {boolean} [mute] Whether or not the member should be muted
    * @property {boolean} [deaf] Whether or not the member should be deafened
@@ -319,7 +319,7 @@ class GuildMember extends Base {
 
   /**
    * Sets the nickname for this member.
-   * @param {string} nick The nickname for the guild member
+   * @param {?string} nick The nickname for the guild member, or `null` if you want to reset their nickname
    * @param {string} [reason] Reason for setting the nickname
    * @returns {Promise<GuildMember>}
    */
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 30cd83af5..7e406f407 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -829,7 +829,7 @@ declare module 'discord.js' {
     ): boolean;
     public kick(reason?: string): Promise<GuildMember>;
     public permissionsIn(channel: ChannelResolvable): Readonly<Permissions>;
-    public setNickname(nickname: string, reason?: string): Promise<GuildMember>;
+    public setNickname(nickname: string | null, reason?: string): Promise<GuildMember>;
     public toJSON(): object;
     public toString(): string;
     public valueOf(): string;
@@ -2648,7 +2648,7 @@ declare module 'discord.js' {
     | 'WELCOME_SCREEN_ENABLED';
 
   interface GuildMemberEditData {
-    nick?: string;
+    nick?: string | null;
     roles?: Collection<Snowflake, Role> | readonly RoleResolvable[];
     mute?: boolean;
     deaf?: boolean;