From 86700f88abe1ca2d811169316443c5339484b72e Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Sun, 14 Feb 2021 20:16:49 +0100
Subject: :bug: fix public member type

---
 src/models/Event.ts     | 1 -
 src/models/Member.ts    | 8 ++++++--
 src/util/Permissions.ts | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/models/Event.ts b/src/models/Event.ts
index e8dfe11e..4e2736c0 100644
--- a/src/models/Event.ts
+++ b/src/models/Event.ts
@@ -416,7 +416,6 @@ export type EVENT =
 	| "GUILD_MEMBER_ADD"
 	| "GUILD_MEMBER_REMOVE"
 	| "GUILD_MEMBER_UPDATE"
-	| "GUILD_MEMBER_AVAILABLE"
 	| "GUILD_MEMBER_SPEAKING"
 	| "GUILD_MEMBERS_CHUNK"
 	| "GUILD_ROLE_CREATE"
diff --git a/src/models/Member.ts b/src/models/Member.ts
index dd26782f..c4d3a598 100644
--- a/src/models/Member.ts
+++ b/src/models/Member.ts
@@ -1,7 +1,7 @@
 import { PublicUser } from "./User";
 import { Schema, model, Types, Document } from "mongoose";
 
-export interface Member extends Document {
+export interface Member {
 	id: bigint;
 	guild_id: bigint;
 	nick?: string;
@@ -15,6 +15,10 @@ export interface Member extends Document {
 	settings: UserGuildSettings;
 }
 
+export interface MemberDocument extends Member, Document {
+	id: bigint;
+}
+
 export interface UserGuildSettings {
 	channel_overrides: {
 		channel_id: bigint;
@@ -71,7 +75,7 @@ export const MemberSchema = new Schema({
 	},
 });
 
-export const MemberModel = model<Member>("Member", MemberSchema, "members");
+export const MemberModel = model<MemberDocument>("Member", MemberSchema, "members");
 
 export interface PublicMember extends Omit<Member, "settings" | "id"> {
 	user: PublicUser;
diff --git a/src/util/Permissions.ts b/src/util/Permissions.ts
index c7a3d81f..56540b8f 100644
--- a/src/util/Permissions.ts
+++ b/src/util/Permissions.ts
@@ -88,7 +88,7 @@ export class Permissions extends BitField {
 	}
 
 	static channelPermission(overwrites: ChannelPermissionOverwrite[], init?: bigint) {
-		// channelOverwrites.filter((x) => x.type === 1 && x.id !== user.id);
+		// TODO: do not deny any permissions if admin
 		return overwrites.reduce((permission, overwrite) => {
 			// apply disallowed permission
 			// * permission: current calculated permission (e.g. 010)
-- 
cgit 1.5.1