summary refs log tree commit diff
path: root/util
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-06-26 23:14:10 +1000
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-06-26 23:14:10 +1000
commitd138b2b8426904e66b79e3ddee3492cbc80d0b16 (patch)
tree97242fa47542bf53aee0cdbe6bad37d12551655e /util
parentMerge branch 'master' into slowcord (diff)
downloadserver-d138b2b8426904e66b79e3ddee3492cbc80d0b16.tar.xz
Start of custom login and discord oauth flow
Diffstat (limited to 'util')
-rw-r--r--util/src/entities/Channel.ts1
-rw-r--r--util/src/util/Event.ts1
2 files changed, 2 insertions, 0 deletions
diff --git a/util/src/entities/Channel.ts b/util/src/entities/Channel.ts
index f3c40c83..c2c6fbbc 100644
--- a/util/src/entities/Channel.ts
+++ b/util/src/entities/Channel.ts
@@ -245,6 +245,7 @@ export class Channel extends BaseClass {
 

 	static async createDMChannel(recipients: string[], creator_user_id: string, name?: string) {

 		recipients = recipients.unique().filter((x) => x !== creator_user_id);

+		//@ts-ignore	some typeorm typescript issue

 		const otherRecipientsUsers = await User.find({ where: recipients.map((x) => ({ id: x })) });

 

 		// TODO: check config for max number of recipients

diff --git a/util/src/util/Event.ts b/util/src/util/Event.ts
index bb624051..20a638a0 100644
--- a/util/src/util/Event.ts
+++ b/util/src/util/Event.ts
@@ -62,6 +62,7 @@ export async function listenEvent(event: string, callback: (event: EventOpts) =>
 			msg.type === "event" && msg.id === event && callback({ ...msg.event, cancel });
 		};
 
+		//@ts-ignore apparently theres no function addListener with this signature
 		process.addListener("message", listener);
 		process.setMaxListeners(process.getMaxListeners() + 1);