From d0292ef96bedde2dd23962c15b2a0446b8492fb0 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Sun, 29 Aug 2021 17:12:46 +0200
Subject: [PATCH] :bug: convert bigint -> string

---
 api/src/middlewares/RateLimit.ts              |   4 ++--
 .../channels/#channel_id/messages/index.ts    |   2 +-
 api/src/routes/guilds/index.ts                |   2 +-
 api/src/schema/Guild.ts                       |   2 +-
 bundle/database.db                            | Bin 225280 -> 225280 bytes
 gateway/src/opcodes/Identify.ts               |   2 +-
 gateway/src/schema/Activity.ts                |   4 ++--
 util/src/entities/Application.ts              |   2 +-
 util/src/interfaces/Event.ts                  |   6 +++---
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/api/src/middlewares/RateLimit.ts b/api/src/middlewares/RateLimit.ts
index e0cf103a..ed6b951a 100644
--- a/api/src/middlewares/RateLimit.ts
+++ b/api/src/middlewares/RateLimit.ts
@@ -1,6 +1,6 @@
 import { Config, listenEvent, emitEvent, RateLimit } from "@fosscord/util";
 import { NextFunction, Request, Response, Router } from "express";
-import { LessThan } from "typeorm";
+import { LessThan, MoreThan } from "typeorm";
 import { getIpAdress } from "../util/ipAddress";
 import { API_PREFIX_TRAILING_SLASH } from "./Authentication";
 
@@ -100,7 +100,7 @@ export async function initRateLimits(app: Router) {
 		Cache.set(event.channel_id as string, event.data);
 		event.acknowledge?.();
 	});
-	await RateLimit.delete({ expires_at: LessThan(new Date()) }); // clean up if not already deleted
+	await RateLimit.delete({ expires_at: MoreThan(new Date()) }); // cleans up if not already deleted, morethan -> older date
 	const limits = await RateLimit.find({ blocked: true });
 	limits.forEach((limit) => {
 		Cache.set(limit.executor_id, limit);
diff --git a/api/src/routes/channels/#channel_id/messages/index.ts b/api/src/routes/channels/#channel_id/messages/index.ts
index 6307c022..17944548 100644
--- a/api/src/routes/channels/#channel_id/messages/index.ts
+++ b/api/src/routes/channels/#channel_id/messages/index.ts
@@ -77,7 +77,7 @@ router.get("/", async (req: Request, res: Response) => {
 			delete x.user_ids;
 		});
 		// @ts-ignore
-		if (!x.author) x.author = { discriminator: "0000", username: "Deleted User", public_flags: 0n, avatar: null };
+		if (!x.author) x.author = { discriminator: "0000", username: "Deleted User", public_flags: "0", avatar: null };
 
 		return x;
 	});
diff --git a/api/src/routes/guilds/index.ts b/api/src/routes/guilds/index.ts
index c158c7d4..1e83cf13 100644
--- a/api/src/routes/guilds/index.ts
+++ b/api/src/routes/guilds/index.ts
@@ -47,7 +47,7 @@ router.post("/", check(GuildCreateSchema), async (req: Request, res: Response) =
 		premium_tier: 0,
 		public_updates_channel_id: undefined,
 		rules_channel_id: undefined,
-		system_channel_flags: 0,
+		system_channel_flags: "0",
 		system_channel_id: undefined,
 		unavailable: false,
 		vanity_url_code: undefined,
diff --git a/api/src/schema/Guild.ts b/api/src/schema/Guild.ts
index 01690ae9..3e98fe76 100644
--- a/api/src/schema/Guild.ts
+++ b/api/src/schema/Guild.ts
@@ -33,7 +33,7 @@ export const GuildUpdateSchema = {
 	$icon: String,
 	$verification_level: Number,
 	$default_message_notifications: Number,
-	$system_channel_flags: Number,
+	$system_channel_flags: String,
 	$system_channel_id: String,
 	$explicit_content_filter: Number,
 	$public_updates_channel_id: String,
diff --git a/bundle/database.db b/bundle/database.db
index 9572c45e6e1597955832f51dd400105d0fadc376..2d4abd490aa25b3803c17e195c4a4bb2e633c7b6 100644
GIT binary patch
delta 7060
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

delta 1171
zcmZuwU1%d!6rSX!nVKg3Sqm#_wFFCDQ#MH_$s|h`H~&A=G-;ExO+=>C$(>}<%unx3
zesMPyg%xF?Zeb%VF0!x+f)Cq1jJ^o_=#z+`KKM|@2OmTbUlx(Yn}Q&_UijeNk8{5J
zox?c?r;dYD$Ki7`NrE6~3_k|I*nfYCG9~Ztyf<Zq_(^S?{4w?Pm3tO2e_~NhJ7ab$
zVYi;lO#eM$x!y6&o!EZ-%RJCDt_InvsHsh^$MTA#a=h-mBydd)E;(gR7u%3k>xv9n
zQPyD%VMdWzD090_San{~Q47Z*C|4n3p|lID+G8YwSP|#^hu3r@@;a=twLwd4jxt_*
zeaWfSl@80d5Ej$f8YjVjg*2VhTR6z62treop%cgISXN?XMHdB;Kl7wLZc4Aik%qI%
zp*@_UixTXQ>cA=*#5H=Z+K9Kzr-u2|^k_gjaLX3QXOGC89PZJV<jHLPH<GlCSo^_{
zRLvv$6}xfphI!8JSoVcz4;}LOgFb56`1Bp~@8*G!pemHeWlFVmPs6pmzt?S6gvb_M
zRrEFmJte5h@mi+m)-vhK*iWOQ7a)&DPMlmPn%yo}(g9a2RWGWEdY%gQ^*)l29!XVJ
zb9u!RQ$tKMhQeh<NyUTVnv~-LtEEkuruyD&FVss6R&^H?T8((TAxEQKm=GC#RqeWc
zZ8amb+Ag%&ZL6`}BvbaSr8bHv-U=67&2q7qjnN3@3dOkJ8|xq@SoYFdfXW8zr9J<C
zW1H(I8*z6O(m5}a4fL6ABhsiU&Fy@k?GE%ZkpvT{Hfg~%@U10xJ4`|3H-n{2sDNUf
zLYFF}i~fCaD=$Q;VwehZl)BanyDDih<x5KCBoab>S2w!O7h$g-FKi@ZA--2nYJRR7
z@YlC}44;J?{-C_2q}=H+BQMiis9mnCrbF(AH@#6t-atZx(ONydJKOIn=~}*;+T+*z
z&2Xn61>)<*g&XD{ZZ1rHOW27AgyU<+EqlwJd1`L_7wgMoe}cPH-xCjs2OwfPG#wtz
zOy4$KFM*%ThJO)6#;kP4dY)N0x<C2M@beWgXG$C2t$?3R!|Q7xHT;kP?cp>HW^TO-
zx<-2mybCONSS&;PBDgR=nkE}@OgOGN7<*>o;lzu!U&*h?JH)ZgAaVp6&U?V+qc0|>
z<2sa71#zgyO7LtMHP-tiN8_{?&U?M4+o2m*Me^*nppSO&EY>*ofDa}tZ(b{r!?hJ~
z(fDK@ybaD_6Qg6sATg|V(KvSn7~{qx3Va02(Z<ndlh3=K{Ox}oV1aQA!ni|&XMsr=
Oev<<iP2|UUF#iv*19mt7

diff --git a/gateway/src/opcodes/Identify.ts b/gateway/src/opcodes/Identify.ts
index 5be2acce..87008998 100644
--- a/gateway/src/opcodes/Identify.ts
+++ b/gateway/src/opcodes/Identify.ts
@@ -42,7 +42,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 		}
 	}
 
-	const members = await Member.find({ where: { id: this.user_id }, relations: ["guilds"] });
+	const members = await Member.find({ where: { id: this.user_id }, relations: ["guild"] });
 	const merged_members = members.map((x: any) => {
 		const y = { ...x, user_id: x.id };
 		delete y.settings;
diff --git a/gateway/src/schema/Activity.ts b/gateway/src/schema/Activity.ts
index 0fd0592f..f1665efd 100644
--- a/gateway/src/schema/Activity.ts
+++ b/gateway/src/schema/Activity.ts
@@ -39,7 +39,7 @@ export const ActivitySchema = {
 				$match: String,
 			},
 			$instance: Boolean,
-			$flags: BigInt,
+			$flags: String,
 		},
 	],
 	$since: Number, // unix time (in milliseconds) of when the client went idle, or null if the client is not idle
@@ -79,7 +79,7 @@ export interface ActivitySchema {
 				match?: string; // the secret for a specific instanced match
 			};
 			instance?: boolean;
-			flags: bigint; // activity flags OR d together, describes what the payload includes
+			flags: string; // activity flags OR d together, describes what the payload includes
 		}
 	];
 	since?: number; // unix time (in milliseconds) of when the client went idle, or null if the client is not idle
diff --git a/util/src/entities/Application.ts b/util/src/entities/Application.ts
index a87b5cea..b179d171 100644
--- a/util/src/entities/Application.ts
+++ b/util/src/entities/Application.ts
@@ -62,7 +62,7 @@ export class Application extends BaseClass {
 	cover_image?: string; // the application's default rich presence invite cover image hash
 
 	@Column()
-	flags: number; // the application's public flags
+	flags: string; // the application's public flags
 }
 
 export interface ApplicationCommand {
diff --git a/util/src/interfaces/Event.ts b/util/src/interfaces/Event.ts
index 0de55f71..814a8beb 100644
--- a/util/src/interfaces/Event.ts
+++ b/util/src/interfaces/Event.ts
@@ -36,7 +36,7 @@ export interface ReadyEventData {
 		mobile: boolean;
 		desktop: boolean;
 		email: string | undefined;
-		flags: bigint;
+		flags: string;
 		mfa_enabled: boolean;
 		nsfw_allowed: boolean;
 		phone: string | undefined;
@@ -85,7 +85,7 @@ export interface ReadyEventData {
 	};
 	application?: {
 		id: string;
-		flags: bigint;
+		flags: string;
 	};
 	merged_members?: Omit<Member, "settings" | "user">[][];
 	// probably all users who the user is in contact with
@@ -95,7 +95,7 @@ export interface ReadyEventData {
 		id: string;
 		username: string;
 		bot: boolean;
-		public_flags: bigint;
+		public_flags: string;
 	}[];
 }