From 0713f89bba9b4e4b11e7503877bb69f3907e02b4 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Mon, 31 May 2021 20:32:50 +0200
Subject: [PATCH] :art: rename recipients -> recipient_ids

---
 src/models/Channel.ts   |  5 ++++-
 src/util/Permissions.ts | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/models/Channel.ts b/src/models/Channel.ts
index d96a80dc..a77e492d 100644
--- a/src/models/Channel.ts
+++ b/src/models/Channel.ts
@@ -5,7 +5,7 @@ import { UserModel } from "./User";
 
 // @ts-ignore
 export interface AnyChannel extends Channel, DMChannel, TextChannel, VoiceChannel {
-	recipients: null | string[];
+	recipient_ids: null | string[];
 }
 
 export interface ChannelDocument extends Document, AnyChannel {
@@ -44,6 +44,9 @@ ChannelSchema.virtual("recipients", {
 	justOne: false,
 	autopopulate: true,
 });
+
+ChannelSchema.set("removeResponse", ["recipient_ids"]);
+
 // @ts-ignore
 export const ChannelModel = db.model<ChannelDocument>("Channel", ChannelSchema, "channels");
 
diff --git a/src/util/Permissions.ts b/src/util/Permissions.ts
index e454bf00..d9bd0ae0 100644
--- a/src/util/Permissions.ts
+++ b/src/util/Permissions.ts
@@ -145,7 +145,7 @@ export class Permissions extends BitField {
 		guild: { roles: Role[] };
 		channel?: {
 			overwrites?: ChannelPermissionOverwrite[];
-			recipients?: string[] | null;
+			recipient_ids?: string[] | null;
 			owner_id?: string;
 		};
 	}) {
@@ -163,9 +163,9 @@ export class Permissions extends BitField {
 			permission = Permissions.channelPermission(overwrites, permission);
 		}
 
-		if (channel?.recipients) {
+		if (channel?.recipient_ids) {
 			if (channel?.owner_id === user.id) return new Permissions("ADMINISTRATOR");
-			if (channel.recipients.includes(user.id)) {
+			if (channel.recipient_ids.includes(user.id)) {
 				// Default dm permissions
 				return new Permissions([
 					"VIEW_CHANNEL",
@@ -210,7 +210,7 @@ export async function getPermission(
 	if (channel_id && !channel) {
 		channel = await ChannelModel.findOne(
 			{ id: channel_id },
-			{ permission_overwrites: true, recipients: true, owner_id: true, guild_id: true }
+			{ permission_overwrites: true, recipient_ids: true, owner_id: true, guild_id: true }
 		).exec();
 		if (!channel) throw new HTTPError("Channel not found", 404);
 		if (channel.guild_id) guild_id = channel.guild_id;
@@ -238,7 +238,7 @@ export async function getPermission(
 		channel: {
 			overwrites: channel?.permission_overwrites,
 			owner_id: channel?.owner_id,
-			recipients: channel?.recipients,
+			recipient_ids: channel?.recipient_ids,
 		},
 	});