Merge branch 'master' into maddyrtc

api/assets/openapi.json

@@ -2821,6 +2821,10 @@
 						"type": "string",
 						"format": "date-time"
 					},
+					"premium_since": {
+						"type": "string",
+						"format": "date-time"
+					},
 					"verified": {
 						"type": "boolean"
 					},
@@ -3800,7 +3804,8 @@
 						"format": "date-time"
 					},
 					"premium_since": {
-						"type": "integer"
+						"type": "string",
+						"format": "date-time"
 					},
 					"deaf": {
 						"type": "boolean"

api/package.json

@@ -49,7 +49,7 @@
 		"@types/morgan": "^1.9.3",
 		"@types/multer": "^1.4.5",
 		"@types/node": "^14.17.9",
-		"@types/node-fetch": "^2.5.7",
+		"@types/node-fetch": "^2.5.5",
 		"@types/supertest": "^2.0.11",
 		"@zerollup/ts-transform-paths": "^1.7.18",
 		"jest": "^27.2.5",
@@ -86,7 +86,7 @@
 		"missing-native-js-functions": "^1.2.18",
 		"morgan": "^1.10.0",
 		"multer": "^1.4.2",
-		"node-fetch": "^3.1.1",
+		"node-fetch": "^2.6.2",
 		"patch-package": "^6.4.7",
 		"picocolors": "^1.0.0",
 		"proxy-agent": "^5.0.0",

api/src/routes/guilds/#guild_id/bans.ts

@@ -1,5 +1,5 @@
 import { Request, Response, Router } from "express";
-import { emitEvent, getPermission, GuildBanAddEvent, GuildBanRemoveEvent, Guild, Ban, User, Member } from "@fosscord/util";
+import { DiscordApiErrors, emitEvent, getPermission, GuildBanAddEvent, GuildBanRemoveEvent, Guild, Ban, User, Member } from "@fosscord/util";
 import { HTTPError } from "lambert-server";
 import { getIpAdress, route } from "@fosscord/api";
 
@@ -17,6 +17,14 @@ export interface BanRegistrySchema {
 	reason?: string | undefined;
 };
 
+export interface BanModeratorSchema {
+	id: string;
+	user_id: string;
+	guild_id: string;
+	executor_id: string;
+	reason?: string | undefined;
+};
+
 const router: Router = Router();
 
 /* TODO: Deleting the secrets is just a temporary go-around. Views should be implemented for both safety and better handling. */
@@ -28,6 +36,9 @@ router.get("/", route({ permission: "BAN_MEMBERS" }), async (req: Request, res:
 
 	/* Filter secret from database registry.*/
 
+	bans.filter(ban => ban.user_id !== ban.executor_id);
+	// pretend self-bans don't exist to prevent victim chasing
+	
 	bans.forEach((registry: BanRegistrySchema) => {
 	delete registry.ip;
 	});
@@ -41,8 +52,13 @@ router.get("/:user", route({ permission: "BAN_MEMBERS" }), async (req: Request,
 
 	let ban = await Ban.findOneOrFail({ guild_id: guild_id, user_id: user_id }) as BanRegistrySchema;
 	
+	if (ban.user_id === ban.executor_id) throw DiscordApiErrors.UNKNOWN_BAN;
+	// pretend self-bans don't exist to prevent victim chasing
+	
 	/* Filter secret from registry. */
 	
+	ban = ban as BanModeratorSchema;
+
 	delete ban.ip
 
 	return res.json(ban);
@@ -52,11 +68,13 @@ router.put("/:user_id", route({ body: "BanCreateSchema", permission: "BAN_MEMBER
 	const { guild_id } = req.params;
 	const banned_user_id = req.params.user_id;
 
-	const banned_user = await User.getPublicUser(banned_user_id);
+	if ( (req.user_id === banned_user_id) && (banned_user_id === req.permission!.cache.guild?.owner_id))
+		throw new HTTPError("You are the guild owner, hence can't ban yourself", 403);
 	
-	if (req.user_id === banned_user_id) throw new HTTPError("You can't ban yourself", 400);
 	if (req.permission!.cache.guild?.owner_id === banned_user_id) throw new HTTPError("You can't ban the owner", 400);
 	
+	const banned_user = await User.getPublicUser(banned_user_id);
+
 	const ban = new Ban({
 		user_id: banned_user_id,
 		guild_id: guild_id,
@@ -81,9 +99,46 @@ router.put("/:user_id", route({ body: "BanCreateSchema", permission: "BAN_MEMBER
 	return res.json(ban);
 });
 
+router.put("/@me", route({ body: "BanCreateSchema"}), async (req: Request, res: Response) => {
+	const { guild_id } = req.params;
+
+	const banned_user = await User.getPublicUser(req.params.user_id);
+
+	if (req.permission!.cache.guild?.owner_id === req.params.user_id) 
+		throw new HTTPError("You are the guild owner, hence can't ban yourself", 403);
+	
+	const ban = new Ban({
+		user_id: req.params.user_id,
+		guild_id: guild_id,
+		ip: getIpAdress(req),
+		executor_id: req.params.user_id,
+		reason: req.body.reason // || otherwise empty
+	});
+
+	await Promise.all([
+		Member.removeFromGuild(req.user_id, guild_id),
+		ban.save(),
+		emitEvent({
+			event: "GUILD_BAN_ADD",
+			data: {
+				guild_id: guild_id,
+				user: banned_user
+			},
+			guild_id: guild_id
+		} as GuildBanAddEvent)
+	]);
+
+	return res.json(ban);
+});
+
 router.delete("/:user_id", route({ permission: "BAN_MEMBERS" }), async (req: Request, res: Response) => {
 	const { guild_id, user_id } = req.params;
 
+	let ban = await Ban.findOneOrFail({ guild_id: guild_id, user_id: user_id });
+	
+	if (ban.user_id === ban.executor_id) throw DiscordApiErrors.UNKNOWN_BAN;
+	// make self-bans irreversible and hide them from view to avoid victim chasing
+	
 	const banned_user = await User.getPublicUser(user_id);
 	
 	await Promise.all([

api/src/routes/users/#id/profile.ts

@@ -16,22 +16,30 @@ router.get("/", route({ test: { response: { body: "UserProfileResponse" } } }),
 	const user = await User.getPublicUser(req.params.id, { relations: ["connected_accounts"] });
 
 	var mutual_guilds: object[] = [];
-
+	var premium_guild_since;
 	const requested_member = await Member.find( { id: req.params.id,  })
 	const self_member = await Member.find( { id: req.user_id,  })
 
 	for(const rmem of requested_member) {
+		if(rmem.premium_since) {
+			if(premium_guild_since){
+				if(premium_guild_since > rmem.premium_since) {
+					premium_guild_since = rmem.premium_since;
+				}
+			} else {
+				premium_guild_since = rmem.premium_since;
+			}
+		}
 		for(const smem of self_member) {
 			if (smem.guild_id === rmem.guild_id) {
 				mutual_guilds.push({id: rmem.guild_id, nick: rmem.nick})
 			}
 		}
 	}
-
 	res.json({
 		connected_accounts: user.connected_accounts,
-		premium_guild_since: null, // TODO
+		premium_guild_since: premium_guild_since, // TODO
-		premium_since: null, // TODO
+		premium_since: user.premium_since, // TODO
 		mutual_guilds: mutual_guilds, // TODO {id: "", nick: null} when ?with_mutual_guilds=true
 		user: {
 			username: user.username,

api/src/routes/users/@me/index.ts

@@ -58,7 +58,7 @@ router.patch("/", route({ body: "UserModifySchema" }), async (req: Request, res:
 	}
 
 	var check_username = body?.username?.replace(/\s/g, '');
-	if(!check_username) {
+	if(!check_username && !body?.avatar && !body?.banner) {
 		throw FieldErrors({
 			username: { code: "BASE_TYPE_REQUIRED", message: req.t("common:field.BASE_TYPE_REQUIRED") }
 		});

bundle/.vscode/launch.json

@@ -1,9 +1,26 @@
 {
-	// Use IntelliSense to learn about possible attributes.
-	// Hover to view descriptions of existing attributes.
-	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
 	"version": "0.2.0",
 	"configurations": [
+		{
+			"sourceMaps": true,
+			"name": "ts-node",
+			"type": "node",
+			"request": "launch",
+			"args": [
+				"${workspaceFolder}/src/start.ts"
+			],
+			"runtimeArgs": [
+				"-r",
+				"ts-node/register"
+			],
+			"protocol": "inspector",
+			"internalConsoleOptions": "openOnSessionStart",
+			"env": {
+				"TS_NODE_PROJECT": "${workspaceFolder}/tsnode.tsconfig.json",
+				"TS_NODE_COMPILER": "typescript-cached-transpile"
+			},
+			"resolveSourceMapLocations": null, /* allow breakpoints in modules other than bundle */
+		},
 		{
 			"sourceMaps": true,
 			"type": "node",
@@ -12,7 +29,7 @@
 			"program": "${workspaceFolder}/dist/bundle/src/start.js",
 			"preLaunchTask": "tsc: build - tsconfig.json",
 			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
-			"envFile": "${workspaceFolder}/.env"
+			"envFile": "${workspaceFolder}/.env",
 		}
 	]
 }

bundle/package-lock.json

@@ -46,6 +46,7 @@
 				"missing-native-js-functions": "^1.2.18",
 				"morgan": "^1.10.0",
 				"multer": "^1.4.2",
+				"nan": "^2.15.0",
 				"nanocolors": "^0.2.12",
 				"node-fetch": "^2.6.2",
 				"node-os-utils": "^1.3.5",
@@ -59,6 +60,7 @@
 				"tslib": "^2.3.1",
 				"typeorm": "^0.2.37",
 				"typescript": "^4.1.2",
+				"typescript-cached-transpile": "^0.0.6",
 				"typescript-json-schema": "^0.50.1",
 				"ws": "^7.4.2"
 			},
@@ -91,6 +93,7 @@
 				"ts-node": "^10.2.1",
 				"ts-node-dev": "^1.1.6",
 				"ts-patch": "^1.4.4",
+				"tsconfig-paths": "^3.12.0",
 				"typescript": "^4.2.3",
 				"typescript-json-schema": "0.50.1"
 			}
@@ -125,7 +128,7 @@
 				"missing-native-js-functions": "^1.2.18",
 				"morgan": "^1.10.0",
 				"multer": "^1.4.2",
-				"node-fetch": "^3.1.1",
+				"node-fetch": "^2.6.2",
 				"patch-package": "^6.4.7",
 				"picocolors": "^1.0.0",
 				"proxy-agent": "^5.0.0",
@@ -146,7 +149,7 @@
 				"@types/morgan": "^1.9.3",
 				"@types/multer": "^1.4.5",
 				"@types/node": "^14.17.9",
-				"@types/node-fetch": "^2.5.7",
+				"@types/node-fetch": "^2.5.5",
 				"@types/supertest": "^2.0.11",
 				"@zerollup/ts-transform-paths": "^1.7.18",
 				"jest": "^27.2.5",
@@ -183,7 +186,7 @@
 				"missing-native-js-functions": "^1.2.17",
 				"multer": "^1.4.2",
 				"nanocolors": "^0.2.12",
-				"node-fetch": "^2.6.7",
+				"node-fetch": "^2.6.2",
 				"supertest": "^6.1.6",
 				"typescript": "^4.1.2"
 			},
@@ -3602,6 +3605,12 @@
 			"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
 			"dev": true
 		},
+		"node_modules/@types/json5": {
+			"version": "0.0.29",
+			"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+			"integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+			"dev": true
+		},
 		"node_modules/@types/jsonwebtoken": {
 			"version": "8.5.5",
 			"integrity": "sha512-OGqtHQ7N5/Ap/TUwO6IgHDuLiAoTmHhGpNvgkCm/F4N6pKzx/RBSfr2OXZSwC6vkfnsEdb6+7DNZVtiXiwdwFw==",
@@ -9486,7 +9495,6 @@
 			"integrity": "sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg==",
 			"hasInstallScript": true,
 			"dependencies": {
-				"nan": "^2.12.1",
 				"node-pre-gyp": "^0.11.0"
 			}
 		},
@@ -10179,6 +10187,39 @@
 				"strip-json-comments": "^2.0.0"
 			}
 		},
+		"node_modules/tsconfig-paths": {
+			"version": "3.12.0",
+			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz",
+			"integrity": "sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==",
+			"dev": true,
+			"dependencies": {
+				"@types/json5": "^0.0.29",
+				"json5": "^1.0.1",
+				"minimist": "^1.2.0",
+				"strip-bom": "^3.0.0"
+			}
+		},
+		"node_modules/tsconfig-paths/node_modules/json5": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+			"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+			"dev": true,
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			}
+		},
+		"node_modules/tsconfig-paths/node_modules/strip-bom": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/tsconfig/node_modules/strip-bom": {
 			"version": "3.0.0",
 			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
@@ -10440,7 +10481,6 @@
 		"node_modules/typescript": {
 			"version": "4.4.3",
 			"integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==",
-			"dev": true,
 			"bin": {
 				"tsc": "bin/tsc",
 				"tsserver": "bin/tsserver"
@@ -10449,6 +10489,58 @@
 				"node": ">=4.2.0"
 			}
 		},
+		"node_modules/typescript-cached-transpile": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/typescript-cached-transpile/-/typescript-cached-transpile-0.0.6.tgz",
+			"integrity": "sha512-bfPc7YUW0PrVkQHU0xN0ANRuxdPgoYYXtZEW6PNkH5a97/AOM+kPPxSTMZbpWA3BG1do22JUkfC60KoCKJ9VZQ==",
+			"dependencies": {
+				"@types/node": "^12.12.7",
+				"fs-extra": "^8.1.0",
+				"tslib": "^1.10.0"
+			},
+			"peerDependencies": {
+				"typescript": "*"
+			}
+		},
+		"node_modules/typescript-cached-transpile/node_modules/@types/node": {
+			"version": "12.20.41",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.41.tgz",
+			"integrity": "sha512-f6xOqucbDirG7LOzedpvzjP3UTmHttRou3Mosx3vL9wr9AIQGhcPgVnqa8ihpZYnxyM1rxeNCvTyukPKZtq10Q=="
+		},
+		"node_modules/typescript-cached-transpile/node_modules/fs-extra": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+			"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+			"dependencies": {
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^4.0.0",
+				"universalify": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=6 <7 || >=8"
+			}
+		},
+		"node_modules/typescript-cached-transpile/node_modules/jsonfile": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"node_modules/typescript-cached-transpile/node_modules/tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+		},
+		"node_modules/typescript-cached-transpile/node_modules/universalify": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+			"engines": {
+				"node": ">= 4.0.0"
+			}
+		},
 		"node_modules/typescript-json-schema": {
 			"version": "0.50.1",
 			"integrity": "sha512-GCof/SDoiTDl0qzPonNEV4CHyCsZEIIf+mZtlrjoD8vURCcEzEfa2deRuxYid8Znp/e27eDR7Cjg8jgGrimBCA==",
@@ -10544,8 +10636,9 @@
 			}
 		},
 		"node_modules/url-parse": {
-			"version": "1.5.3",
+			"version": "1.5.10",
-			"integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
 			"dependencies": {
 				"querystringify": "^2.1.1",
 				"requires-port": "^1.0.0"
@@ -12906,7 +12999,7 @@
 				"@types/morgan": "^1.9.3",
 				"@types/multer": "^1.4.5",
 				"@types/node": "^14.17.9",
-				"@types/node-fetch": "^2.5.7",
+				"@types/node-fetch": "^2.5.5",
 				"@types/supertest": "^2.0.11",
 				"@zerollup/ts-transform-paths": "^1.7.18",
 				"ajv": "8.6.2",
@@ -12931,7 +13024,7 @@
 				"missing-native-js-functions": "^1.2.18",
 				"morgan": "^1.10.0",
 				"multer": "^1.4.2",
-				"node-fetch": "^3.1.1",
+				"node-fetch": "^2.6.2",
 				"patch-package": "^6.4.7",
 				"picocolors": "^1.0.0",
 				"proxy-agent": "^5.0.0",
@@ -12977,7 +13070,7 @@
 				"missing-native-js-functions": "^1.2.17",
 				"multer": "^1.4.2",
 				"nanocolors": "^0.2.12",
-				"node-fetch": "^2.6.7",
+				"node-fetch": "^2.6.2",
 				"supertest": "^6.1.6",
 				"ts-patch": "^1.4.4",
 				"typescript": "^4.1.2"
@@ -13654,6 +13747,12 @@
 			"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
 			"dev": true
 		},
+		"@types/json5": {
+			"version": "0.0.29",
+			"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+			"integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+			"dev": true
+		},
 		"@types/jsonwebtoken": {
 			"version": "8.5.5",
 			"integrity": "sha512-OGqtHQ7N5/Ap/TUwO6IgHDuLiAoTmHhGpNvgkCm/F4N6pKzx/RBSfr2OXZSwC6vkfnsEdb6+7DNZVtiXiwdwFw==",
@@ -18072,7 +18171,6 @@
 			"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz",
 			"integrity": "sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg==",
 			"requires": {
-				"nan": "^2.12.1",
 				"node-pre-gyp": "^0.11.0"
 			}
 		},
@@ -18560,6 +18658,35 @@
 				}
 			}
 		},
+		"tsconfig-paths": {
+			"version": "3.12.0",
+			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz",
+			"integrity": "sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==",
+			"dev": true,
+			"requires": {
+				"@types/json5": "^0.0.29",
+				"json5": "^1.0.1",
+				"minimist": "^1.2.0",
+				"strip-bom": "^3.0.0"
+			},
+			"dependencies": {
+				"json5": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+					"dev": true,
+					"requires": {
+						"minimist": "^1.2.0"
+					}
+				},
+				"strip-bom": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+					"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+					"dev": true
+				}
+			}
+		},
 		"tslib": {
 			"version": "2.3.1",
 			"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
@@ -18692,8 +18819,52 @@
 		},
 		"typescript": {
 			"version": "4.4.3",
-			"integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==",
+			"integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA=="
-			"dev": true
+		},
+		"typescript-cached-transpile": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/typescript-cached-transpile/-/typescript-cached-transpile-0.0.6.tgz",
+			"integrity": "sha512-bfPc7YUW0PrVkQHU0xN0ANRuxdPgoYYXtZEW6PNkH5a97/AOM+kPPxSTMZbpWA3BG1do22JUkfC60KoCKJ9VZQ==",
+			"requires": {
+				"@types/node": "^12.12.7",
+				"fs-extra": "^8.1.0",
+				"tslib": "^1.10.0"
+			},
+			"dependencies": {
+				"@types/node": {
+					"version": "12.20.41",
+					"resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.41.tgz",
+					"integrity": "sha512-f6xOqucbDirG7LOzedpvzjP3UTmHttRou3Mosx3vL9wr9AIQGhcPgVnqa8ihpZYnxyM1rxeNCvTyukPKZtq10Q=="
+				},
+				"fs-extra": {
+					"version": "8.1.0",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+					"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+					"requires": {
+						"graceful-fs": "^4.2.0",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
+					}
+				},
+				"jsonfile": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+					"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+					"requires": {
+						"graceful-fs": "^4.1.6"
+					}
+				},
+				"tslib": {
+					"version": "1.14.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+					"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+				},
+				"universalify": {
+					"version": "0.1.2",
+					"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+					"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+				}
+			}
 		},
 		"typescript-json-schema": {
 			"version": "0.50.1",
@@ -18764,8 +18935,9 @@
 			}
 		},
 		"url-parse": {
-			"version": "1.5.3",
+			"version": "1.5.10",
-			"integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
 			"requires": {
 				"querystringify": "^2.1.1",
 				"requires-port": "^1.0.0"

bundle/package.json

@@ -9,7 +9,8 @@
 		"start": "node scripts/build.js && node dist/bundle/src/start.js",
 		"start:bundle": "node dist/bundle/src/start.js",
 		"test": "echo \"Error: no test specified\" && exit 1",
-		"migrate": "cd ../util/ && npm i && node --require ts-node/register node_modules/typeorm/cli.js -f ../util/ormconfig.json migration:run"
+		"migrate": "cd ../util/ && npm i && node --require ts-node/register node_modules/typeorm/cli.js -f ../util/ormconfig.json migration:run",
+		"tsnode": "npx ts-node --transpile-only -P tsnode.tsconfig.json src/start.ts"
 	},
 	"repository": {
 		"type": "git",
@@ -51,6 +52,7 @@
 		"ts-node": "^10.2.1",
 		"ts-node-dev": "^1.1.6",
 		"ts-patch": "^1.4.4",
+		"tsconfig-paths": "^3.12.0",
 		"typescript": "^4.2.3",
 		"typescript-json-schema": "0.50.1"
 	},
@@ -92,6 +94,7 @@
 		"missing-native-js-functions": "^1.2.18",
 		"morgan": "^1.10.0",
 		"multer": "^1.4.2",
+		"nan": "^2.15.0",
 		"nanocolors": "^0.2.12",
 		"node-fetch": "^2.6.2",
 		"node-os-utils": "^1.3.5",
@@ -105,6 +108,7 @@
 		"tslib": "^2.3.1",
 		"typeorm": "^0.2.37",
 		"typescript": "^4.1.2",
+		"typescript-cached-transpile": "^0.0.6",
 		"typescript-json-schema": "^0.50.1",
 		"ws": "^7.4.2"
 	}

bundle/tsconfig.json

@@ -2,7 +2,6 @@
 	"include": ["dist/**/*.ts"],
 	"exclude": [],
 	"compilerOptions": {
-		/* Visit https://aka.ms/tsconfig.json to read more about this file */
 
 		/* Basic Options */
 		"incremental": false /* Enable incremental compilation */,
@@ -16,7 +15,7 @@
 		// "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
 		"declaration": false /* Generates corresponding '.d.ts' file. */,
 		"declarationMap": false /* Generates a sourcemap for each corresponding '.d.ts' file. */,
-		"sourceMap": false /* Generates corresponding '.map' file. */,
+		"sourceMap": true /* Generates corresponding '.map' file. */,
 		// "outFile": "./",                       /* Concatenate and emit output to single file. */
 		"outDir": "./dist/" /* Redirect output structure to the directory. */,
 		"rootDir": "./dist/" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,

bundle/tsnode.tsconfig.json

@@ -0,0 +1,15 @@
+{
+	"extends": "./tsconfig.json",
+	"ts-node": {
+		"transpileOnly": true,
+		"preferTsExts": true,
+		"require": ["tsconfig-paths/register"],
+		"compiler": "typescript-cached-transpile",
+	},
+	"compilerOptions": {
+		"rootDir": "../",
+		"baseUrl": "../",
+		"sourceRoot": "../",
+		"sourceMap": true,
+	}
+}

cdn/package-lock.json

@@ -28,7 +28,7 @@
 				"missing-native-js-functions": "^1.2.17",
 				"multer": "^1.4.2",
 				"nanocolors": "^0.2.12",
-				"node-fetch": "^2.6.7",
+				"node-fetch": "^2.6.2",
 				"supertest": "^6.1.6",
 				"typescript": "^4.1.2"
 			},

cdn/package.json

@@ -54,7 +54,7 @@
 		"missing-native-js-functions": "^1.2.17",
 		"multer": "^1.4.2",
 		"nanocolors": "^0.2.12",
-		"node-fetch": "^2.6.7",
+		"node-fetch": "^2.6.2",
 		"supertest": "^6.1.6",
 		"typescript": "^4.1.2"
 	},

gateway/package-lock.json

@@ -6679,8 +6679,9 @@
 			}
 		},
 		"../util/node_modules/url-parse": {
-			"version": "1.5.3",
+			"version": "1.5.10",
-			"integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
 			"dependencies": {
 				"querystringify": "^2.1.1",
 				"requires-port": "^1.0.0"
@@ -9896,8 +9897,9 @@
 			}
 		},
 		"node_modules/url-parse": {
-			"version": "1.5.3",
+			"version": "1.5.10",
-			"integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
 			"dependencies": {
 				"querystringify": "^2.1.1",
 				"requires-port": "^1.0.0"
@@ -15260,8 +15262,9 @@
 					}
 				},
 				"url-parse": {
-					"version": "1.5.3",
+					"version": "1.5.10",
-					"integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+					"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+					"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
 					"requires": {
 						"querystringify": "^2.1.1",
 						"requires-port": "^1.0.0"
@@ -17624,8 +17627,9 @@
 			"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
 		},
 		"url-parse": {
-			"version": "1.5.3",
+			"version": "1.5.10",
-			"integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
 			"requires": {
 				"querystringify": "^2.1.1",
 				"requires-port": "^1.0.0"

gateway/src/opcodes/Identify.ts

@@ -173,6 +173,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 			avatar: related_user.avatar,
 			bot: related_user.bot,
 			bio: related_user.bio,
+			premium_since: user.premium_since
 		};
 		users.push(public_related_user);
 	}
@@ -225,6 +226,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 		accent_color: user.accent_color || 0,
 		banner: user.banner,
 		bio: user.bio,
+		premium_since: user.premium_since
 	};
 
 	const d: ReadyEventData = {

util/package-lock.json

@@ -7623,9 +7623,9 @@
 			}
 		},
 		"node_modules/url-parse": {
-			"version": "1.5.3",
+			"version": "1.5.10",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-			"integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
 			"dependencies": {
 				"querystringify": "^2.1.1",
 				"requires-port": "^1.0.0"
@@ -14029,9 +14029,9 @@
 			}
 		},
 		"url-parse": {
-			"version": "1.5.3",
+			"version": "1.5.10",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-			"integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
 			"requires": {
 				"querystringify": "^2.1.1",
 				"requires-port": "^1.0.0"

util/src/entities/Member.ts

@@ -86,7 +86,7 @@ export class Member extends BaseClassWithoutId {
 	joined_at: Date;
 
 	@Column({ nullable: true })
-	premium_since?: number;
+	premium_since?: Date;
 
 	@Column()
 	deaf: boolean;
@@ -245,7 +245,7 @@ export class Member extends BaseClassWithoutId {
 			nick: undefined,
 			roles: [guild_id], // @everyone role
 			joined_at: new Date(),
-			premium_since: undefined,
+			premium_since: new Date(),
 			deaf: false,
 			mute: false,
 			pending: false,

util/src/entities/ReadState.ts

@@ -31,9 +31,18 @@ export class ReadState extends BaseClass {
 	})
 	user: User;
 
+	// fully read marker
 	@Column({ nullable: true })
 	last_message_id: string; 
 	
+	// public read receipt
+	@Column({ nullable: true })
+	public_ack: string;
+
+	// notification cursor / private read receipt
+	@Column({ nullable: true })
+	notifications_cursor: string;
+
 	@Column({ nullable: true })
 	last_pin_timestamp?: Date;
 

util/src/entities/User.ts

@@ -16,6 +16,7 @@ export enum PublicUserEnum {
 	banner,
 	bio,
 	bot,
+	premium_since,
 }
 export type PublicUserKeys = keyof typeof PublicUserEnum;
 
@@ -110,6 +111,9 @@ export class User extends BaseClass {
 	@Column()
 	created_at: Date; // registration date
 
+	@Column({ nullable: true })
+	premium_since: Date; // premium date
+
 	@Column({ select: false })
 	verified: boolean; // if the user is offically verified
 
@@ -246,6 +250,7 @@ export class User extends BaseClass {
 			id: Snowflake.generate(),
 			bot: false,
 			system: false,
+			premium_since: new Date(),
 			desktop: false,
 			mobile: false,
 			premium: true,

util/src/util/TraverseDirectory.ts

@@ -1,6 +1,9 @@
 import { Server, traverseDirectory } from "lambert-server";
 
-const DEFAULT_FILTER = /^([^\.].*)(?<!\.d)\.(js)$/;
+//if we're using ts-node, use ts files instead of js
+const extension = Symbol.for("ts-node.register.instance") in process ? "ts" : "js"
+
+const DEFAULT_FILTER = new RegExp("^([^\.].*)(?<!\.d)\.(" + extension + ")$");
 
 export function registerRoutes(server: Server, root: string) {
 	return traverseDirectory(