From 97db955466f2dca9207d3d83fcff9d28bffbeb20 Mon Sep 17 00:00:00 2001 From: March 7th <71698422+aiko-chan-ai@users.noreply.github.com> Date: Sat, 23 Jul 2022 18:55:53 +0700 Subject: [PATCH] feat(Relationships): Change enum --- src/managers/RelationshipsManager.js | 4 ++-- src/util/Constants.js | 14 +++++++++++--- typings/enums.d.ts | 6 ++++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/managers/RelationshipsManager.js b/src/managers/RelationshipsManager.js index 1905bba..a0eb04c 100644 --- a/src/managers/RelationshipsManager.js +++ b/src/managers/RelationshipsManager.js @@ -126,7 +126,7 @@ class RelationshipsManager { */ cancelFriendRequest(user) { const id = this.resolveId(user); - if (this.cache.get(id) !== RelationshipTypes.OUTGOING_REQUEST) return false; + if (this.cache.get(id) !== RelationshipTypes.PENDING_OUTGOING) return false; return this.__cancel(id); } @@ -145,7 +145,7 @@ class RelationshipsManager { // Check if already friends if (this.cache.get(id) === RelationshipTypes.FRIEND) return false; // Check if outgoing request - if (this.cache.get(id) === RelationshipTypes.OUTGOING_REQUEST) return false; + if (this.cache.get(id) === RelationshipTypes.PENDING_OUTGOING) return false; await this.client.api.users['@me'].relationships[id].put({ data: { type: RelationshipTypes.FRIEND, diff --git a/src/util/Constants.js b/src/util/Constants.js index a0f84d4..6bbecc9 100644 --- a/src/util/Constants.js +++ b/src/util/Constants.js @@ -1481,13 +1481,21 @@ exports.GuildScheduledEventPrivacyLevels = createEnum([null, null, 'GUILD_ONLY'] * * 0: NONE * * 1: FRIEND * * 2: BLOCKED - * * 3: INCOMING_REQUEST - * * 4: OUTGOING_REQUEST + * * 3: PENDING_INCOMING + * * 4: PENDING_OUTGOING + * * 5: IMPLICIT * @typedef {string} RelationshipTypes * @see {@link https://luna.gitlab.io/discord-unofficial-docs/relationships.html} */ -exports.RelationshipTypes = createEnum(['NONE', 'FRIEND', 'BLOCKED', 'INCOMING_REQUEST', 'OUTGOING_REQUEST']); +exports.RelationshipTypes = createEnum([ + 'NONE', + 'FRIEND', + 'BLOCKED', + 'PENDING_INCOMING', + 'PENDING_OUTGOING', + 'IMPLICIT', +]); /** * The premium tier (Server Boost level) of a guild: diff --git a/typings/enums.d.ts b/typings/enums.d.ts index 172a258..75c6be0 100644 --- a/typings/enums.d.ts +++ b/typings/enums.d.ts @@ -29,10 +29,12 @@ export const enum NitroType { } export const enum RelationshipTypes { + NONE = 0, FRIEND = 1, BLOCKED = 2, - INCOMING_REQUEST = 3, - OUTGOING_REQUEST = 4, + PENDING_INCOMING = 3, + PENDING_OUTGOING = 4, + IMPLICIT = 5, } export const enum localeSetting {