From 256c7ed8fefac586590addf4aacae7ffdda0d577 Mon Sep 17 00:00:00 2001
From: Puyodead1 <puyodead@proton.me>
Date: Tue, 17 Jan 2023 11:12:25 -0500
Subject: send email verification

---
 src/util/entities/User.ts | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'src/util/entities')

diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts
index 7b67c2ac..f39fc19b 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -31,7 +31,7 @@ import { ConnectedAccount } from "./ConnectedAccount";
 import { Member } from "./Member";
 import { UserSettings } from "./UserSettings";
 import { Session } from "./Session";
-import { Config, FieldErrors, Snowflake, trimSpecial, adjustEmail } from "..";
+import { Config, FieldErrors, Snowflake, trimSpecial, adjustEmail, Email, generateToken } from "..";
 import { Request } from "express";
 import { SecurityKey } from "./SecurityKey";
 
@@ -383,6 +383,30 @@ export class User extends BaseClass {
 
 		user.validate();
 		await Promise.all([user.save(), settings.save()]);
+		// send verification email
+		if (Email.transporter && email) {
+			const token = (await generateToken(user.id, email)) as string;
+			const link = `http://localhost:3001/verify#token=${token}`;
+			const message = {
+				from:
+					Config.get().general.correspondenceEmail ||
+					"noreply@localhost",
+				to: email,
+				subject: `Verify Email Address for ${
+					Config.get().general.instanceName
+				}`,
+				html: `Please verify your email address by clicking the following link: <a href="${link}">Verify Email</a>`,
+			};
+
+			await Email.transporter
+				.sendMail(message)
+				.then((info) => {
+					console.log("Message sent: %s", info.messageId);
+				})
+				.catch((e) => {
+					console.error(`Failed to send email to ${email}: ${e}`);
+				});
+		}
 
 		setImmediate(async () => {
 			if (Config.get().guild.autoJoin.enabled) {
-- 
cgit 1.5.1


From a47d80b255f1501e39bebd7ad7e80119c8ed1697 Mon Sep 17 00:00:00 2001
From: Puyodead1 <puyodead@proton.me>
Date: Thu, 19 Jan 2023 11:15:12 -0500
Subject: Email verification works

- Added /auth/verify to authenticated route whitelist
- Updated /auth/verify to properly mark a user as verified, return a response, and fix expiration time check
- Implemented /auth/verify/resend
- Moved verification email sending to a helper method
- Fixed VerifyEmailSchema requiring captcha_key
---
 src/api/middlewares/Authentication.ts |  5 ++--
 src/api/routes/auth/verify/index.ts   | 23 +++++++++++++---
 src/api/routes/auth/verify/resend.ts  | 49 +++++++++++++++++++++++++++++++++++
 src/util/entities/User.ts             | 25 +++++-------------
 src/util/schemas/VerifyEmailSchema.ts |  2 +-
 src/util/util/Email.ts                | 26 +++++++++++++++++++
 src/util/util/Token.ts                | 24 +++++++++++++++++
 7 files changed, 130 insertions(+), 24 deletions(-)
 create mode 100644 src/api/routes/auth/verify/resend.ts

(limited to 'src/util/entities')

diff --git a/src/api/middlewares/Authentication.ts b/src/api/middlewares/Authentication.ts
index ea0aa312..f4c33963 100644
--- a/src/api/middlewares/Authentication.ts
+++ b/src/api/middlewares/Authentication.ts
@@ -16,10 +16,10 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { NextFunction, Request, Response } from "express";
-import { HTTPError } from "lambert-server";
 import { checkToken, Config, Rights } from "@fosscord/util";
 import * as Sentry from "@sentry/node";
+import { NextFunction, Request, Response } from "express";
+import { HTTPError } from "lambert-server";
 
 export const NO_AUTHORIZATION_ROUTES = [
 	// Authentication routes
@@ -28,6 +28,7 @@ export const NO_AUTHORIZATION_ROUTES = [
 	"/auth/location-metadata",
 	"/auth/mfa/totp",
 	"/auth/mfa/webauthn",
+	"/auth/verify",
 	// Routes with a seperate auth system
 	"/webhooks/",
 	// Public information endpoints
diff --git a/src/api/routes/auth/verify/index.ts b/src/api/routes/auth/verify/index.ts
index 4c076d09..d61b8d16 100644
--- a/src/api/routes/auth/verify/index.ts
+++ b/src/api/routes/auth/verify/index.ts
@@ -17,7 +17,11 @@
 */
 
 import { route, verifyCaptcha } from "@fosscord/api";
-import { Config, FieldErrors, verifyToken } from "@fosscord/util";
+import {
+	Config,
+	FieldErrors,
+	verifyTokenEmailVerification,
+} from "@fosscord/util";
 import { Request, Response, Router } from "express";
 import { HTTPError } from "lambert-server";
 const router = Router();
@@ -43,9 +47,13 @@ router.post(
 		try {
 			const { jwtSecret } = Config.get().security;
 
-			const { decoded, user } = await verifyToken(token, jwtSecret);
+			const { decoded, user } = await verifyTokenEmailVerification(
+				token,
+				jwtSecret,
+			);
+
 			// toksn should last for 24 hours from the time they were issued
-			if (decoded.exp < Date.now() / 1000) {
+			if (new Date().getTime() > decoded.iat * 1000 + 86400 * 1000) {
 				throw FieldErrors({
 					token: {
 						code: "TOKEN_INVALID",
@@ -53,7 +61,16 @@ router.post(
 					},
 				});
 			}
+
+			if (user.verified) return res.send(user);
+
+			// verify email
 			user.verified = true;
+			await user.save();
+
+			// TODO: invalidate token after use?
+
+			return res.send(user);
 		} catch (error: any) {
 			throw new HTTPError(error?.toString(), 400);
 		}
diff --git a/src/api/routes/auth/verify/resend.ts b/src/api/routes/auth/verify/resend.ts
new file mode 100644
index 00000000..0c8c4ed9
--- /dev/null
+++ b/src/api/routes/auth/verify/resend.ts
@@ -0,0 +1,49 @@
+/*
+	Fosscord: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Fosscord and Fosscord Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { route } from "@fosscord/api";
+import { Email, User } from "@fosscord/util";
+import { Request, Response, Router } from "express";
+import { HTTPError } from "lambert-server";
+const router = Router();
+
+router.post("/", route({}), async (req: Request, res: Response) => {
+	const user = await User.findOneOrFail({
+		where: { id: req.user_id },
+		select: ["email"],
+	});
+
+	if (!user.email) {
+		// TODO: whats the proper error response for this?
+		throw new HTTPError("User does not have an email address", 400);
+	}
+
+	await Email.sendVerificationEmail(req.user_id, user.email)
+		.then((info) => {
+			console.log("Message sent: %s", info.messageId);
+			return res.sendStatus(204);
+		})
+		.catch((e) => {
+			console.error(
+				`Failed to send verification email to ${user.username}#${user.discriminator}: ${e}`,
+			);
+			throw new HTTPError("Failed to send verification email", 500);
+		});
+});
+
+export default router;
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts
index f39fc19b..66e10297 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -383,28 +383,17 @@ export class User extends BaseClass {
 
 		user.validate();
 		await Promise.all([user.save(), settings.save()]);
-		// send verification email
-		if (Email.transporter && email) {
-			const token = (await generateToken(user.id, email)) as string;
-			const link = `http://localhost:3001/verify#token=${token}`;
-			const message = {
-				from:
-					Config.get().general.correspondenceEmail ||
-					"noreply@localhost",
-				to: email,
-				subject: `Verify Email Address for ${
-					Config.get().general.instanceName
-				}`,
-				html: `Please verify your email address by clicking the following link: <a href="${link}">Verify Email</a>`,
-			};
-
-			await Email.transporter
-				.sendMail(message)
+
+		// send verification email if users aren't verified by default and we have an email
+		if (!Config.get().defaults.user.verified && email) {
+			await Email.sendVerificationEmail(user.id, email)
 				.then((info) => {
 					console.log("Message sent: %s", info.messageId);
 				})
 				.catch((e) => {
-					console.error(`Failed to send email to ${email}: ${e}`);
+					console.error(
+						`Failed to send verification email to ${user.username}#${user.discriminator}: ${e}`,
+					);
 				});
 		}
 
diff --git a/src/util/schemas/VerifyEmailSchema.ts b/src/util/schemas/VerifyEmailSchema.ts
index fa6a4c0d..d94fbbc1 100644
--- a/src/util/schemas/VerifyEmailSchema.ts
+++ b/src/util/schemas/VerifyEmailSchema.ts
@@ -17,6 +17,6 @@
 */
 
 export interface VerifyEmailSchema {
-	captcha_key: string | null;
+	captcha_key?: string | null;
 	token: string;
 }
diff --git a/src/util/util/Email.ts b/src/util/util/Email.ts
index d45eb9a1..371ba827 100644
--- a/src/util/util/Email.ts
+++ b/src/util/util/Email.ts
@@ -16,6 +16,10 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import nodemailer, { Transporter } from "nodemailer";
+import { Config } from "./Config";
+import { generateToken } from "./Token";
+
 export const EMAIL_REGEX =
 	/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 
@@ -47,6 +51,7 @@ export function adjustEmail(email?: string): string | undefined {
 export const Email: {
 	transporter: Transporter | null;
 	init: () => Promise<void>;
+	sendVerificationEmail: (id: string, email: string) => Promise<any>;
 } = {
 	transporter: null,
 	init: async function () {
@@ -73,4 +78,25 @@ export const Email: {
 			console.log(`[SMTP] Ready`);
 		});
 	},
+	sendVerificationEmail: async function (
+		id: string,
+		email: string,
+	): Promise<any> {
+		if (!this.transporter) return;
+		const token = (await generateToken(id, email)) as string;
+		const instanceUrl =
+			Config.get().general.frontPage || "http://localhost:3001";
+		const link = `${instanceUrl}/verify#token=${token}`;
+		const message = {
+			from:
+				Config.get().general.correspondenceEmail || "noreply@localhost",
+			to: email,
+			subject: `Verify Email Address for ${
+				Config.get().general.instanceName
+			}`,
+			html: `Please verify your email address by clicking the following link: <a href="${link}">Verify Email</a>`,
+		};
+
+		return this.transporter.sendMail(message);
+	},
 };
diff --git a/src/util/util/Token.ts b/src/util/util/Token.ts
index b3ebcc07..e4b1fe41 100644
--- a/src/util/util/Token.ts
+++ b/src/util/util/Token.ts
@@ -72,6 +72,30 @@ export function checkToken(
 	});
 }
 
+/**
+ * Puyodead1 (1/19/2023): I made a copy of this function because I didn't want to break anything with the other one.
+ * this version of the function doesn't use select, so we can update the user. with select causes constraint errors.
+ */
+export function verifyTokenEmailVerification(
+	token: string,
+	jwtSecret: string,
+): Promise<{ decoded: any; user: User }> {
+	return new Promise((res, rej) => {
+		jwt.verify(token, jwtSecret, JWTOptions, async (err, decoded: any) => {
+			if (err || !decoded) return rej("Invalid Token");
+
+			const user = await User.findOne({
+				where: { id: decoded.id },
+			});
+			if (!user) return rej("Invalid Token");
+			if (user.disabled) return rej("User disabled");
+			if (user.deleted) return rej("User not found");
+
+			return res({ decoded, user });
+		});
+	});
+}
+
 export function verifyToken(
 	token: string,
 	jwtSecret: string,
-- 
cgit 1.5.1


From 689b710c9e61646e62d3aea21d616402665d2f66 Mon Sep 17 00:00:00 2001
From: Puyodead1 <puyodead@proton.me>
Date: Fri, 20 Jan 2023 10:43:06 -0500
Subject: Fix template rendering and use verify email template

email html is weird, some stuff isn't supported.
---
 assets/email_templates/new_login_location.html     | 162 ++++++++++-----------
 assets/email_templates/password_changed.html       |  77 +++++-----
 assets/email_templates/password_reset_request.html | 145 +++++++++---------
 assets/email_templates/phone_removed.html          |  85 ++++++-----
 assets/email_templates/verify_email.html           | 146 +++++++++----------
 src/api/routes/auth/verify/resend.ts               |   2 +-
 src/util/entities/User.ts                          |   2 +-
 src/util/util/Email.ts                             | 121 +++++++++++++--
 8 files changed, 419 insertions(+), 321 deletions(-)

(limited to 'src/util/entities')

diff --git a/assets/email_templates/new_login_location.html b/assets/email_templates/new_login_location.html
index 701196cd..e597ac6c 100644
--- a/assets/email_templates/new_login_location.html
+++ b/assets/email_templates/new_login_location.html
@@ -4,108 +4,108 @@
 		<meta charset="UTF-8" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta http-equiv="Content-Type" content="text/html charset=UTF-8" />
 		<title>Verify {instanceName} Login from New Location</title>
 
 		<style>
 			* {
 				font-size: 16px;
 				line-height: 24px;
-			}
-			body {
-				color: white;
 				font-family: Arial, Helvetica, sans-serif;
-				background-color: #202225;
 			}
-			.btn {
-				font-size: 15px;
-				border: none;
-				border-radius: 3px;
-				text-decoration: none;
+			p {
 				color: white;
-				cursor: pointer;
-				padding: 15px 19px;
-				background-color: #ff5f00;
-				border-radius: 5px;
-				box-shadow: 0 0 10px rgba(255, 61, 0, 0.1);
 			}
-			.btn:hover {
-				background-color: hsl(22.4, 80%, 50%);
-			}
-			.btn:active {
-				background-color: hsl(22.4, 60%, 50%);
+			.ExternalClass {
+				width: 100%;
 			}
 		</style>
 	</head>
 	<body>
-		<img
-			src="https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Wordmark-Orange.svg"
-			alt="Branding"
-			style="
-				width: 100%;
-				max-width: 200px;
-				margin: 0 auto;
-				display: block;
-				padding: 20px;
-			"
-		/>
-		<div
-			style="
-				width: 100%;
-				max-width: 500px;
-				margin: 0 auto;
-				padding: 40px 50px;
-				background-color: rgba(50, 53, 59, 1);
-				border-radius: 5px;
-			"
-		>
-			<p
+		<div style="background-color: #202225;">
+			<img
+				src="https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Wordmark-Orange.svg"
+				alt="Branding"
 				style="
-					font-weight: 600;
-					font-size: 20px;
-					letter-spacing: 0.27px;
-					line-height: 24px;
+					width: 100%;
+					max-width: 200px;
+					margin: 0 auto;
+					display: block;
+					padding: 20px;
+				"
+			/>
+			<div
+				style="
+					width: 100%;
+					max-width: 500px;
+					margin: 0 auto;
+					padding: 40px 50px;
+					background-color: #32353b;
+					border-radius: 5px;
 				"
 			>
-				Hey {username},
-			</p>
-			<p>
-				It looks like someone tried to log into your {instanceName}
-				account from a new location. If this is you, follow the link
-				below to authorize logging in from this location on your
-				account. If this isn't you, we suggest changing your password as
-				soon as possible.
-			</p>
-			<p>
-				<strong>IP Address:</strong> {ip}
-				<br />
-				<strong>Location:</strong> {location}
-			</p>
-			<div>
-				<div
+				<p
 					style="
-						display: flex;
-						justify-content: center;
-						padding-bottom: 10px;
+						font-weight: 600;
+						font-size: 20px;
+						letter-spacing: 0.27px;
+						line-height: 24px;
 					"
 				>
-					<a class="btn" href="{verifyUrl}" target="_blank"
-						>Verify Login</a
+					Hey {userUsername},
+				</p>
+				<p>
+					It looks like someone tried to log into your {instanceName}
+					account from a new location. If this is you, follow the link
+					below to authorize logging in from this location on your
+					account. If this isn't you, we suggest changing your
+					password as soon as possible.
+				</p>
+				<p>
+					<strong>IP Address:</strong> {ipAddress}
+					<br />
+					<strong>Location:</strong> {locationCity}, {locationRegion},
+					{locationCountryName}
+				</p>
+				<div>
+					<div
+						style="
+							text-align: center;
+							justify-content: center;
+							padding-bottom: 10px;
+						"
 					>
-				</div>
-				<hr />
-				<div
-					style="
-						display: flex;
-						justify-content: center;
-						flex-direction: column;
-						text-align: center;
-					"
-				>
-					<p>
-						Alternatively, you can directly paste this link into
-						your browser:
-					</p>
-					<a href="{verifyUrl}" target="_blank">{verifyUrl}</a>
+						<a
+							href="{verifyUrl}"
+							target="_blank"
+							style="
+								font-size: 15px;
+								border: none;
+								border-radius: 3px;
+								text-decoration: none;
+								color: white;
+								cursor: pointer;
+								padding: 15px 19px;
+								background-color: #ff5f00;
+								border-radius: 5px;
+							"
+							>Verify Login</a
+						>
+					</div>
+					<hr />
+					<div
+						style="
+							text-align: center;
+							justify-content: center;
+							padding-bottom: 10px;
+						"
+					>
+						<p>
+							Alternatively, you can directly paste this link into
+							your browser:
+						</p>
+						<a href="{verifyUrl}" target="_blank">{verifyUrl}</a>
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/assets/email_templates/password_changed.html b/assets/email_templates/password_changed.html
index 3f762702..399108a2 100644
--- a/assets/email_templates/password_changed.html
+++ b/assets/email_templates/password_changed.html
@@ -4,57 +4,62 @@
 		<meta charset="UTF-8" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta http-equiv="Content-Type" content="text/html charset=UTF-8" />
 		<title>{instanceName} Password Changed</title>
 
 		<style>
 			* {
 				font-size: 16px;
 				line-height: 24px;
+				font-family: Arial, Helvetica, sans-serif;
 			}
-			body {
+			p {
 				color: white;
-				font-family: Arial, Helvetica, sans-serif;
-				background-color: #202225;
+			}
+			.ExternalClass {
+				width: 100%;
 			}
 		</style>
 	</head>
 	<body>
-		<img
-			src="https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Wordmark-Orange.svg"
-			alt="Branding"
-			style="
-				width: 100%;
-				max-width: 200px;
-				margin: 0 auto;
-				display: block;
-				padding: 20px;
-			"
-		/>
-		<div
-			style="
-				width: 100%;
-				max-width: 500px;
-				margin: 0 auto;
-				padding: 40px 50px;
-				background-color: rgba(50, 53, 59, 1);
-				border-radius: 5px;
-			"
-		>
-			<p
+		<div style="background-color: #202225;">
+			<img
+				src="https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Wordmark-Orange.svg"
+				alt="Branding"
+				style="
+					width: 100%;
+					max-width: 200px;
+					margin: 0 auto;
+					display: block;
+					padding: 20px;
+				"
+			/>
+			<div
 				style="
-					font-weight: 600;
-					font-size: 20px;
-					letter-spacing: 0.27px;
-					line-height: 24px;
+					width: 100%;
+					max-width: 500px;
+					margin: 0 auto;
+					padding: 40px 50px;
+					background-color: #32353b;
+					border-radius: 5px;
 				"
 			>
-				Hey {username},
-			</p>
-			<p>Your {instanceName} password has been changed.</p>
-			<p>
-				If this wasn't done by you, please immediately reset the
-				password to your {instanceName} account.
-			</p>
+				<p
+					style="
+						font-weight: 600;
+						font-size: 20px;
+						letter-spacing: 0.27px;
+						line-height: 24px;
+					"
+				>
+					Hey {userUsername},
+				</p>
+				<p>Your {instanceName} password has been changed.</p>
+				<p>
+					If this wasn't done by you, please immediately reset the
+					password to your {instanceName} account.
+				</p>
+			</div>
 		</div>
 	</body>
 </html>
diff --git a/assets/email_templates/password_reset_request.html b/assets/email_templates/password_reset_request.html
index fc77b47b..ab8f4d23 100644
--- a/assets/email_templates/password_reset_request.html
+++ b/assets/email_templates/password_reset_request.html
@@ -4,103 +4,96 @@
 		<meta charset="UTF-8" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta http-equiv="Content-Type" content="text/html charset=UTF-8" />
 		<title>Password Reset Request for {instanceName}</title>
 
 		<style>
 			* {
 				font-size: 16px;
 				line-height: 24px;
-			}
-			body {
-				color: white;
 				font-family: Arial, Helvetica, sans-serif;
-				background-color: #202225;
 			}
-			.btn {
-				font-size: 15px;
-				border: none;
-				border-radius: 3px;
-				text-decoration: none;
+			p {
 				color: white;
-				cursor: pointer;
-				padding: 15px 19px;
-				background-color: #ff5f00;
-				border-radius: 5px;
-				box-shadow: 0 0 10px rgba(255, 61, 0, 0.1);
 			}
-			.btn:hover {
-				background-color: hsl(22.4, 80%, 50%);
-			}
-			.btn:active {
-				background-color: hsl(22.4, 60%, 50%);
+			.ExternalClass {
+				width: 100%;
 			}
 		</style>
 	</head>
 	<body>
-		<img
-			src="https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Wordmark-Orange.svg"
-			alt="Branding"
-			style="
-				width: 100%;
-				max-width: 200px;
-				margin: 0 auto;
-				display: block;
-				padding: 20px;
-			"
-		/>
-		<div
-			style="
-				width: 100%;
-				max-width: 500px;
-				margin: 0 auto;
-				padding: 40px 50px;
-				background-color: rgba(50, 53, 59, 1);
-				border-radius: 5px;
-			"
-		>
-			<p
+		<div style="background-color: #202225;">
+			<img
+				src="https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Wordmark-Orange.svg"
+				alt="Branding"
 				style="
-					font-weight: 600;
-					font-size: 20px;
-					letter-spacing: 0.27px;
-					line-height: 24px;
+					width: 100%;
+					max-width: 200px;
+					margin: 0 auto;
+					display: block;
+					padding: 20px;
+				"
+			/>
+			<div
+				style="
+					width: 100%;
+					max-width: 500px;
+					margin: 0 auto;
+					padding: 40px 50px;
+					background-color: #32353b;
+					border-radius: 5px;
 				"
 			>
-				Hey {username},
-			</p>
-			<p>
-				Your {instanceName} password can be reset by clicking the button
-				below. If you did not request a new password, please ignore this
-				email.
-			</p>
-			<div>
-				<div
-					style="
-						display: flex;
-						justify-content: center;
-						padding-bottom: 10px;
-					"
-				>
-					<a class="btn" href="{passwordResetUrl}" target="_blank"
-						>Reset Password</a
-					>
-				</div>
-				<hr />
-				<div
+				<p
 					style="
-						display: flex;
-						justify-content: center;
-						flex-direction: column;
-						text-align: center;
+						font-weight: 600;
+						font-size: 20px;
+						letter-spacing: 0.27px;
+						line-height: 24px;
 					"
 				>
-					<p>
-						Alternatively, you can directly paste this link into
-						your browser:
-					</p>
-					<a href="{passwordResetUrl}" target="_blank"
-						>{passwordResetUrl}</a
+					Hey {userUsername},
+				</p>
+				<p>
+					Your {instanceName} password can be reset by clicking the
+					button below. If you did not request a new password, please
+					ignore this email.
+				</p>
+				<div>
+					<div
+						style="
+							text-align: center;
+							justify-content: center;
+							padding-bottom: 10px;
+						"
 					>
+						<a
+							href="{passwordResetUrl}"
+							target="_blank"
+							style="
+								font-size: 15px;
+								border: none;
+								border-radius: 3px;
+								text-decoration: none;
+								color: white;
+								cursor: pointer;
+								padding: 15px 19px;
+								background-color: #ff5f00;
+								border-radius: 5px;
+							"
+							>Reset Password</a
+						>
+					</div>
+					<hr />
+					<div style="text-align: center">
+						<p>
+							Alternatively, you can directly paste this link into
+							your browser:
+						</p>
+						<a href="{passwordResetUrl}" target="_blank"
+							>{passwordResetUrl}</a
+						>
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/assets/email_templates/phone_removed.html b/assets/email_templates/phone_removed.html
index 1eb52fbe..65807e29 100644
--- a/assets/email_templates/phone_removed.html
+++ b/assets/email_templates/phone_removed.html
@@ -4,61 +4,66 @@
 		<meta charset="UTF-8" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta http-equiv="Content-Type" content="text/html charset=UTF-8" />
 		<title>Phone Removed From {instanceName} Account</title>
 
 		<style>
 			* {
 				font-size: 16px;
 				line-height: 24px;
+				font-family: Arial, Helvetica, sans-serif;
 			}
-			body {
+			p {
 				color: white;
-				font-family: Arial, Helvetica, sans-serif;
-				background-color: #202225;
+			}
+			.ExternalClass {
+				width: 100%;
 			}
 		</style>
 	</head>
 	<body>
-		<img
-			src="https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Wordmark-Orange.svg"
-			alt="Branding"
-			style="
-				width: 100%;
-				max-width: 200px;
-				margin: 0 auto;
-				display: block;
-				padding: 20px;
-			"
-		/>
-		<div
-			style="
-				width: 100%;
-				max-width: 500px;
-				margin: 0 auto;
-				padding: 40px 50px;
-				background-color: rgba(50, 53, 59, 1);
-				border-radius: 5px;
-			"
-		>
-			<p
+		<div style="background-color: #202225;">
+			<img
+				src="https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Wordmark-Orange.svg"
+				alt="Branding"
+				style="
+					width: 100%;
+					max-width: 200px;
+					margin: 0 auto;
+					display: block;
+					padding: 20px;
+				"
+			/>
+			<div
 				style="
-					font-weight: 600;
-					font-size: 20px;
-					letter-spacing: 0.27px;
-					line-height: 24px;
+					width: 100%;
+					max-width: 500px;
+					margin: 0 auto;
+					padding: 40px 50px;
+					background-color: #32353b;
+					border-radius: 5px;
 				"
 			>
-				Hey {username},
-			</p>
-			<p>
-				Your phone number ********{phoneNumber} was recently removed
-				from this account and added to a different {instanceName}
-				account.
-			</p>
-			<p>
-				Please note that your phone number can only be linked to one
-				{instanceName} account at a time.
-			</p>
+				<p
+					style="
+						font-weight: 600;
+						font-size: 20px;
+						letter-spacing: 0.27px;
+						line-height: 24px;
+					"
+				>
+					Hey {userUsername},
+				</p>
+				<p>
+					Your phone number ********{phoneNumber} was recently removed
+					from this account and added to a different {instanceName}
+					account.
+				</p>
+				<p>
+					Please note that your phone number can only be linked to one
+					{instanceName} account at a time.
+				</p>
+			</div>
 		</div>
 	</body>
 </html>
diff --git a/assets/email_templates/verify_email.html b/assets/email_templates/verify_email.html
index f0c11e52..604242c4 100644
--- a/assets/email_templates/verify_email.html
+++ b/assets/email_templates/verify_email.html
@@ -4,103 +4,97 @@
 		<meta charset="UTF-8" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta http-equiv="Content-Type" content="text/html charset=UTF-8" />
 		<title>Verify Email Address for {instanceName}</title>
 
 		<style>
 			* {
 				font-size: 16px;
 				line-height: 24px;
-			}
-			body {
-				color: white;
 				font-family: Arial, Helvetica, sans-serif;
-				background-color: #202225;
 			}
-			.btn {
-				font-size: 15px;
-				border: none;
-				border-radius: 3px;
-				text-decoration: none;
+			p {
 				color: white;
-				cursor: pointer;
-				padding: 15px 19px;
-				background-color: #ff5f00;
-				border-radius: 5px;
-				box-shadow: 0 0 10px rgba(255, 61, 0, 0.1);
 			}
-			.btn:hover {
-				background-color: hsl(22.4, 80%, 50%);
-			}
-			.btn:active {
-				background-color: hsl(22.4, 60%, 50%);
+			.ExternalClass {
+				width: 100%;
 			}
 		</style>
 	</head>
 	<body>
-		<img
-			src="https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Wordmark-Orange.svg"
-			alt="Branding"
-			style="
-				width: 100%;
-				max-width: 200px;
-				margin: 0 auto;
-				display: block;
-				padding: 20px;
-			"
-		/>
-		<div
-			style="
-				width: 100%;
-				max-width: 500px;
-				margin: 0 auto;
-				padding: 40px 50px;
-				background-color: rgba(50, 53, 59, 1);
-				border-radius: 5px;
-			"
-		>
-			<p
+		<div style="background-color: #202225;">
+			<img
+				src="https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Wordmark-Orange.svg"
+				alt="Branding"
 				style="
-					font-weight: 600;
-					font-size: 20px;
-					letter-spacing: 0.27px;
-					line-height: 24px;
+					width: 100%;
+					max-width: 200px;
+					margin: 0 auto;
+					display: block;
+					padding: 20px;
+				"
+			/>
+			<div
+				style="
+					width: 100%;
+					max-width: 500px;
+					margin: 0 auto;
+					padding: 40px 50px;
+					background-color: #32353b;
+					border-radius: 5px;
 				"
 			>
-				Hey {username},
-			</p>
-			<p>
-				Thanks for registering for an account on {instanceName}! Before
-				we get started, we just need to confirm that this is you. Click
-				below to verify your email address:
-			</p>
-			<div>
-				<div
-					style="
-						display: flex;
-						justify-content: center;
-						padding-bottom: 10px;
-					"
-				>
-					<a class="btn" href="{verificationUrl}" target="_blank"
-						>Verify Email</a
-					>
-				</div>
-				<hr />
-				<div
+				<p
 					style="
-						display: flex;
-						justify-content: center;
-						flex-direction: column;
-						text-align: center;
+						font-weight: 600;
+						font-size: 20px;
+						letter-spacing: 0.27px;
+						line-height: 24px;
 					"
 				>
-					<p>
-						Alternatively, you can directly paste this link into
-						your browser:
-					</p>
-					<a href="{verificationUrl}" target="_blank"
-						>{verificationUrl}</a
+					Hey {userUsername},
+				</p>
+				<p>
+					Thanks for registering for an account on {instanceName}!
+					Before we get started, we just need to confirm that this is
+					you. Click below to verify your email address:
+				</p>
+				<div>
+					<div
+						style="
+							text-align: center;
+							justify-content: center;
+							padding-bottom: 10px;
+						"
 					>
+						<a
+							class="btn"
+							href="{emailVerificationUrl}"
+							target="_blank"
+							style="
+								font-size: 15px;
+								border: none;
+								border-radius: 3px;
+								text-decoration: none;
+								color: white;
+								cursor: pointer;
+								padding: 15px 19px;
+								background-color: #ff5f00;
+								border-radius: 5px;
+							"
+							>Verify Email</a
+						>
+					</div>
+					<hr />
+					<div style="text-align: center">
+						<p>
+							Alternatively, you can directly paste this link into
+							your browser:
+						</p>
+						<a href="{emailVerificationUrl}" target="_blank"
+							>{emailVerificationUrl}</a
+						>
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/src/api/routes/auth/verify/resend.ts b/src/api/routes/auth/verify/resend.ts
index 0c8c4ed9..d9a9cda5 100644
--- a/src/api/routes/auth/verify/resend.ts
+++ b/src/api/routes/auth/verify/resend.ts
@@ -33,7 +33,7 @@ router.post("/", route({}), async (req: Request, res: Response) => {
 		throw new HTTPError("User does not have an email address", 400);
 	}
 
-	await Email.sendVerificationEmail(req.user_id, user.email)
+	await Email.sendVerificationEmail(user, user.email)
 		.then((info) => {
 			console.log("Message sent: %s", info.messageId);
 			return res.sendStatus(204);
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts
index 66e10297..4a399ed9 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -386,7 +386,7 @@ export class User extends BaseClass {
 
 		// send verification email if users aren't verified by default and we have an email
 		if (!Config.get().defaults.user.verified && email) {
-			await Email.sendVerificationEmail(user.id, email)
+			await Email.sendVerificationEmail(user, email)
 				.then((info) => {
 					console.log("Message sent: %s", info.messageId);
 				})
diff --git a/src/util/util/Email.ts b/src/util/util/Email.ts
index 371ba827..9688c3c5 100644
--- a/src/util/util/Email.ts
+++ b/src/util/util/Email.ts
@@ -16,10 +16,14 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import fs from "node:fs";
+import path from "node:path";
 import nodemailer, { Transporter } from "nodemailer";
+import { User } from "../entities";
 import { Config } from "./Config";
 import { generateToken } from "./Token";
 
+const ASSET_FOLDER_PATH = path.join(__dirname, "..", "..", "..", "assets");
 export const EMAIL_REGEX =
 	/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 
@@ -51,7 +55,20 @@ export function adjustEmail(email?: string): string | undefined {
 export const Email: {
 	transporter: Transporter | null;
 	init: () => Promise<void>;
-	sendVerificationEmail: (id: string, email: string) => Promise<any>;
+	generateVerificationLink: (id: string, email: string) => Promise<string>;
+	sendVerificationEmail: (user: User, email: string) => Promise<any>;
+	doReplacements: (
+		template: string,
+		user: User,
+		emailVerificationUrl?: string,
+		passwordResetUrl?: string,
+		ipInfo?: {
+			ip: string;
+			city: string;
+			region: string;
+			country_name: string;
+		},
+	) => string;
 } = {
 	transporter: null,
 	init: async function () {
@@ -78,25 +95,109 @@ export const Email: {
 			console.log(`[SMTP] Ready`);
 		});
 	},
-	sendVerificationEmail: async function (
-		id: string,
-		email: string,
-	): Promise<any> {
-		if (!this.transporter) return;
+	/**
+	 * Replaces all placeholders in an email template with the correct values
+	 */
+	doReplacements: function (
+		template: string,
+		user: User,
+		emailVerificationUrl?: string,
+		passwordResetUrl?: string,
+		ipInfo?: {
+			ip: string;
+			city: string;
+			region: string;
+			country_name: string;
+		},
+	) {
+		const { instanceName } = Config.get().general;
+		template = template.replaceAll("{instanceName}", instanceName);
+		template = template.replaceAll("{userUsername}", user.username);
+		template = template.replaceAll(
+			"{userDiscriminator}",
+			user.discriminator,
+		);
+		template = template.replaceAll("{userId}", user.id);
+		if (user.phone)
+			template = template.replaceAll(
+				"{phoneNumber}",
+				user.phone.slice(-4),
+			);
+		if (user.email)
+			template = template.replaceAll("{userEmail}", user.email);
+
+		// template specific replacements
+		if (emailVerificationUrl)
+			template = template.replaceAll(
+				"{emailVerificationUrl}",
+				emailVerificationUrl,
+			);
+		if (passwordResetUrl)
+			template = template.replaceAll(
+				"{passwordResetUrl}",
+				passwordResetUrl,
+			);
+		if (ipInfo) {
+			template = template.replaceAll("{ipAddress}", ipInfo.ip);
+			template = template.replaceAll("{locationCity}", ipInfo.city);
+			template = template.replaceAll("{locationRegion}", ipInfo.region);
+			template = template.replaceAll(
+				"{locationCountryName}",
+				ipInfo.country_name,
+			);
+		}
+
+		return template;
+	},
+	/**
+	 *
+	 * @param id user id
+	 * @param email user email
+	 * @returns a verification link for the user
+	 */
+	generateVerificationLink: async function (id: string, email: string) {
 		const token = (await generateToken(id, email)) as string;
 		const instanceUrl =
 			Config.get().general.frontPage || "http://localhost:3001";
 		const link = `${instanceUrl}/verify#token=${token}`;
+		return link;
+	},
+	sendVerificationEmail: async function (
+		user: User,
+		email: string,
+	): Promise<any> {
+		if (!this.transporter) return;
+
+		// generate a verification link for the user
+		const verificationLink = await this.generateVerificationLink(
+			user.id,
+			email,
+		);
+		// load the email template
+		const rawTemplate = fs.readFileSync(
+			path.join(
+				ASSET_FOLDER_PATH,
+				"email_templates",
+				"verify_email.html",
+			),
+			{ encoding: "utf-8" },
+		);
+		// replace email template placeholders
+		const html = this.doReplacements(rawTemplate, user, verificationLink);
+
+		// extract the title from the email template to use as the email subject
+		const subject = html.match(/<title>(.*)<\/title>/)?.[1] || "";
+
+		// // construct the email
 		const message = {
 			from:
 				Config.get().general.correspondenceEmail || "noreply@localhost",
 			to: email,
-			subject: `Verify Email Address for ${
-				Config.get().general.instanceName
-			}`,
-			html: `Please verify your email address by clicking the following link: <a href="${link}">Verify Email</a>`,
+			subject,
+			html,
 		};
 
+		// // send the email
 		return this.transporter.sendMail(message);
 	},
 };
-- 
cgit 1.5.1


From 97bafa81fc252c762aac265dc96eb90ec279cf96 Mon Sep 17 00:00:00 2001
From: Puyodead1 <puyodead@proton.me>
Date: Sat, 21 Jan 2023 14:45:13 -0500
Subject: fix linting errors

---
 src/api/routes/auth/verify/index.ts | 15 ++++--------
 src/util/entities/User.ts           |  9 ++++++-
 src/util/util/Email.ts              | 12 +++++-----
 src/util/util/Token.ts              | 47 +------------------------------------
 4 files changed, 19 insertions(+), 64 deletions(-)

(limited to 'src/util/entities')

diff --git a/src/api/routes/auth/verify/index.ts b/src/api/routes/auth/verify/index.ts
index d61b8d16..7809bc26 100644
--- a/src/api/routes/auth/verify/index.ts
+++ b/src/api/routes/auth/verify/index.ts
@@ -17,11 +17,7 @@
 */
 
 import { route, verifyCaptcha } from "@fosscord/api";
-import {
-	Config,
-	FieldErrors,
-	verifyTokenEmailVerification,
-} from "@fosscord/util";
+import { checkToken, Config, FieldErrors } from "@fosscord/util";
 import { Request, Response, Router } from "express";
 import { HTTPError } from "lambert-server";
 const router = Router();
@@ -47,10 +43,7 @@ router.post(
 		try {
 			const { jwtSecret } = Config.get().security;
 
-			const { decoded, user } = await verifyTokenEmailVerification(
-				token,
-				jwtSecret,
-			);
+			const { decoded, user } = await checkToken(token, jwtSecret);
 
 			// toksn should last for 24 hours from the time they were issued
 			if (new Date().getTime() > decoded.iat * 1000 + 86400 * 1000) {
@@ -71,8 +64,8 @@ router.post(
 			// TODO: invalidate token after use?
 
 			return res.send(user);
-		} catch (error: any) {
-			throw new HTTPError(error?.toString(), 400);
+		} catch (error) {
+			throw new HTTPError((error as Error).toString(), 400);
 		}
 	},
 );
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts
index 4a399ed9..42f74fb4 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -31,7 +31,14 @@ import { ConnectedAccount } from "./ConnectedAccount";
 import { Member } from "./Member";
 import { UserSettings } from "./UserSettings";
 import { Session } from "./Session";
-import { Config, FieldErrors, Snowflake, trimSpecial, adjustEmail, Email, generateToken } from "..";
+import {
+	Config,
+	FieldErrors,
+	Snowflake,
+	trimSpecial,
+	adjustEmail,
+	Email,
+} from "..";
 import { Request } from "express";
 import { SecurityKey } from "./SecurityKey";
 
diff --git a/src/util/util/Email.ts b/src/util/util/Email.ts
index 8899b3c2..cbcc5b60 100644
--- a/src/util/util/Email.ts
+++ b/src/util/util/Email.ts
@@ -18,7 +18,7 @@
 
 import fs from "node:fs";
 import path from "node:path";
-import nodemailer, { Transporter } from "nodemailer";
+import nodemailer, { SentMessageInfo, Transporter } from "nodemailer";
 import { User } from "../entities";
 import { Config } from "./Config";
 import { generateToken } from "./Token";
@@ -158,7 +158,10 @@ export const Email: {
 	transporter: Transporter | null;
 	init: () => Promise<void>;
 	generateVerificationLink: (id: string, email: string) => Promise<string>;
-	sendVerificationEmail: (user: User, email: string) => Promise<any>;
+	sendVerificationEmail: (
+		user: User,
+		email: string,
+	) => Promise<SentMessageInfo>;
 	doReplacements: (
 		template: string,
 		user: User,
@@ -254,10 +257,7 @@ export const Email: {
 		const link = `${instanceUrl}/verify#token=${token}`;
 		return link;
 	},
-	sendVerificationEmail: async function (
-		user: User,
-		email: string,
-	): Promise<any> {
+	sendVerificationEmail: async function (user: User, email: string) {
 		if (!this.transporter) return;
 
 		// generate a verification link for the user
diff --git a/src/util/util/Token.ts b/src/util/util/Token.ts
index e4b1fe41..12e4a79a 100644
--- a/src/util/util/Token.ts
+++ b/src/util/util/Token.ts
@@ -72,58 +72,13 @@ export function checkToken(
 	});
 }
 
-/**
- * Puyodead1 (1/19/2023): I made a copy of this function because I didn't want to break anything with the other one.
- * this version of the function doesn't use select, so we can update the user. with select causes constraint errors.
- */
-export function verifyTokenEmailVerification(
-	token: string,
-	jwtSecret: string,
-): Promise<{ decoded: any; user: User }> {
-	return new Promise((res, rej) => {
-		jwt.verify(token, jwtSecret, JWTOptions, async (err, decoded: any) => {
-			if (err || !decoded) return rej("Invalid Token");
-
-			const user = await User.findOne({
-				where: { id: decoded.id },
-			});
-			if (!user) return rej("Invalid Token");
-			if (user.disabled) return rej("User disabled");
-			if (user.deleted) return rej("User not found");
-
-			return res({ decoded, user });
-		});
-	});
-}
-
-export function verifyToken(
-	token: string,
-	jwtSecret: string,
-): Promise<{ decoded: any; user: User }> {
-	return new Promise((res, rej) => {
-		jwt.verify(token, jwtSecret, JWTOptions, async (err, decoded: any) => {
-			if (err || !decoded) return rej("Invalid Token");
-
-			const user = await User.findOne({
-				where: { id: decoded.id },
-				select: ["data", "bot", "disabled", "deleted", "rights"],
-			});
-			if (!user) return rej("Invalid Token");
-			if (user.disabled) return rej("User disabled");
-			if (user.deleted) return rej("User not found");
-
-			return res({ decoded, user });
-		});
-	});
-}
-
 export async function generateToken(id: string, email?: string) {
 	const iat = Math.floor(Date.now() / 1000);
 	const algorithm = "HS256";
 
 	return new Promise((res, rej) => {
 		jwt.sign(
-			{ id: id, email: email, iat },
+			{ id, iat, email },
 			Config.get().security.jwtSecret,
 			{
 				algorithm,
-- 
cgit 1.5.1


From a78e13073f2fb070e15067d5fcc67797d890bc7e Mon Sep 17 00:00:00 2001
From: Puyodead1 <puyodead@protonmail.com>
Date: Fri, 24 Feb 2023 00:10:50 -0500
Subject: don't print anything if email send is successful

---
 src/api/routes/auth/verify/resend.ts |  3 +--
 src/util/entities/User.ts            | 34 +++++++++++++++-------------------
 2 files changed, 16 insertions(+), 21 deletions(-)

(limited to 'src/util/entities')

diff --git a/src/api/routes/auth/verify/resend.ts b/src/api/routes/auth/verify/resend.ts
index d54ddf73..1cd14f23 100644
--- a/src/api/routes/auth/verify/resend.ts
+++ b/src/api/routes/auth/verify/resend.ts
@@ -37,8 +37,7 @@ router.post(
 		}
 
 		await Email.sendVerificationEmail(user, user.email)
-			.then((info) => {
-				console.log("Message sent: %s", info.messageId);
+			.then(() => {
 				return res.sendStatus(204);
 			})
 			.catch((e) => {
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts
index 42f74fb4..2947b205 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -16,6 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { Request } from "express";
 import {
 	Column,
 	Entity,
@@ -24,23 +25,22 @@ import {
 	OneToMany,
 	OneToOne,
 } from "typeorm";
-import { BaseClass } from "./BaseClass";
-import { BitField } from "../util/BitField";
-import { Relationship } from "./Relationship";
-import { ConnectedAccount } from "./ConnectedAccount";
-import { Member } from "./Member";
-import { UserSettings } from "./UserSettings";
-import { Session } from "./Session";
 import {
+	adjustEmail,
 	Config,
+	Email,
 	FieldErrors,
 	Snowflake,
 	trimSpecial,
-	adjustEmail,
-	Email,
 } from "..";
-import { Request } from "express";
+import { BitField } from "../util/BitField";
+import { BaseClass } from "./BaseClass";
+import { ConnectedAccount } from "./ConnectedAccount";
+import { Member } from "./Member";
+import { Relationship } from "./Relationship";
 import { SecurityKey } from "./SecurityKey";
+import { Session } from "./Session";
+import { UserSettings } from "./UserSettings";
 
 export enum PublicUserEnum {
 	username,
@@ -393,15 +393,11 @@ export class User extends BaseClass {
 
 		// send verification email if users aren't verified by default and we have an email
 		if (!Config.get().defaults.user.verified && email) {
-			await Email.sendVerificationEmail(user, email)
-				.then((info) => {
-					console.log("Message sent: %s", info.messageId);
-				})
-				.catch((e) => {
-					console.error(
-						`Failed to send verification email to ${user.username}#${user.discriminator}: ${e}`,
-					);
-				});
+			await Email.sendVerificationEmail(user, email).catch((e) => {
+				console.error(
+					`Failed to send verification email to ${user.username}#${user.discriminator}: ${e}`,
+				);
+			});
 		}
 
 		setImmediate(async () => {
-- 
cgit 1.5.1


From 05453ec14880732c5d0d20fd3575bb2b3952760d Mon Sep 17 00:00:00 2001
From: Puyodead1 <puyodead@protonmail.com>
Date: Fri, 24 Feb 2023 01:54:10 -0500
Subject: implement password reset

---
 assets/email_templates/new_login_location.html     |    2 +-
 assets/email_templates/password_reset_request.html |    2 +-
 assets/email_templates/verify_email.html           |    2 +-
 assets/locales/en/auth.json                        |    4 +
 assets/schemas.json                                | 3503 +++++++++++++-------
 src/api/middlewares/Authentication.ts              |    2 +
 src/api/routes/auth/forgot.ts                      |   92 +
 src/api/routes/auth/reset.ts                       |   57 +
 src/api/routes/auth/verify/resend.ts               |    2 +-
 src/util/config/Config.ts                          |    3 +
 .../config/types/PasswordResetConfiguration.ts     |   21 +
 src/util/config/types/index.ts                     |    1 +
 src/util/entities/User.ts                          |    2 +-
 src/util/schemas/ForgotPasswordSchema.ts           |   22 +
 src/util/schemas/PasswordResetSchema.ts            |   22 +
 src/util/schemas/index.ts                          |   20 +-
 src/util/util/Email.ts                             |  106 +-
 src/util/util/Token.ts                             |    9 +
 18 files changed, 2678 insertions(+), 1194 deletions(-)
 create mode 100644 src/api/routes/auth/forgot.ts
 create mode 100644 src/api/routes/auth/reset.ts
 create mode 100644 src/util/config/types/PasswordResetConfiguration.ts
 create mode 100644 src/util/schemas/ForgotPasswordSchema.ts
 create mode 100644 src/util/schemas/PasswordResetSchema.ts

(limited to 'src/util/entities')

diff --git a/assets/email_templates/new_login_location.html b/assets/email_templates/new_login_location.html
index e597ac6c..ff262e99 100644
--- a/assets/email_templates/new_login_location.html
+++ b/assets/email_templates/new_login_location.html
@@ -104,7 +104,7 @@
 							Alternatively, you can directly paste this link into
 							your browser:
 						</p>
-						<a href="{verifyUrl}" target="_blank">{verifyUrl}</a>
+						<a href="{verifyUrl}" target="_blank" style="word-wrap: break-word;">{verifyUrl}</a>
 					</div>
 				</div>
 			</div>
diff --git a/assets/email_templates/password_reset_request.html b/assets/email_templates/password_reset_request.html
index ab8f4d23..b770e7ba 100644
--- a/assets/email_templates/password_reset_request.html
+++ b/assets/email_templates/password_reset_request.html
@@ -90,7 +90,7 @@
 							Alternatively, you can directly paste this link into
 							your browser:
 						</p>
-						<a href="{passwordResetUrl}" target="_blank"
+						<a href="{passwordResetUrl}" target="_blank" style="word-wrap: break-word;"
 							>{passwordResetUrl}</a
 						>
 					</div>
diff --git a/assets/email_templates/verify_email.html b/assets/email_templates/verify_email.html
index 604242c4..481a46d4 100644
--- a/assets/email_templates/verify_email.html
+++ b/assets/email_templates/verify_email.html
@@ -91,7 +91,7 @@
 							Alternatively, you can directly paste this link into
 							your browser:
 						</p>
-						<a href="{emailVerificationUrl}" target="_blank"
+						<a href="{emailVerificationUrl}" target="_blank" style="word-wrap: break-word;"
 							>{emailVerificationUrl}</a
 						>
 					</div>
diff --git a/assets/locales/en/auth.json b/assets/locales/en/auth.json
index 2178548e..0521a902 100644
--- a/assets/locales/en/auth.json
+++ b/assets/locales/en/auth.json
@@ -16,5 +16,9 @@
 		"USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another",
 		"GUESTS_DISABLED": "Guest users are disabled",
 		"TOO_MANY_REGISTRATIONS": "Too many registrations, please try again later"
+	},
+	"password_reset": {
+		"EMAIL_DOES_NOT_EXIST": "Email does not exist.",
+		"INVALID_TOKEN": "Invalid token."
 	}
 }
diff --git a/assets/schemas.json b/assets/schemas.json
index 2bfb525d..1fdfa361 100644
--- a/assets/schemas.json
+++ b/assets/schemas.json
@@ -4584,39 +4584,20 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "GuildCreateSchema": {
+    "ForgotPasswordSchema": {
         "type": "object",
         "properties": {
-            "name": {
-                "maxLength": 100,
-                "type": "string"
-            },
-            "region": {
-                "type": "string"
-            },
-            "icon": {
-                "type": [
-                    "null",
-                    "string"
-                ]
-            },
-            "channels": {
-                "type": "array",
-                "items": {
-                    "$ref": "#/definitions/ChannelModifySchema"
-                }
-            },
-            "guild_template_code": {
-                "type": "string"
-            },
-            "system_channel_id": {
+            "login": {
                 "type": "string"
             },
-            "rules_channel_id": {
+            "captcha_key": {
                 "type": "string"
             }
         },
         "additionalProperties": false,
+        "required": [
+            "login"
+        ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
                 "enum": [
@@ -5196,23 +5177,39 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "GuildTemplateCreateSchema": {
+    "GuildCreateSchema": {
         "type": "object",
         "properties": {
             "name": {
+                "maxLength": 100,
                 "type": "string"
             },
-            "avatar": {
+            "region": {
+                "type": "string"
+            },
+            "icon": {
                 "type": [
                     "null",
                     "string"
                 ]
+            },
+            "channels": {
+                "type": "array",
+                "items": {
+                    "$ref": "#/definitions/ChannelModifySchema"
+                }
+            },
+            "guild_template_code": {
+                "type": "string"
+            },
+            "system_channel_id": {
+                "type": "string"
+            },
+            "rules_channel_id": {
+                "type": "string"
             }
         },
         "additionalProperties": false,
-        "required": [
-            "name"
-        ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
                 "enum": [
@@ -5792,83 +5789,23 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "GuildUpdateSchema": {
+    "GuildTemplateCreateSchema": {
         "type": "object",
         "properties": {
             "name": {
                 "type": "string"
             },
-            "banner": {
-                "type": [
-                    "null",
-                    "string"
-                ]
-            },
-            "splash": {
-                "type": [
-                    "null",
-                    "string"
-                ]
-            },
-            "description": {
-                "type": "string"
-            },
-            "features": {
-                "type": "array",
-                "items": {
-                    "type": "string"
-                }
-            },
-            "verification_level": {
-                "type": "integer"
-            },
-            "default_message_notifications": {
-                "type": "integer"
-            },
-            "system_channel_flags": {
-                "type": "integer"
-            },
-            "explicit_content_filter": {
-                "type": "integer"
-            },
-            "public_updates_channel_id": {
-                "type": "string"
-            },
-            "afk_timeout": {
-                "type": "integer"
-            },
-            "afk_channel_id": {
-                "type": "string"
-            },
-            "preferred_locale": {
-                "type": "string"
-            },
-            "premium_progress_bar_enabled": {
-                "type": "boolean"
-            },
-            "discovery_splash": {
-                "type": "string"
-            },
-            "region": {
-                "type": "string"
-            },
-            "icon": {
+            "avatar": {
                 "type": [
                     "null",
                     "string"
                 ]
-            },
-            "guild_template_code": {
-                "type": "string"
-            },
-            "system_channel_id": {
-                "type": "string"
-            },
-            "rules_channel_id": {
-                "type": "string"
             }
         },
         "additionalProperties": false,
+        "required": [
+            "name"
+        ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
                 "enum": [
@@ -6448,38 +6385,79 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "GuildUpdateWelcomeScreenSchema": {
+    "GuildUpdateSchema": {
         "type": "object",
         "properties": {
-            "welcome_channels": {
+            "name": {
+                "type": "string"
+            },
+            "banner": {
+                "type": [
+                    "null",
+                    "string"
+                ]
+            },
+            "splash": {
+                "type": [
+                    "null",
+                    "string"
+                ]
+            },
+            "description": {
+                "type": "string"
+            },
+            "features": {
                 "type": "array",
                 "items": {
-                    "type": "object",
-                    "properties": {
-                        "channel_id": {
-                            "type": "string"
-                        },
-                        "description": {
-                            "type": "string"
-                        },
-                        "emoji_id": {
-                            "type": "string"
-                        },
-                        "emoji_name": {
-                            "type": "string"
-                        }
-                    },
-                    "additionalProperties": false,
-                    "required": [
-                        "channel_id",
-                        "description"
-                    ]
+                    "type": "string"
                 }
             },
-            "enabled": {
+            "verification_level": {
+                "type": "integer"
+            },
+            "default_message_notifications": {
+                "type": "integer"
+            },
+            "system_channel_flags": {
+                "type": "integer"
+            },
+            "explicit_content_filter": {
+                "type": "integer"
+            },
+            "public_updates_channel_id": {
+                "type": "string"
+            },
+            "afk_timeout": {
+                "type": "integer"
+            },
+            "afk_channel_id": {
+                "type": "string"
+            },
+            "preferred_locale": {
+                "type": "string"
+            },
+            "premium_progress_bar_enabled": {
                 "type": "boolean"
             },
-            "description": {
+            "discovery_splash": {
+                "type": "string"
+            },
+            "region": {
+                "type": "string"
+            },
+            "icon": {
+                "type": [
+                    "null",
+                    "string"
+                ]
+            },
+            "guild_template_code": {
+                "type": "string"
+            },
+            "system_channel_id": {
+                "type": "string"
+            },
+            "rules_channel_id": {
                 "type": "string"
             }
         },
@@ -7063,182 +7041,1408 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "IdentifySchema": {
+    "GuildUpdateWelcomeScreenSchema": {
         "type": "object",
         "properties": {
-            "token": {
-                "type": "string"
-            },
-            "properties": {
-                "type": "object",
-                "properties": {
-                    "os": {
-                        "type": "string"
-                    },
-                    "os_atch": {
-                        "type": "string"
-                    },
-                    "browser": {
-                        "type": "string"
-                    },
-                    "device": {
-                        "type": "string"
-                    },
-                    "$os": {
-                        "type": "string"
-                    },
-                    "$browser": {
-                        "type": "string"
+            "welcome_channels": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "properties": {
+                        "channel_id": {
+                            "type": "string"
+                        },
+                        "description": {
+                            "type": "string"
+                        },
+                        "emoji_id": {
+                            "type": "string"
+                        },
+                        "emoji_name": {
+                            "type": "string"
+                        }
+                    },
+                    "additionalProperties": false,
+                    "required": [
+                        "channel_id",
+                        "description"
+                    ]
+                }
+            },
+            "enabled": {
+                "type": "boolean"
+            },
+            "description": {
+                "type": "string"
+            }
+        },
+        "additionalProperties": false,
+        "definitions": {
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
+            "ChannelModifySchema": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "maxLength": 100,
+                        "type": "string"
+                    },
+                    "type": {
+                        "enum": [
+                            0,
+                            1,
+                            10,
+                            11,
+                            12,
+                            13,
+                            14,
+                            15,
+                            2,
+                            255,
+                            3,
+                            33,
+                            34,
+                            35,
+                            4,
+                            5,
+                            6,
+                            64,
+                            7,
+                            8,
+                            9
+                        ],
+                        "type": "number"
+                    },
+                    "topic": {
+                        "type": "string"
+                    },
+                    "icon": {
+                        "type": [
+                            "null",
+                            "string"
+                        ]
+                    },
+                    "bitrate": {
+                        "type": "integer"
+                    },
+                    "user_limit": {
+                        "type": "integer"
+                    },
+                    "rate_limit_per_user": {
+                        "type": "integer"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "permission_overwrites": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "string"
+                                },
+                                "type": {
+                                    "$ref": "#/definitions/ChannelPermissionOverwriteType"
+                                },
+                                "allow": {
+                                    "type": "string"
+                                },
+                                "deny": {
+                                    "type": "string"
+                                }
+                            },
+                            "additionalProperties": false,
+                            "required": [
+                                "allow",
+                                "deny",
+                                "id",
+                                "type"
+                            ]
+                        }
+                    },
+                    "parent_id": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "nsfw": {
+                        "type": "boolean"
+                    },
+                    "rtc_region": {
+                        "type": "string"
+                    },
+                    "default_auto_archive_duration": {
+                        "type": "integer"
+                    },
+                    "default_reaction_emoji": {
+                        "type": [
+                            "null",
+                            "string"
+                        ]
+                    },
+                    "flags": {
+                        "type": "integer"
+                    },
+                    "default_thread_rate_limit_per_user": {
+                        "type": "integer"
+                    },
+                    "video_quality_mode": {
+                        "type": "integer"
+                    }
+                },
+                "additionalProperties": false
+            },
+            "ActivitySchema": {
+                "type": "object",
+                "properties": {
+                    "afk": {
+                        "type": "boolean"
+                    },
+                    "status": {
+                        "$ref": "#/definitions/Status"
+                    },
+                    "activities": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/definitions/Activity"
+                        }
+                    },
+                    "since": {
+                        "type": "integer"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "status"
+                ]
+            },
+            "Status": {
+                "enum": [
+                    "dnd",
+                    "idle",
+                    "invisible",
+                    "offline",
+                    "online"
+                ],
+                "type": "string"
+            },
+            "Activity": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "$ref": "#/definitions/ActivityType"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "created_at": {
+                        "type": "integer"
+                    },
+                    "timestamps": {
+                        "type": "object",
+                        "properties": {
+                            "start": {
+                                "type": "integer"
+                            },
+                            "end": {
+                                "type": "integer"
+                            }
+                        },
+                        "additionalProperties": false,
+                        "required": [
+                            "end",
+                            "start"
+                        ]
+                    },
+                    "application_id": {
+                        "type": "string"
+                    },
+                    "details": {
+                        "type": "string"
+                    },
+                    "state": {
+                        "type": "string"
+                    },
+                    "emoji": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "animated": {
+                                "type": "boolean"
+                            }
+                        },
+                        "additionalProperties": false,
+                        "required": [
+                            "animated",
+                            "name"
+                        ]
+                    },
+                    "party": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "string"
+                            },
+                            "size": {
+                                "type": "array",
+                                "items": [
+                                    {
+                                        "type": "integer"
+                                    }
+                                ],
+                                "minItems": 1,
+                                "maxItems": 1
+                            }
+                        },
+                        "additionalProperties": false
+                    },
+                    "assets": {
+                        "type": "object",
+                        "properties": {
+                            "large_image": {
+                                "type": "string"
+                            },
+                            "large_text": {
+                                "type": "string"
+                            },
+                            "small_image": {
+                                "type": "string"
+                            },
+                            "small_text": {
+                                "type": "string"
+                            }
+                        },
+                        "additionalProperties": false
+                    },
+                    "secrets": {
+                        "type": "object",
+                        "properties": {
+                            "join": {
+                                "type": "string"
+                            },
+                            "spectate": {
+                                "type": "string"
+                            },
+                            "match": {
+                                "type": "string"
+                            }
+                        },
+                        "additionalProperties": false
+                    },
+                    "instance": {
+                        "type": "boolean"
+                    },
+                    "flags": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "sync_id": {
+                        "type": "string"
+                    },
+                    "metadata": {
+                        "type": "object",
+                        "properties": {
+                            "context_uri": {
+                                "type": "string"
+                            },
+                            "album_id": {
+                                "type": "string"
+                            },
+                            "artist_ids": {
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
+                            }
+                        },
+                        "additionalProperties": false,
+                        "required": [
+                            "album_id",
+                            "artist_ids"
+                        ]
+                    },
+                    "session_id": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "flags",
+                    "name",
+                    "session_id",
+                    "type"
+                ]
+            },
+            "ActivityType": {
+                "enum": [
+                    0,
+                    1,
+                    2,
+                    4,
+                    5
+                ],
+                "type": "number"
+            },
+            "Record<string,[number,number][]>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "Embed": {
+                "type": "object",
+                "properties": {
+                    "title": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "enum": [
+                            "article",
+                            "gifv",
+                            "image",
+                            "link",
+                            "rich",
+                            "video"
+                        ],
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "timestamp": {
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "color": {
+                        "type": "integer"
+                    },
+                    "footer": {
+                        "type": "object",
+                        "properties": {
+                            "text": {
+                                "type": "string"
+                            },
+                            "icon_url": {
+                                "type": "string"
+                            },
+                            "proxy_icon_url": {
+                                "type": "string"
+                            }
+                        },
+                        "additionalProperties": false,
+                        "required": [
+                            "text"
+                        ]
+                    },
+                    "image": {
+                        "$ref": "#/definitions/EmbedImage"
+                    },
+                    "thumbnail": {
+                        "$ref": "#/definitions/EmbedImage"
+                    },
+                    "video": {
+                        "$ref": "#/definitions/EmbedImage"
+                    },
+                    "provider": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "url": {
+                                "type": "string"
+                            }
+                        },
+                        "additionalProperties": false
+                    },
+                    "author": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "url": {
+                                "type": "string"
+                            },
+                            "icon_url": {
+                                "type": "string"
+                            },
+                            "proxy_icon_url": {
+                                "type": "string"
+                            }
+                        },
+                        "additionalProperties": false
+                    },
+                    "fields": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "name": {
+                                    "type": "string"
+                                },
+                                "value": {
+                                    "type": "string"
+                                },
+                                "inline": {
+                                    "type": "boolean"
+                                }
+                            },
+                            "additionalProperties": false,
+                            "required": [
+                                "name",
+                                "value"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false
+            },
+            "EmbedImage": {
+                "type": "object",
+                "properties": {
+                    "url": {
+                        "type": "string"
+                    },
+                    "proxy_url": {
+                        "type": "string"
+                    },
+                    "height": {
+                        "type": "integer"
+                    },
+                    "width": {
+                        "type": "integer"
+                    }
+                },
+                "additionalProperties": false
+            },
+            "Partial<ChannelOverride>": {
+                "type": "object",
+                "properties": {
+                    "message_notifications": {
+                        "type": "integer"
+                    },
+                    "mute_config": {
+                        "$ref": "#/definitions/MuteConfig"
+                    },
+                    "muted": {
+                        "type": "boolean"
+                    },
+                    "channel_id": {
+                        "type": [
+                            "null",
+                            "string"
+                        ]
+                    }
+                },
+                "additionalProperties": false
+            },
+            "MuteConfig": {
+                "type": "object",
+                "properties": {
+                    "end_time": {
+                        "type": "integer"
+                    },
+                    "selected_time_window": {
+                        "type": "integer"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "end_time",
+                    "selected_time_window"
+                ]
+            },
+            "CustomStatus": {
+                "type": "object",
+                "properties": {
+                    "emoji_id": {
+                        "type": "string"
+                    },
+                    "emoji_name": {
+                        "type": "string"
+                    },
+                    "expires_at": {
+                        "type": "integer"
+                    },
+                    "text": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false
+            },
+            "FriendSourceFlags": {
+                "type": "object",
+                "properties": {
+                    "all": {
+                        "type": "boolean"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "all"
+                ]
+            },
+            "GuildFolder": {
+                "type": "object",
+                "properties": {
+                    "color": {
+                        "type": "integer"
+                    },
+                    "guild_ids": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    },
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "color",
+                    "guild_ids",
+                    "id",
+                    "name"
+                ]
+            },
+            "Partial<GenerateWebAuthnCredentialsSchema>": {
+                "type": "object",
+                "properties": {
+                    "password": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false
+            },
+            "Partial<CreateWebAuthnCredentialSchema>": {
+                "type": "object",
+                "properties": {
+                    "credential": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "ticket": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false
+            }
+        },
+        "$schema": "http://json-schema.org/draft-07/schema#"
+    },
+    "IdentifySchema": {
+        "type": "object",
+        "properties": {
+            "token": {
+                "type": "string"
+            },
+            "properties": {
+                "type": "object",
+                "properties": {
+                    "os": {
+                        "type": "string"
+                    },
+                    "os_atch": {
+                        "type": "string"
+                    },
+                    "browser": {
+                        "type": "string"
+                    },
+                    "device": {
+                        "type": "string"
+                    },
+                    "$os": {
+                        "type": "string"
+                    },
+                    "$browser": {
+                        "type": "string"
                     },
                     "$device": {
                         "type": "string"
                     },
-                    "browser_user_agent": {
+                    "browser_user_agent": {
+                        "type": "string"
+                    },
+                    "browser_version": {
+                        "type": "string"
+                    },
+                    "os_version": {
+                        "type": "string"
+                    },
+                    "referrer": {
+                        "type": "string"
+                    },
+                    "referring_domain": {
+                        "type": "string"
+                    },
+                    "referrer_current": {
+                        "type": "string"
+                    },
+                    "referring_domain_current": {
+                        "type": "string"
+                    },
+                    "release_channel": {
+                        "enum": [
+                            "canary",
+                            "dev",
+                            "ptb",
+                            "stable"
+                        ],
+                        "type": "string"
+                    },
+                    "client_build_number": {
+                        "type": "integer"
+                    },
+                    "client_event_source": {
+                        "type": "string"
+                    },
+                    "client_version": {
+                        "type": "string"
+                    },
+                    "system_locale": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false
+            },
+            "intents": {
+                "type": "bigint"
+            },
+            "presence": {
+                "$ref": "#/definitions/ActivitySchema"
+            },
+            "compress": {
+                "type": "boolean"
+            },
+            "large_threshold": {
+                "type": "integer"
+            },
+            "largeThreshold": {
+                "type": "integer"
+            },
+            "shard": {
+                "type": "array",
+                "items": [
+                    {
+                        "type": "bigint"
+                    },
+                    {
+                        "type": "bigint"
+                    }
+                ],
+                "minItems": 2,
+                "maxItems": 2
+            },
+            "guild_subscriptions": {
+                "type": "boolean"
+            },
+            "capabilities": {
+                "type": "integer"
+            },
+            "client_state": {
+                "type": "object",
+                "properties": {
+                    "guild_hashes": {},
+                    "highest_last_message_id": {
+                        "type": [
+                            "string",
+                            "integer"
+                        ]
+                    },
+                    "read_state_version": {
+                        "type": "integer"
+                    },
+                    "user_guild_settings_version": {
+                        "type": "integer"
+                    },
+                    "user_settings_version": {
+                        "type": "integer"
+                    },
+                    "useruser_guild_settings_version": {
+                        "type": "integer"
+                    },
+                    "private_channels_version": {
+                        "type": "integer"
+                    },
+                    "guild_versions": {},
+                    "api_code_version": {
+                        "type": "integer"
+                    }
+                },
+                "additionalProperties": false
+            },
+            "clientState": {
+                "type": "object",
+                "properties": {
+                    "guildHashes": {},
+                    "highestLastMessageId": {
+                        "type": [
+                            "string",
+                            "integer"
+                        ]
+                    },
+                    "readStateVersion": {
+                        "type": "integer"
+                    },
+                    "userGuildSettingsVersion": {
+                        "type": "integer"
+                    },
+                    "useruserGuildSettingsVersion": {
+                        "type": "integer"
+                    },
+                    "guildVersions": {},
+                    "apiCodeVersion": {
+                        "type": "integer"
+                    }
+                },
+                "additionalProperties": false
+            },
+            "v": {
+                "type": "integer"
+            }
+        },
+        "additionalProperties": false,
+        "required": [
+            "properties",
+            "token"
+        ],
+        "definitions": {
+            "ChannelPermissionOverwriteType": {
+                "enum": [
+                    0,
+                    1,
+                    2
+                ],
+                "type": "number"
+            },
+            "ChannelModifySchema": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "maxLength": 100,
+                        "type": "string"
+                    },
+                    "type": {
+                        "enum": [
+                            0,
+                            1,
+                            10,
+                            11,
+                            12,
+                            13,
+                            14,
+                            15,
+                            2,
+                            255,
+                            3,
+                            33,
+                            34,
+                            35,
+                            4,
+                            5,
+                            6,
+                            64,
+                            7,
+                            8,
+                            9
+                        ],
+                        "type": "number"
+                    },
+                    "topic": {
+                        "type": "string"
+                    },
+                    "icon": {
+                        "type": [
+                            "null",
+                            "string"
+                        ]
+                    },
+                    "bitrate": {
+                        "type": "integer"
+                    },
+                    "user_limit": {
+                        "type": "integer"
+                    },
+                    "rate_limit_per_user": {
+                        "type": "integer"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "permission_overwrites": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "string"
+                                },
+                                "type": {
+                                    "$ref": "#/definitions/ChannelPermissionOverwriteType"
+                                },
+                                "allow": {
+                                    "type": "string"
+                                },
+                                "deny": {
+                                    "type": "string"
+                                }
+                            },
+                            "additionalProperties": false,
+                            "required": [
+                                "allow",
+                                "deny",
+                                "id",
+                                "type"
+                            ]
+                        }
+                    },
+                    "parent_id": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "nsfw": {
+                        "type": "boolean"
+                    },
+                    "rtc_region": {
+                        "type": "string"
+                    },
+                    "default_auto_archive_duration": {
+                        "type": "integer"
+                    },
+                    "default_reaction_emoji": {
+                        "type": [
+                            "null",
+                            "string"
+                        ]
+                    },
+                    "flags": {
+                        "type": "integer"
+                    },
+                    "default_thread_rate_limit_per_user": {
+                        "type": "integer"
+                    },
+                    "video_quality_mode": {
+                        "type": "integer"
+                    }
+                },
+                "additionalProperties": false
+            },
+            "ActivitySchema": {
+                "type": "object",
+                "properties": {
+                    "afk": {
+                        "type": "boolean"
+                    },
+                    "status": {
+                        "$ref": "#/definitions/Status"
+                    },
+                    "activities": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/definitions/Activity"
+                        }
+                    },
+                    "since": {
+                        "type": "integer"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "status"
+                ]
+            },
+            "Status": {
+                "enum": [
+                    "dnd",
+                    "idle",
+                    "invisible",
+                    "offline",
+                    "online"
+                ],
+                "type": "string"
+            },
+            "Activity": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "$ref": "#/definitions/ActivityType"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "created_at": {
+                        "type": "integer"
+                    },
+                    "timestamps": {
+                        "type": "object",
+                        "properties": {
+                            "start": {
+                                "type": "integer"
+                            },
+                            "end": {
+                                "type": "integer"
+                            }
+                        },
+                        "additionalProperties": false,
+                        "required": [
+                            "end",
+                            "start"
+                        ]
+                    },
+                    "application_id": {
+                        "type": "string"
+                    },
+                    "details": {
+                        "type": "string"
+                    },
+                    "state": {
+                        "type": "string"
+                    },
+                    "emoji": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "animated": {
+                                "type": "boolean"
+                            }
+                        },
+                        "additionalProperties": false,
+                        "required": [
+                            "animated",
+                            "name"
+                        ]
+                    },
+                    "party": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "string"
+                            },
+                            "size": {
+                                "type": "array",
+                                "items": [
+                                    {
+                                        "type": "integer"
+                                    }
+                                ],
+                                "minItems": 1,
+                                "maxItems": 1
+                            }
+                        },
+                        "additionalProperties": false
+                    },
+                    "assets": {
+                        "type": "object",
+                        "properties": {
+                            "large_image": {
+                                "type": "string"
+                            },
+                            "large_text": {
+                                "type": "string"
+                            },
+                            "small_image": {
+                                "type": "string"
+                            },
+                            "small_text": {
+                                "type": "string"
+                            }
+                        },
+                        "additionalProperties": false
+                    },
+                    "secrets": {
+                        "type": "object",
+                        "properties": {
+                            "join": {
+                                "type": "string"
+                            },
+                            "spectate": {
+                                "type": "string"
+                            },
+                            "match": {
+                                "type": "string"
+                            }
+                        },
+                        "additionalProperties": false
+                    },
+                    "instance": {
+                        "type": "boolean"
+                    },
+                    "flags": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "sync_id": {
+                        "type": "string"
+                    },
+                    "metadata": {
+                        "type": "object",
+                        "properties": {
+                            "context_uri": {
+                                "type": "string"
+                            },
+                            "album_id": {
+                                "type": "string"
+                            },
+                            "artist_ids": {
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
+                            }
+                        },
+                        "additionalProperties": false,
+                        "required": [
+                            "album_id",
+                            "artist_ids"
+                        ]
+                    },
+                    "session_id": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "flags",
+                    "name",
+                    "session_id",
+                    "type"
+                ]
+            },
+            "ActivityType": {
+                "enum": [
+                    0,
+                    1,
+                    2,
+                    4,
+                    5
+                ],
+                "type": "number"
+            },
+            "Record<string,[number,number][]>": {
+                "type": "object",
+                "additionalProperties": false
+            },
+            "Embed": {
+                "type": "object",
+                "properties": {
+                    "title": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "enum": [
+                            "article",
+                            "gifv",
+                            "image",
+                            "link",
+                            "rich",
+                            "video"
+                        ],
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "timestamp": {
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "color": {
+                        "type": "integer"
+                    },
+                    "footer": {
+                        "type": "object",
+                        "properties": {
+                            "text": {
+                                "type": "string"
+                            },
+                            "icon_url": {
+                                "type": "string"
+                            },
+                            "proxy_icon_url": {
+                                "type": "string"
+                            }
+                        },
+                        "additionalProperties": false,
+                        "required": [
+                            "text"
+                        ]
+                    },
+                    "image": {
+                        "$ref": "#/definitions/EmbedImage"
+                    },
+                    "thumbnail": {
+                        "$ref": "#/definitions/EmbedImage"
+                    },
+                    "video": {
+                        "$ref": "#/definitions/EmbedImage"
+                    },
+                    "provider": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "url": {
+                                "type": "string"
+                            }
+                        },
+                        "additionalProperties": false
+                    },
+                    "author": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "url": {
+                                "type": "string"
+                            },
+                            "icon_url": {
+                                "type": "string"
+                            },
+                            "proxy_icon_url": {
+                                "type": "string"
+                            }
+                        },
+                        "additionalProperties": false
+                    },
+                    "fields": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "name": {
+                                    "type": "string"
+                                },
+                                "value": {
+                                    "type": "string"
+                                },
+                                "inline": {
+                                    "type": "boolean"
+                                }
+                            },
+                            "additionalProperties": false,
+                            "required": [
+                                "name",
+                                "value"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false
+            },
+            "EmbedImage": {
+                "type": "object",
+                "properties": {
+                    "url": {
+                        "type": "string"
+                    },
+                    "proxy_url": {
                         "type": "string"
                     },
-                    "browser_version": {
-                        "type": "string"
+                    "height": {
+                        "type": "integer"
                     },
-                    "os_version": {
-                        "type": "string"
+                    "width": {
+                        "type": "integer"
+                    }
+                },
+                "additionalProperties": false
+            },
+            "Partial<ChannelOverride>": {
+                "type": "object",
+                "properties": {
+                    "message_notifications": {
+                        "type": "integer"
                     },
-                    "referrer": {
-                        "type": "string"
+                    "mute_config": {
+                        "$ref": "#/definitions/MuteConfig"
                     },
-                    "referring_domain": {
-                        "type": "string"
+                    "muted": {
+                        "type": "boolean"
                     },
-                    "referrer_current": {
-                        "type": "string"
+                    "channel_id": {
+                        "type": [
+                            "null",
+                            "string"
+                        ]
+                    }
+                },
+                "additionalProperties": false
+            },
+            "MuteConfig": {
+                "type": "object",
+                "properties": {
+                    "end_time": {
+                        "type": "integer"
                     },
-                    "referring_domain_current": {
+                    "selected_time_window": {
+                        "type": "integer"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "end_time",
+                    "selected_time_window"
+                ]
+            },
+            "CustomStatus": {
+                "type": "object",
+                "properties": {
+                    "emoji_id": {
                         "type": "string"
                     },
-                    "release_channel": {
-                        "enum": [
-                            "canary",
-                            "dev",
-                            "ptb",
-                            "stable"
-                        ],
+                    "emoji_name": {
                         "type": "string"
                     },
-                    "client_build_number": {
+                    "expires_at": {
                         "type": "integer"
                     },
-                    "client_event_source": {
-                        "type": "string"
-                    },
-                    "client_version": {
-                        "type": "string"
-                    },
-                    "system_locale": {
+                    "text": {
                         "type": "string"
                     }
                 },
                 "additionalProperties": false
             },
-            "intents": {
-                "type": "bigint"
-            },
-            "presence": {
-                "$ref": "#/definitions/ActivitySchema"
-            },
-            "compress": {
-                "type": "boolean"
-            },
-            "large_threshold": {
-                "type": "integer"
-            },
-            "largeThreshold": {
-                "type": "integer"
-            },
-            "shard": {
-                "type": "array",
-                "items": [
-                    {
-                        "type": "bigint"
-                    },
-                    {
-                        "type": "bigint"
+            "FriendSourceFlags": {
+                "type": "object",
+                "properties": {
+                    "all": {
+                        "type": "boolean"
                     }
-                ],
-                "minItems": 2,
-                "maxItems": 2
-            },
-            "guild_subscriptions": {
-                "type": "boolean"
-            },
-            "capabilities": {
-                "type": "integer"
+                },
+                "additionalProperties": false,
+                "required": [
+                    "all"
+                ]
             },
-            "client_state": {
+            "GuildFolder": {
                 "type": "object",
                 "properties": {
-                    "guild_hashes": {},
-                    "highest_last_message_id": {
-                        "type": [
-                            "string",
-                            "integer"
-                        ]
-                    },
-                    "read_state_version": {
-                        "type": "integer"
-                    },
-                    "user_guild_settings_version": {
-                        "type": "integer"
-                    },
-                    "user_settings_version": {
+                    "color": {
                         "type": "integer"
                     },
-                    "useruser_guild_settings_version": {
-                        "type": "integer"
+                    "guild_ids": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
                     },
-                    "private_channels_version": {
+                    "id": {
                         "type": "integer"
                     },
-                    "guild_versions": {},
-                    "api_code_version": {
-                        "type": "integer"
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "color",
+                    "guild_ids",
+                    "id",
+                    "name"
+                ]
+            },
+            "Partial<GenerateWebAuthnCredentialsSchema>": {
+                "type": "object",
+                "properties": {
+                    "password": {
+                        "type": "string"
                     }
                 },
                 "additionalProperties": false
             },
-            "clientState": {
+            "Partial<CreateWebAuthnCredentialSchema>": {
                 "type": "object",
                 "properties": {
-                    "guildHashes": {},
-                    "highestLastMessageId": {
-                        "type": [
-                            "string",
-                            "integer"
-                        ]
-                    },
-                    "readStateVersion": {
-                        "type": "integer"
-                    },
-                    "userGuildSettingsVersion": {
-                        "type": "integer"
+                    "credential": {
+                        "type": "string"
                     },
-                    "useruserGuildSettingsVersion": {
-                        "type": "integer"
+                    "name": {
+                        "type": "string"
                     },
-                    "guildVersions": {},
-                    "apiCodeVersion": {
-                        "type": "integer"
+                    "ticket": {
+                        "type": "string"
                     }
                 },
                 "additionalProperties": false
+            }
+        },
+        "$schema": "http://json-schema.org/draft-07/schema#"
+    },
+    "InviteCreateSchema": {
+        "type": "object",
+        "properties": {
+            "target_user_id": {
+                "type": "string"
             },
-            "v": {
+            "target_type": {
+                "type": "string"
+            },
+            "validate": {
+                "type": "string"
+            },
+            "max_age": {
+                "type": "integer"
+            },
+            "max_uses": {
+                "type": "integer"
+            },
+            "temporary": {
+                "type": "boolean"
+            },
+            "unique": {
+                "type": "boolean"
+            },
+            "target_user": {
+                "type": "string"
+            },
+            "target_user_type": {
                 "type": "integer"
             }
         },
         "additionalProperties": false,
-        "required": [
-            "properties",
-            "token"
-        ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
                 "enum": [
@@ -7818,38 +9022,42 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "InviteCreateSchema": {
+    "LazyRequestSchema": {
         "type": "object",
         "properties": {
-            "target_user_id": {
-                "type": "string"
-            },
-            "target_type": {
-                "type": "string"
-            },
-            "validate": {
+            "guild_id": {
                 "type": "string"
             },
-            "max_age": {
-                "type": "integer"
+            "channels": {
+                "$ref": "#/definitions/Record<string,[number,number][]>"
             },
-            "max_uses": {
-                "type": "integer"
+            "activities": {
+                "type": "boolean"
             },
-            "temporary": {
+            "threads": {
                 "type": "boolean"
             },
-            "unique": {
+            "typing": {
+                "enum": [
+                    true
+                ],
                 "type": "boolean"
             },
-            "target_user": {
-                "type": "string"
+            "members": {
+                "type": "array",
+                "items": {
+                    "type": "string"
+                }
             },
-            "target_user_type": {
-                "type": "integer"
+            "thread_member_lists": {
+                "type": "array",
+                "items": {}
             }
         },
         "additionalProperties": false,
+        "required": [
+            "guild_id"
+        ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
                 "enum": [
@@ -8429,41 +9637,32 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "LazyRequestSchema": {
+    "LoginSchema": {
         "type": "object",
         "properties": {
-            "guild_id": {
+            "login": {
                 "type": "string"
             },
-            "channels": {
-                "$ref": "#/definitions/Record<string,[number,number][]>"
-            },
-            "activities": {
-                "type": "boolean"
+            "password": {
+                "type": "string"
             },
-            "threads": {
+            "undelete": {
                 "type": "boolean"
             },
-            "typing": {
-                "enum": [
-                    true
-                ],
-                "type": "boolean"
+            "captcha_key": {
+                "type": "string"
             },
-            "members": {
-                "type": "array",
-                "items": {
-                    "type": "string"
-                }
+            "login_source": {
+                "type": "string"
             },
-            "thread_member_lists": {
-                "type": "array",
-                "items": {}
+            "gift_code_sku_id": {
+                "type": "string"
             }
         },
         "additionalProperties": false,
         "required": [
-            "guild_id"
+            "login",
+            "password"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -9044,33 +10243,39 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "LoginSchema": {
+    "MemberChangeProfileSchema": {
         "type": "object",
         "properties": {
-            "login": {
-                "type": "string"
+            "banner": {
+                "type": [
+                    "null",
+                    "string"
+                ]
             },
-            "password": {
+            "nick": {
                 "type": "string"
             },
-            "undelete": {
-                "type": "boolean"
-            },
-            "captcha_key": {
+            "bio": {
                 "type": "string"
             },
-            "login_source": {
+            "pronouns": {
                 "type": "string"
             },
-            "gift_code_sku_id": {
-                "type": "string"
+            "theme_colors": {
+                "type": "array",
+                "items": [
+                    {
+                        "type": "integer"
+                    },
+                    {
+                        "type": "integer"
+                    }
+                ],
+                "minItems": 2,
+                "maxItems": 2
             }
         },
         "additionalProperties": false,
-        "required": [
-            "login",
-            "password"
-        ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
                 "enum": [
@@ -9650,36 +10855,26 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "MemberChangeProfileSchema": {
+    "MemberChangeSchema": {
         "type": "object",
         "properties": {
-            "banner": {
+            "roles": {
+                "type": "array",
+                "items": {
+                    "type": "string"
+                }
+            },
+            "nick": {
+                "type": "string"
+            },
+            "avatar": {
                 "type": [
                     "null",
                     "string"
                 ]
             },
-            "nick": {
-                "type": "string"
-            },
             "bio": {
                 "type": "string"
-            },
-            "pronouns": {
-                "type": "string"
-            },
-            "theme_colors": {
-                "type": "array",
-                "items": [
-                    {
-                        "type": "integer"
-                    },
-                    {
-                        "type": "integer"
-                    }
-                ],
-                "minItems": 2,
-                "maxItems": 2
             }
         },
         "additionalProperties": false,
@@ -10262,26 +11457,14 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "MemberChangeSchema": {
+    "MessageAcknowledgeSchema": {
         "type": "object",
         "properties": {
-            "roles": {
-                "type": "array",
-                "items": {
-                    "type": "string"
-                }
-            },
-            "nick": {
-                "type": "string"
-            },
-            "avatar": {
-                "type": [
-                    "null",
-                    "string"
-                ]
+            "manual": {
+                "type": "boolean"
             },
-            "bio": {
-                "type": "string"
+            "mention_count": {
+                "type": "integer"
             }
         },
         "additionalProperties": false,
@@ -10831,47 +12014,158 @@
                 },
                 "additionalProperties": false,
                 "required": [
-                    "color",
-                    "guild_ids",
-                    "id",
-                    "name"
+                    "color",
+                    "guild_ids",
+                    "id",
+                    "name"
+                ]
+            },
+            "Partial<GenerateWebAuthnCredentialsSchema>": {
+                "type": "object",
+                "properties": {
+                    "password": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false
+            },
+            "Partial<CreateWebAuthnCredentialSchema>": {
+                "type": "object",
+                "properties": {
+                    "credential": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "ticket": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false
+            }
+        },
+        "$schema": "http://json-schema.org/draft-07/schema#"
+    },
+    "MessageCreateSchema": {
+        "type": "object",
+        "properties": {
+            "type": {
+                "type": "integer"
+            },
+            "content": {
+                "type": "string"
+            },
+            "nonce": {
+                "type": "string"
+            },
+            "channel_id": {
+                "type": "string"
+            },
+            "tts": {
+                "type": "boolean"
+            },
+            "flags": {
+                "type": "string"
+            },
+            "embeds": {
+                "type": "array",
+                "items": {
+                    "$ref": "#/definitions/Embed"
+                }
+            },
+            "embed": {
+                "$ref": "#/definitions/Embed"
+            },
+            "allowed_mentions": {
+                "type": "object",
+                "properties": {
+                    "parse": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    },
+                    "roles": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    },
+                    "users": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    },
+                    "replied_user": {
+                        "type": "boolean"
+                    }
+                },
+                "additionalProperties": false
+            },
+            "message_reference": {
+                "type": "object",
+                "properties": {
+                    "message_id": {
+                        "type": "string"
+                    },
+                    "channel_id": {
+                        "type": "string"
+                    },
+                    "guild_id": {
+                        "type": "string"
+                    },
+                    "fail_if_not_exists": {
+                        "type": "boolean"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "channel_id",
+                    "message_id"
                 ]
             },
-            "Partial<GenerateWebAuthnCredentialsSchema>": {
+            "payload_json": {
+                "type": "string"
+            },
+            "file": {
                 "type": "object",
                 "properties": {
-                    "password": {
+                    "filename": {
                         "type": "string"
                     }
                 },
-                "additionalProperties": false
+                "additionalProperties": false,
+                "required": [
+                    "filename"
+                ]
             },
-            "Partial<CreateWebAuthnCredentialSchema>": {
-                "type": "object",
-                "properties": {
-                    "credential": {
-                        "type": "string"
-                    },
-                    "name": {
-                        "type": "string"
+            "attachments": {
+                "description": "TODO: we should create an interface for attachments\nTODO: OpenWAAO<-->attachment-style metadata conversion",
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "string"
+                        },
+                        "filename": {
+                            "type": "string"
+                        }
                     },
-                    "ticket": {
-                        "type": "string"
-                    }
-                },
-                "additionalProperties": false
-            }
-        },
-        "$schema": "http://json-schema.org/draft-07/schema#"
-    },
-    "MessageAcknowledgeSchema": {
-        "type": "object",
-        "properties": {
-            "manual": {
-                "type": "boolean"
+                    "additionalProperties": false,
+                    "required": [
+                        "filename",
+                        "id"
+                    ]
+                }
             },
-            "mention_count": {
-                "type": "integer"
+            "sticker_ids": {
+                "type": "array",
+                "items": {
+                    "type": "string"
+                }
             }
         },
         "additionalProperties": false,
@@ -11454,11 +12748,26 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "MessageCreateSchema": {
+    "MessageEditSchema": {
         "type": "object",
         "properties": {
-            "type": {
-                "type": "integer"
+            "file": {
+                "type": "object",
+                "properties": {
+                    "filename": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "filename"
+                ]
+            },
+            "embed": {
+                "$ref": "#/definitions/Embed"
+            },
+            "flags": {
+                "type": "string"
             },
             "content": {
                 "type": "string"
@@ -11472,18 +12781,12 @@
             "tts": {
                 "type": "boolean"
             },
-            "flags": {
-                "type": "string"
-            },
             "embeds": {
                 "type": "array",
                 "items": {
                     "$ref": "#/definitions/Embed"
                 }
             },
-            "embed": {
-                "$ref": "#/definitions/Embed"
-            },
             "allowed_mentions": {
                 "type": "object",
                 "properties": {
@@ -11536,18 +12839,6 @@
             "payload_json": {
                 "type": "string"
             },
-            "file": {
-                "type": "object",
-                "properties": {
-                    "filename": {
-                        "type": "string"
-                    }
-                },
-                "additionalProperties": false,
-                "required": [
-                    "filename"
-                ]
-            },
             "attachments": {
                 "description": "TODO: we should create an interface for attachments\nTODO: OpenWAAO<-->attachment-style metadata conversion",
                 "type": "array",
@@ -13349,20 +14640,20 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "PurgeSchema": {
+    "PasswordResetSchema": {
         "type": "object",
         "properties": {
-            "before": {
+            "password": {
                 "type": "string"
             },
-            "after": {
+            "token": {
                 "type": "string"
             }
         },
         "additionalProperties": false,
         "required": [
-            "after",
-            "before"
+            "password",
+            "token"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -13943,49 +15234,20 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "RegisterSchema": {
+    "PurgeSchema": {
         "type": "object",
         "properties": {
-            "username": {
-                "minLength": 2,
-                "maxLength": 32,
-                "type": "string"
-            },
-            "password": {
-                "minLength": 1,
-                "maxLength": 72,
-                "type": "string"
-            },
-            "consent": {
-                "type": "boolean"
-            },
-            "email": {
-                "format": "email",
-                "type": "string"
-            },
-            "fingerprint": {
-                "type": "string"
-            },
-            "invite": {
-                "type": "string"
-            },
-            "date_of_birth": {
-                "type": "string"
-            },
-            "gift_code_sku_id": {
+            "before": {
                 "type": "string"
             },
-            "captcha_key": {
+            "after": {
                 "type": "string"
-            },
-            "promotional_email_opt_in": {
-                "type": "boolean"
             }
         },
         "additionalProperties": false,
         "required": [
-            "consent",
-            "username"
+            "after",
+            "before"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -14566,19 +15828,48 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "RelationshipPostSchema": {
+    "RegisterSchema": {
         "type": "object",
         "properties": {
-            "discriminator": {
+            "username": {
+                "minLength": 2,
+                "maxLength": 32,
                 "type": "string"
             },
-            "username": {
+            "password": {
+                "minLength": 1,
+                "maxLength": 72,
+                "type": "string"
+            },
+            "consent": {
+                "type": "boolean"
+            },
+            "email": {
+                "format": "email",
+                "type": "string"
+            },
+            "fingerprint": {
+                "type": "string"
+            },
+            "invite": {
+                "type": "string"
+            },
+            "date_of_birth": {
+                "type": "string"
+            },
+            "gift_code_sku_id": {
                 "type": "string"
+            },
+            "captcha_key": {
+                "type": "string"
+            },
+            "promotional_email_opt_in": {
+                "type": "boolean"
             }
         },
         "additionalProperties": false,
         "required": [
-            "discriminator",
+            "consent",
             "username"
         ],
         "definitions": {
@@ -15160,20 +16451,21 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "RelationshipPutSchema": {
+    "RelationshipPostSchema": {
         "type": "object",
         "properties": {
-            "type": {
-                "enum": [
-                    1,
-                    2,
-                    3,
-                    4
-                ],
-                "type": "number"
+            "discriminator": {
+                "type": "string"
+            },
+            "username": {
+                "type": "string"
             }
         },
         "additionalProperties": false,
+        "required": [
+            "discriminator",
+            "username"
+        ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
                 "enum": [
@@ -15734,51 +17026,36 @@
                     }
                 },
                 "additionalProperties": false
-            },
-            "Partial<CreateWebAuthnCredentialSchema>": {
-                "type": "object",
-                "properties": {
-                    "credential": {
-                        "type": "string"
-                    },
-                    "name": {
-                        "type": "string"
-                    },
-                    "ticket": {
-                        "type": "string"
-                    }
-                },
-                "additionalProperties": false
-            }
-        },
-        "$schema": "http://json-schema.org/draft-07/schema#"
-    },
-    "RoleModifySchema": {
-        "type": "object",
-        "properties": {
-            "name": {
-                "type": "string"
-            },
-            "permissions": {
-                "type": "string"
-            },
-            "color": {
-                "type": "integer"
-            },
-            "hoist": {
-                "type": "boolean"
-            },
-            "mentionable": {
-                "type": "boolean"
-            },
-            "position": {
-                "type": "integer"
-            },
-            "icon": {
-                "type": "string"
-            },
-            "unicode_emoji": {
-                "type": "string"
+            },
+            "Partial<CreateWebAuthnCredentialSchema>": {
+                "type": "object",
+                "properties": {
+                    "credential": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "ticket": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false
+            }
+        },
+        "$schema": "http://json-schema.org/draft-07/schema#"
+    },
+    "RelationshipPutSchema": {
+        "type": "object",
+        "properties": {
+            "type": {
+                "enum": [
+                    1,
+                    2,
+                    3,
+                    4
+                ],
+                "type": "number"
             }
         },
         "additionalProperties": false,
@@ -16361,24 +17638,35 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "RolePositionUpdateSchema": {
-        "type": "array",
-        "items": {
-            "type": "object",
-            "properties": {
-                "id": {
-                    "type": "string"
-                },
-                "position": {
-                    "type": "integer"
-                }
+    "RoleModifySchema": {
+        "type": "object",
+        "properties": {
+            "name": {
+                "type": "string"
             },
-            "additionalProperties": false,
-            "required": [
-                "id",
-                "position"
-            ]
+            "permissions": {
+                "type": "string"
+            },
+            "color": {
+                "type": "integer"
+            },
+            "hoist": {
+                "type": "boolean"
+            },
+            "mentionable": {
+                "type": "boolean"
+            },
+            "position": {
+                "type": "integer"
+            },
+            "icon": {
+                "type": "string"
+            },
+            "unicode_emoji": {
+                "type": "string"
+            }
         },
+        "additionalProperties": false,
         "definitions": {
             "ChannelPermissionOverwriteType": {
                 "enum": [
@@ -16958,98 +18246,24 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "SelectProtocolSchema": {
-        "type": "object",
-        "properties": {
-            "protocol": {
-                "enum": [
-                    "udp",
-                    "webrtc"
-                ],
-                "type": "string"
-            },
-            "data": {
-                "anyOf": [
-                    {
-                        "type": "object",
-                        "properties": {
-                            "address": {
-                                "type": "string"
-                            },
-                            "port": {
-                                "type": "integer"
-                            },
-                            "mode": {
-                                "type": "string"
-                            }
-                        },
-                        "additionalProperties": false,
-                        "required": [
-                            "address",
-                            "mode",
-                            "port"
-                        ]
-                    },
-                    {
-                        "type": "string"
-                    }
-                ]
-            },
-            "sdp": {
-                "type": "string"
-            },
-            "codecs": {
-                "type": "array",
-                "items": {
-                    "type": "object",
-                    "properties": {
-                        "name": {
-                            "enum": [
-                                "H264",
-                                "VP8",
-                                "VP9",
-                                "opus"
-                            ],
-                            "type": "string"
-                        },
-                        "type": {
-                            "enum": [
-                                "audio",
-                                "video"
-                            ],
-                            "type": "string"
-                        },
-                        "priority": {
-                            "type": "integer"
-                        },
-                        "payload_type": {
-                            "type": "integer"
-                        },
-                        "rtx_payload_type": {
-                            "type": [
-                                "null",
-                                "integer"
-                            ]
-                        }
-                    },
-                    "additionalProperties": false,
-                    "required": [
-                        "name",
-                        "payload_type",
-                        "priority",
-                        "type"
-                    ]
+    "RolePositionUpdateSchema": {
+        "type": "array",
+        "items": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "position": {
+                    "type": "integer"
                 }
             },
-            "rtc_connection_id": {
-                "type": "string"
-            }
+            "additionalProperties": false,
+            "required": [
+                "id",
+                "position"
+            ]
         },
-        "additionalProperties": false,
-        "required": [
-            "data",
-            "protocol"
-        ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
                 "enum": [
@@ -17620,28 +18834,106 @@
                     "name": {
                         "type": "string"
                     },
-                    "ticket": {
-                        "type": "string"
-                    }
-                },
-                "additionalProperties": false
-            }
-        },
-        "$schema": "http://json-schema.org/draft-07/schema#"
-    },
-    "TemplateCreateSchema": {
-        "type": "object",
-        "properties": {
-            "name": {
-                "type": "string"
+                    "ticket": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false
+            }
+        },
+        "$schema": "http://json-schema.org/draft-07/schema#"
+    },
+    "SelectProtocolSchema": {
+        "type": "object",
+        "properties": {
+            "protocol": {
+                "enum": [
+                    "udp",
+                    "webrtc"
+                ],
+                "type": "string"
+            },
+            "data": {
+                "anyOf": [
+                    {
+                        "type": "object",
+                        "properties": {
+                            "address": {
+                                "type": "string"
+                            },
+                            "port": {
+                                "type": "integer"
+                            },
+                            "mode": {
+                                "type": "string"
+                            }
+                        },
+                        "additionalProperties": false,
+                        "required": [
+                            "address",
+                            "mode",
+                            "port"
+                        ]
+                    },
+                    {
+                        "type": "string"
+                    }
+                ]
+            },
+            "sdp": {
+                "type": "string"
+            },
+            "codecs": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "enum": [
+                                "H264",
+                                "VP8",
+                                "VP9",
+                                "opus"
+                            ],
+                            "type": "string"
+                        },
+                        "type": {
+                            "enum": [
+                                "audio",
+                                "video"
+                            ],
+                            "type": "string"
+                        },
+                        "priority": {
+                            "type": "integer"
+                        },
+                        "payload_type": {
+                            "type": "integer"
+                        },
+                        "rtx_payload_type": {
+                            "type": [
+                                "null",
+                                "integer"
+                            ]
+                        }
+                    },
+                    "additionalProperties": false,
+                    "required": [
+                        "name",
+                        "payload_type",
+                        "priority",
+                        "type"
+                    ]
+                }
             },
-            "description": {
+            "rtc_connection_id": {
                 "type": "string"
             }
         },
         "additionalProperties": false,
         "required": [
-            "name"
+            "data",
+            "protocol"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -18222,7 +19514,7 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "TemplateModifySchema": {
+    "TemplateCreateSchema": {
         "type": "object",
         "properties": {
             "name": {
@@ -18815,16 +20107,19 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "TotpDisableSchema": {
+    "TemplateModifySchema": {
         "type": "object",
         "properties": {
-            "code": {
+            "name": {
+                "type": "string"
+            },
+            "description": {
                 "type": "string"
             }
         },
         "additionalProperties": false,
         "required": [
-            "code"
+            "name"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -19405,22 +20700,16 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "TotpEnableSchema": {
+    "TotpDisableSchema": {
         "type": "object",
         "properties": {
-            "password": {
-                "type": "string"
-            },
             "code": {
                 "type": "string"
-            },
-            "secret": {
-                "type": "string"
             }
         },
         "additionalProperties": false,
         "required": [
-            "password"
+            "code"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -20001,32 +21290,22 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "TotpSchema": {
+    "TotpEnableSchema": {
         "type": "object",
         "properties": {
-            "code": {
+            "password": {
                 "type": "string"
             },
-            "ticket": {
+            "code": {
                 "type": "string"
             },
-            "gift_code_sku_id": {
-                "type": [
-                    "null",
-                    "string"
-                ]
-            },
-            "login_source": {
-                "type": [
-                    "null",
-                    "string"
-                ]
+            "secret": {
+                "type": "string"
             }
         },
         "additionalProperties": false,
         "required": [
-            "code",
-            "ticket"
+            "password"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -20607,16 +21886,32 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "UserDeleteSchema": {
+    "TotpSchema": {
         "type": "object",
         "properties": {
-            "user_id": {
+            "code": {
+                "type": "string"
+            },
+            "ticket": {
                 "type": "string"
+            },
+            "gift_code_sku_id": {
+                "type": [
+                    "null",
+                    "string"
+                ]
+            },
+            "login_source": {
+                "type": [
+                    "null",
+                    "string"
+                ]
             }
         },
         "additionalProperties": false,
         "required": [
-            "user_id"
+            "code",
+            "ticket"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -21197,66 +22492,17 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "UserGuildSettingsSchema": {
+    "UserDeleteSchema": {
         "type": "object",
         "properties": {
-            "channel_overrides": {
-                "type": "object",
-                "additionalProperties": {
-                    "$ref": "#/definitions/Partial<ChannelOverride>"
-                }
-            },
-            "version": {
-                "type": "integer"
-            },
-            "guild_id": {
-                "type": [
-                    "null",
-                    "string"
-                ]
-            },
-            "flags": {
-                "type": "integer"
-            },
-            "message_notifications": {
-                "type": "integer"
-            },
-            "mobile_push": {
-                "type": "boolean"
-            },
-            "mute_config": {
-                "anyOf": [
-                    {
-                        "$ref": "#/definitions/MuteConfig"
-                    },
-                    {
-                        "type": "null"
-                    }
-                ]
-            },
-            "muted": {
-                "type": "boolean"
-            },
-            "suppress_everyone": {
-                "type": "boolean"
-            },
-            "suppress_roles": {
-                "type": "boolean"
-            },
-            "mute_scheduled_events": {
-                "type": "boolean"
-            },
-            "hide_muted_channels": {
-                "type": "boolean"
-            },
-            "notify_highlights": {
-                "enum": [
-                    0
-                ],
-                "type": "number"
+            "user_id": {
+                "type": "string"
             }
         },
         "additionalProperties": false,
+        "required": [
+            "user_id"
+        ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
                 "enum": [
@@ -21836,49 +23082,63 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "UserModifySchema": {
+    "UserGuildSettingsSchema": {
         "type": "object",
         "properties": {
-            "username": {
-                "minLength": 1,
-                "maxLength": 100,
-                "type": "string"
+            "channel_overrides": {
+                "type": "object",
+                "additionalProperties": {
+                    "$ref": "#/definitions/Partial<ChannelOverride>"
+                }
             },
-            "avatar": {
+            "version": {
+                "type": "integer"
+            },
+            "guild_id": {
                 "type": [
                     "null",
                     "string"
                 ]
             },
-            "bio": {
-                "maxLength": 1024,
-                "type": "string"
+            "flags": {
+                "type": "integer"
             },
-            "accent_color": {
+            "message_notifications": {
                 "type": "integer"
             },
-            "banner": {
-                "type": [
-                    "null",
-                    "string"
+            "mobile_push": {
+                "type": "boolean"
+            },
+            "mute_config": {
+                "anyOf": [
+                    {
+                        "$ref": "#/definitions/MuteConfig"
+                    },
+                    {
+                        "type": "null"
+                    }
                 ]
             },
-            "password": {
-                "type": "string"
+            "muted": {
+                "type": "boolean"
             },
-            "new_password": {
-                "type": "string"
+            "suppress_everyone": {
+                "type": "boolean"
             },
-            "code": {
-                "type": "string"
+            "suppress_roles": {
+                "type": "boolean"
             },
-            "email": {
-                "type": "string"
+            "mute_scheduled_events": {
+                "type": "boolean"
             },
-            "discriminator": {
-                "minLength": 4,
-                "maxLength": 4,
-                "type": "string"
+            "hide_muted_channels": {
+                "type": "boolean"
+            },
+            "notify_highlights": {
+                "enum": [
+                    0
+                ],
+                "type": "number"
             }
         },
         "additionalProperties": false,
@@ -22461,39 +23721,49 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "UserProfileModifySchema": {
+    "UserModifySchema": {
         "type": "object",
         "properties": {
-            "bio": {
+            "username": {
+                "minLength": 1,
+                "maxLength": 100,
                 "type": "string"
             },
-            "accent_color": {
+            "avatar": {
                 "type": [
                     "null",
-                    "integer"
+                    "string"
                 ]
             },
+            "bio": {
+                "maxLength": 1024,
+                "type": "string"
+            },
+            "accent_color": {
+                "type": "integer"
+            },
             "banner": {
                 "type": [
                     "null",
                     "string"
                 ]
             },
-            "pronouns": {
+            "password": {
                 "type": "string"
             },
-            "theme_colors": {
-                "type": "array",
-                "items": [
-                    {
-                        "type": "integer"
-                    },
-                    {
-                        "type": "integer"
-                    }
-                ],
-                "minItems": 2,
-                "maxItems": 2
+            "new_password": {
+                "type": "string"
+            },
+            "code": {
+                "type": "string"
+            },
+            "email": {
+                "type": "string"
+            },
+            "discriminator": {
+                "minLength": 4,
+                "maxLength": 4,
+                "type": "string"
             }
         },
         "additionalProperties": false,
@@ -23076,128 +24346,39 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "UserSettingsSchema": {
+    "UserProfileModifySchema": {
         "type": "object",
         "properties": {
-            "afk_timeout": {
-                "type": "integer"
-            },
-            "allow_accessibility_detection": {
-                "type": "boolean"
-            },
-            "animate_emoji": {
-                "type": "boolean"
+            "bio": {
+                "type": "string"
             },
-            "animate_stickers": {
-                "type": "integer"
+            "accent_color": {
+                "type": [
+                    "null",
+                    "integer"
+                ]
             },
-            "contact_sync_enabled": {
-                "type": "boolean"
+            "banner": {
+                "type": [
+                    "null",
+                    "string"
+                ]
             },
-            "convert_emoticons": {
-                "type": "boolean"
+            "pronouns": {
+                "type": "string"
             },
-            "custom_status": {
-                "anyOf": [
+            "theme_colors": {
+                "type": "array",
+                "items": [
                     {
-                        "$ref": "#/definitions/CustomStatus"
+                        "type": "integer"
                     },
                     {
-                        "type": "null"
+                        "type": "integer"
                     }
-                ]
-            },
-            "default_guilds_restricted": {
-                "type": "boolean"
-            },
-            "detect_platform_accounts": {
-                "type": "boolean"
-            },
-            "developer_mode": {
-                "type": "boolean"
-            },
-            "disable_games_tab": {
-                "type": "boolean"
-            },
-            "enable_tts_command": {
-                "type": "boolean"
-            },
-            "explicit_content_filter": {
-                "type": "integer"
-            },
-            "friend_source_flags": {
-                "$ref": "#/definitions/FriendSourceFlags"
-            },
-            "gateway_connected": {
-                "type": "boolean"
-            },
-            "gif_auto_play": {
-                "type": "boolean"
-            },
-            "guild_folders": {
-                "type": "array",
-                "items": {
-                    "$ref": "#/definitions/GuildFolder"
-                }
-            },
-            "guild_positions": {
-                "type": "array",
-                "items": {
-                    "type": "string"
-                }
-            },
-            "inline_attachment_media": {
-                "type": "boolean"
-            },
-            "inline_embed_media": {
-                "type": "boolean"
-            },
-            "locale": {
-                "type": "string"
-            },
-            "message_display_compact": {
-                "type": "boolean"
-            },
-            "native_phone_integration_enabled": {
-                "type": "boolean"
-            },
-            "render_embeds": {
-                "type": "boolean"
-            },
-            "render_reactions": {
-                "type": "boolean"
-            },
-            "restricted_guilds": {
-                "type": "array",
-                "items": {
-                    "type": "string"
-                }
-            },
-            "show_current_game": {
-                "type": "boolean"
-            },
-            "status": {
-                "enum": [
-                    "dnd",
-                    "idle",
-                    "invisible",
-                    "offline",
-                    "online"
                 ],
-                "type": "string"
-            },
-            "stream_notifications_enabled": {
-                "type": "boolean"
-            },
-            "theme": {
-                "enum": [
-                    "dark",
-                    "light"
-                ],
-                "type": "string"
-            },
-            "timezone_offset": {
-                "type": "integer"
+                "minItems": 2,
+                "maxItems": 2
             }
         },
         "additionalProperties": false,
@@ -23780,13 +24961,128 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "VanityUrlSchema": {
+    "UserSettingsSchema": {
         "type": "object",
         "properties": {
-            "code": {
-                "minLength": 1,
-                "maxLength": 20,
+            "afk_timeout": {
+                "type": "integer"
+            },
+            "allow_accessibility_detection": {
+                "type": "boolean"
+            },
+            "animate_emoji": {
+                "type": "boolean"
+            },
+            "animate_stickers": {
+                "type": "integer"
+            },
+            "contact_sync_enabled": {
+                "type": "boolean"
+            },
+            "convert_emoticons": {
+                "type": "boolean"
+            },
+            "custom_status": {
+                "anyOf": [
+                    {
+                        "$ref": "#/definitions/CustomStatus"
+                    },
+                    {
+                        "type": "null"
+                    }
+                ]
+            },
+            "default_guilds_restricted": {
+                "type": "boolean"
+            },
+            "detect_platform_accounts": {
+                "type": "boolean"
+            },
+            "developer_mode": {
+                "type": "boolean"
+            },
+            "disable_games_tab": {
+                "type": "boolean"
+            },
+            "enable_tts_command": {
+                "type": "boolean"
+            },
+            "explicit_content_filter": {
+                "type": "integer"
+            },
+            "friend_source_flags": {
+                "$ref": "#/definitions/FriendSourceFlags"
+            },
+            "gateway_connected": {
+                "type": "boolean"
+            },
+            "gif_auto_play": {
+                "type": "boolean"
+            },
+            "guild_folders": {
+                "type": "array",
+                "items": {
+                    "$ref": "#/definitions/GuildFolder"
+                }
+            },
+            "guild_positions": {
+                "type": "array",
+                "items": {
+                    "type": "string"
+                }
+            },
+            "inline_attachment_media": {
+                "type": "boolean"
+            },
+            "inline_embed_media": {
+                "type": "boolean"
+            },
+            "locale": {
+                "type": "string"
+            },
+            "message_display_compact": {
+                "type": "boolean"
+            },
+            "native_phone_integration_enabled": {
+                "type": "boolean"
+            },
+            "render_embeds": {
+                "type": "boolean"
+            },
+            "render_reactions": {
+                "type": "boolean"
+            },
+            "restricted_guilds": {
+                "type": "array",
+                "items": {
+                    "type": "string"
+                }
+            },
+            "show_current_game": {
+                "type": "boolean"
+            },
+            "status": {
+                "enum": [
+                    "dnd",
+                    "idle",
+                    "invisible",
+                    "offline",
+                    "online"
+                ],
+                "type": "string"
+            },
+            "stream_notifications_enabled": {
+                "type": "boolean"
+            },
+            "theme": {
+                "enum": [
+                    "dark",
+                    "light"
+                ],
                 "type": "string"
+            },
+            "timezone_offset": {
+                "type": "integer"
             }
         },
         "additionalProperties": false,
@@ -24369,55 +25665,16 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "VoiceIdentifySchema": {
+    "VanityUrlSchema": {
         "type": "object",
         "properties": {
-            "server_id": {
-                "type": "string"
-            },
-            "user_id": {
-                "type": "string"
-            },
-            "session_id": {
-                "type": "string"
-            },
-            "token": {
+            "code": {
+                "minLength": 1,
+                "maxLength": 20,
                 "type": "string"
-            },
-            "video": {
-                "type": "boolean"
-            },
-            "streams": {
-                "type": "array",
-                "items": {
-                    "type": "object",
-                    "properties": {
-                        "type": {
-                            "type": "string"
-                        },
-                        "rid": {
-                            "type": "string"
-                        },
-                        "quality": {
-                            "type": "integer"
-                        }
-                    },
-                    "additionalProperties": false,
-                    "required": [
-                        "quality",
-                        "rid",
-                        "type"
-                    ]
-                }
             }
         },
         "additionalProperties": false,
-        "required": [
-            "server_id",
-            "session_id",
-            "token",
-            "user_id"
-        ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
                 "enum": [
@@ -24997,39 +26254,54 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "VoiceStateUpdateSchema": {
+    "VoiceIdentifySchema": {
         "type": "object",
         "properties": {
-            "guild_id": {
+            "server_id": {
                 "type": "string"
             },
-            "channel_id": {
+            "user_id": {
                 "type": "string"
             },
-            "self_mute": {
-                "type": "boolean"
-            },
-            "self_deaf": {
-                "type": "boolean"
-            },
-            "self_video": {
-                "type": "boolean"
-            },
-            "preferred_region": {
+            "session_id": {
                 "type": "string"
             },
-            "request_to_speak_timestamp": {
-                "type": "string",
-                "format": "date-time"
+            "token": {
+                "type": "string"
             },
-            "suppress": {
+            "video": {
                 "type": "boolean"
+            },
+            "streams": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "properties": {
+                        "type": {
+                            "type": "string"
+                        },
+                        "rid": {
+                            "type": "string"
+                        },
+                        "quality": {
+                            "type": "integer"
+                        }
+                    },
+                    "additionalProperties": false,
+                    "required": [
+                        "quality",
+                        "rid",
+                        "type"
+                    ]
+                }
             }
         },
         "additionalProperties": false,
         "required": [
-            "self_deaf",
-            "self_mute"
+            "server_id",
+            "session_id",
+            "token",
+            "user_id"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -25610,94 +26882,39 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "VoiceVideoSchema": {
+    "VoiceStateUpdateSchema": {
         "type": "object",
         "properties": {
-            "audio_ssrc": {
-                "type": "integer"
+            "guild_id": {
+                "type": "string"
             },
-            "video_ssrc": {
-                "type": "integer"
+            "channel_id": {
+                "type": "string"
             },
-            "rtx_ssrc": {
-                "type": "integer"
+            "self_mute": {
+                "type": "boolean"
             },
-            "user_id": {
+            "self_deaf": {
+                "type": "boolean"
+            },
+            "self_video": {
+                "type": "boolean"
+            },
+            "preferred_region": {
                 "type": "string"
             },
-            "streams": {
-                "type": "array",
-                "items": {
-                    "type": "object",
-                    "properties": {
-                        "type": {
-                            "enum": [
-                                "audio",
-                                "video"
-                            ],
-                            "type": "string"
-                        },
-                        "rid": {
-                            "type": "string"
-                        },
-                        "ssrc": {
-                            "type": "integer"
-                        },
-                        "active": {
-                            "type": "boolean"
-                        },
-                        "quality": {
-                            "type": "integer"
-                        },
-                        "rtx_ssrc": {
-                            "type": "integer"
-                        },
-                        "max_bitrate": {
-                            "type": "integer"
-                        },
-                        "max_framerate": {
-                            "type": "integer"
-                        },
-                        "max_resolution": {
-                            "type": "object",
-                            "properties": {
-                                "type": {
-                                    "type": "string"
-                                },
-                                "width": {
-                                    "type": "integer"
-                                },
-                                "height": {
-                                    "type": "integer"
-                                }
-                            },
-                            "additionalProperties": false,
-                            "required": [
-                                "height",
-                                "type",
-                                "width"
-                            ]
-                        }
-                    },
-                    "additionalProperties": false,
-                    "required": [
-                        "active",
-                        "max_bitrate",
-                        "max_framerate",
-                        "max_resolution",
-                        "quality",
-                        "rid",
-                        "rtx_ssrc",
-                        "ssrc",
-                        "type"
-                    ]
-                }
+            "request_to_speak_timestamp": {
+                "type": "string",
+                "format": "date-time"
+            },
+            "suppress": {
+                "type": "boolean"
             }
         },
         "additionalProperties": false,
         "required": [
-            "audio_ssrc",
-            "video_ssrc"
+            "self_deaf",
+            "self_mute"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -26269,25 +27486,103 @@
                     "name": {
                         "type": "string"
                     },
-                    "ticket": {
-                        "type": "string"
-                    }
-                },
-                "additionalProperties": false
-            }
-        },
-        "$schema": "http://json-schema.org/draft-07/schema#"
-    },
-    "GenerateWebAuthnCredentialsSchema": {
-        "type": "object",
-        "properties": {
-            "password": {
-                "type": "string"
+                    "ticket": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false
+            }
+        },
+        "$schema": "http://json-schema.org/draft-07/schema#"
+    },
+    "VoiceVideoSchema": {
+        "type": "object",
+        "properties": {
+            "audio_ssrc": {
+                "type": "integer"
+            },
+            "video_ssrc": {
+                "type": "integer"
+            },
+            "rtx_ssrc": {
+                "type": "integer"
+            },
+            "user_id": {
+                "type": "string"
+            },
+            "streams": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "properties": {
+                        "type": {
+                            "enum": [
+                                "audio",
+                                "video"
+                            ],
+                            "type": "string"
+                        },
+                        "rid": {
+                            "type": "string"
+                        },
+                        "ssrc": {
+                            "type": "integer"
+                        },
+                        "active": {
+                            "type": "boolean"
+                        },
+                        "quality": {
+                            "type": "integer"
+                        },
+                        "rtx_ssrc": {
+                            "type": "integer"
+                        },
+                        "max_bitrate": {
+                            "type": "integer"
+                        },
+                        "max_framerate": {
+                            "type": "integer"
+                        },
+                        "max_resolution": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "additionalProperties": false,
+                            "required": [
+                                "height",
+                                "type",
+                                "width"
+                            ]
+                        }
+                    },
+                    "additionalProperties": false,
+                    "required": [
+                        "active",
+                        "max_bitrate",
+                        "max_framerate",
+                        "max_resolution",
+                        "quality",
+                        "rid",
+                        "rtx_ssrc",
+                        "ssrc",
+                        "type"
+                    ]
+                }
             }
         },
         "additionalProperties": false,
         "required": [
-            "password"
+            "audio_ssrc",
+            "video_ssrc"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -26868,24 +28163,16 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "CreateWebAuthnCredentialSchema": {
+    "GenerateWebAuthnCredentialsSchema": {
         "type": "object",
         "properties": {
-            "credential": {
-                "type": "string"
-            },
-            "name": {
-                "type": "string"
-            },
-            "ticket": {
+            "password": {
                 "type": "string"
             }
         },
         "additionalProperties": false,
         "required": [
-            "credential",
-            "name",
-            "ticket"
+            "password"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -27466,14 +28753,24 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "WebAuthnPostSchema": {
-        "anyOf": [
-            {
-                "$ref": "#/definitions/Partial<GenerateWebAuthnCredentialsSchema>"
+    "CreateWebAuthnCredentialSchema": {
+        "type": "object",
+        "properties": {
+            "credential": {
+                "type": "string"
             },
-            {
-                "$ref": "#/definitions/Partial<CreateWebAuthnCredentialSchema>"
+            "name": {
+                "type": "string"
+            },
+            "ticket": {
+                "type": "string"
             }
+        },
+        "additionalProperties": false,
+        "required": [
+            "credential",
+            "name",
+            "ticket"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -28054,20 +29351,14 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "WebAuthnTotpSchema": {
-        "type": "object",
-        "properties": {
-            "code": {
-                "type": "string"
+    "WebAuthnPostSchema": {
+        "anyOf": [
+            {
+                "$ref": "#/definitions/Partial<GenerateWebAuthnCredentialsSchema>"
             },
-            "ticket": {
-                "type": "string"
+            {
+                "$ref": "#/definitions/Partial<CreateWebAuthnCredentialSchema>"
             }
-        },
-        "additionalProperties": false,
-        "required": [
-            "code",
-            "ticket"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -28648,20 +29939,20 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "WebhookCreateSchema": {
+    "WebAuthnTotpSchema": {
         "type": "object",
         "properties": {
-            "name": {
-                "maxLength": 80,
+            "code": {
                 "type": "string"
             },
-            "avatar": {
+            "ticket": {
                 "type": "string"
             }
         },
         "additionalProperties": false,
         "required": [
-            "name"
+            "code",
+            "ticket"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -29242,20 +30533,20 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "WidgetModifySchema": {
+    "WebhookCreateSchema": {
         "type": "object",
         "properties": {
-            "enabled": {
-                "type": "boolean"
+            "name": {
+                "maxLength": 80,
+                "type": "string"
             },
-            "channel_id": {
+            "avatar": {
                 "type": "string"
             }
         },
         "additionalProperties": false,
         "required": [
-            "channel_id",
-            "enabled"
+            "name"
         ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
@@ -29836,125 +31127,21 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "MessageEditSchema": {
+    "WidgetModifySchema": {
         "type": "object",
         "properties": {
-            "file": {
-                "type": "object",
-                "properties": {
-                    "filename": {
-                        "type": "string"
-                    }
-                },
-                "additionalProperties": false,
-                "required": [
-                    "filename"
-                ]
-            },
-            "embed": {
-                "$ref": "#/definitions/Embed"
-            },
-            "flags": {
-                "type": "string"
-            },
-            "content": {
-                "type": "string"
-            },
-            "nonce": {
-                "type": "string"
-            },
-            "channel_id": {
-                "type": "string"
-            },
-            "tts": {
+            "enabled": {
                 "type": "boolean"
             },
-            "embeds": {
-                "type": "array",
-                "items": {
-                    "$ref": "#/definitions/Embed"
-                }
-            },
-            "allowed_mentions": {
-                "type": "object",
-                "properties": {
-                    "parse": {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        }
-                    },
-                    "roles": {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        }
-                    },
-                    "users": {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        }
-                    },
-                    "replied_user": {
-                        "type": "boolean"
-                    }
-                },
-                "additionalProperties": false
-            },
-            "message_reference": {
-                "type": "object",
-                "properties": {
-                    "message_id": {
-                        "type": "string"
-                    },
-                    "channel_id": {
-                        "type": "string"
-                    },
-                    "guild_id": {
-                        "type": "string"
-                    },
-                    "fail_if_not_exists": {
-                        "type": "boolean"
-                    }
-                },
-                "additionalProperties": false,
-                "required": [
-                    "channel_id",
-                    "message_id"
-                ]
-            },
-            "payload_json": {
+            "channel_id": {
                 "type": "string"
-            },
-            "attachments": {
-                "description": "TODO: we should create an interface for attachments\nTODO: OpenWAAO<-->attachment-style metadata conversion",
-                "type": "array",
-                "items": {
-                    "type": "object",
-                    "properties": {
-                        "id": {
-                            "type": "string"
-                        },
-                        "filename": {
-                            "type": "string"
-                        }
-                    },
-                    "additionalProperties": false,
-                    "required": [
-                        "filename",
-                        "id"
-                    ]
-                }
-            },
-            "sticker_ids": {
-                "type": "array",
-                "items": {
-                    "type": "string"
-                }
             }
         },
         "additionalProperties": false,
+        "required": [
+            "channel_id",
+            "enabled"
+        ],
         "definitions": {
             "ChannelPermissionOverwriteType": {
                 "enum": [
diff --git a/src/api/middlewares/Authentication.ts b/src/api/middlewares/Authentication.ts
index f4c33963..771f0de8 100644
--- a/src/api/middlewares/Authentication.ts
+++ b/src/api/middlewares/Authentication.ts
@@ -29,6 +29,8 @@ export const NO_AUTHORIZATION_ROUTES = [
 	"/auth/mfa/totp",
 	"/auth/mfa/webauthn",
 	"/auth/verify",
+	"/auth/forgot",
+	"/auth/reset",
 	// Routes with a seperate auth system
 	"/webhooks/",
 	// Public information endpoints
diff --git a/src/api/routes/auth/forgot.ts b/src/api/routes/auth/forgot.ts
new file mode 100644
index 00000000..faa43dbb
--- /dev/null
+++ b/src/api/routes/auth/forgot.ts
@@ -0,0 +1,92 @@
+import { getIpAdress, route, verifyCaptcha } from "@fosscord/api";
+import {
+	Config,
+	Email,
+	FieldErrors,
+	ForgotPasswordSchema,
+	User,
+} from "@fosscord/util";
+import { Request, Response, Router } from "express";
+import { HTTPError } from "lambert-server";
+const router = Router();
+
+router.post(
+	"/",
+	route({ body: "ForgotPasswordSchema" }),
+	async (req: Request, res: Response) => {
+		const { login, captcha_key } = req.body as ForgotPasswordSchema;
+
+		const config = Config.get();
+
+		if (
+			config.password_reset.requireCaptcha &&
+			config.security.captcha.enabled
+		) {
+			const { sitekey, service } = config.security.captcha;
+			if (!captcha_key) {
+				return res.status(400).json({
+					captcha_key: ["captcha-required"],
+					captcha_sitekey: sitekey,
+					captcha_service: service,
+				});
+			}
+
+			const ip = getIpAdress(req);
+			const verify = await verifyCaptcha(captcha_key, ip);
+			if (!verify.success) {
+				return res.status(400).json({
+					captcha_key: verify["error-codes"],
+					captcha_sitekey: sitekey,
+					captcha_service: service,
+				});
+			}
+		}
+
+		const user = await User.findOneOrFail({
+			where: [{ phone: login }, { email: login }],
+			select: ["username", "id", "disabled", "deleted", "email"],
+			relations: ["security_keys"],
+		}).catch(() => {
+			throw FieldErrors({
+				login: {
+					message: req.t("auth:password_reset.EMAIL_DOES_NOT_EXIST"),
+					code: "EMAIL_DOES_NOT_EXIST",
+				},
+			});
+		});
+
+		if (!user.email)
+			throw FieldErrors({
+				login: {
+					message:
+						"This account does not have an email address associated with it.",
+					code: "NO_EMAIL",
+				},
+			});
+
+		if (user.deleted)
+			return res.status(400).json({
+				message: "This account is scheduled for deletion.",
+				code: 20011,
+			});
+
+		if (user.disabled)
+			return res.status(400).json({
+				message: req.t("auth:login.ACCOUNT_DISABLED"),
+				code: 20013,
+			});
+
+		return await Email.sendResetPassword(user, user.email)
+			.then(() => {
+				return res.sendStatus(204);
+			})
+			.catch((e) => {
+				console.error(
+					`Failed to send password reset email to ${user.username}#${user.discriminator}: ${e}`,
+				);
+				throw new HTTPError("Failed to send password reset email", 500);
+			});
+	},
+);
+
+export default router;
diff --git a/src/api/routes/auth/reset.ts b/src/api/routes/auth/reset.ts
new file mode 100644
index 00000000..94053e1a
--- /dev/null
+++ b/src/api/routes/auth/reset.ts
@@ -0,0 +1,57 @@
+import { route } from "@fosscord/api";
+import {
+	checkToken,
+	Config,
+	Email,
+	FieldErrors,
+	generateToken,
+	PasswordResetSchema,
+	User,
+} from "@fosscord/util";
+import bcrypt from "bcrypt";
+import { Request, Response, Router } from "express";
+import { HTTPError } from "lambert-server";
+
+const router = Router();
+
+router.post(
+	"/",
+	route({ body: "PasswordResetSchema" }),
+	async (req: Request, res: Response) => {
+		const { password, token } = req.body as PasswordResetSchema;
+
+		try {
+			const { jwtSecret } = Config.get().security;
+			const { user } = await checkToken(token, jwtSecret, true);
+
+			// the salt is saved in the password refer to bcrypt docs
+			const hash = await bcrypt.hash(password, 12);
+
+			const data = {
+				data: {
+					hash,
+					valid_tokens_since: new Date(),
+				},
+			};
+			await User.update({ id: user.id }, data);
+
+			// come on, the user has to have an email to reset their password in the first place
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			await Email.sendPasswordChanged(user, user.email!);
+
+			res.json({ token: await generateToken(user.id) });
+		} catch (e) {
+			if ((e as Error).toString() === "Invalid Token")
+				throw FieldErrors({
+					password: {
+						message: req.t("auth:password_reset.INVALID_TOKEN"),
+						code: "INVALID_TOKEN",
+					},
+				});
+
+			throw new HTTPError((e as Error).toString(), 400);
+		}
+	},
+);
+
+export default router;
diff --git a/src/api/routes/auth/verify/resend.ts b/src/api/routes/auth/verify/resend.ts
index 1cd14f23..918af9a1 100644
--- a/src/api/routes/auth/verify/resend.ts
+++ b/src/api/routes/auth/verify/resend.ts
@@ -36,7 +36,7 @@ router.post(
 			throw new HTTPError("User does not have an email address", 400);
 		}
 
-		await Email.sendVerificationEmail(user, user.email)
+		await Email.sendVerifyEmail(user, user.email)
 			.then(() => {
 				return res.sendStatus(204);
 			})
diff --git a/src/util/config/Config.ts b/src/util/config/Config.ts
index d6f804bf..c056d454 100644
--- a/src/util/config/Config.ts
+++ b/src/util/config/Config.ts
@@ -31,6 +31,7 @@ import {
 	LimitsConfiguration,
 	LoginConfiguration,
 	MetricsConfiguration,
+	PasswordResetConfiguration,
 	RabbitMQConfiguration,
 	RegionConfiguration,
 	RegisterConfiguration,
@@ -60,4 +61,6 @@ export class ConfigValue {
 	defaults: DefaultsConfiguration = new DefaultsConfiguration();
 	external: ExternalTokensConfiguration = new ExternalTokensConfiguration();
 	email: EmailConfiguration = new EmailConfiguration();
+	password_reset: PasswordResetConfiguration =
+		new PasswordResetConfiguration();
 }
diff --git a/src/util/config/types/PasswordResetConfiguration.ts b/src/util/config/types/PasswordResetConfiguration.ts
new file mode 100644
index 00000000..806d77be
--- /dev/null
+++ b/src/util/config/types/PasswordResetConfiguration.ts
@@ -0,0 +1,21 @@
+/*
+	Fosscord: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Fosscord and Fosscord Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+export class PasswordResetConfiguration {
+	requireCaptcha: boolean = false;
+}
diff --git a/src/util/config/types/index.ts b/src/util/config/types/index.ts
index 1431c128..510e19f8 100644
--- a/src/util/config/types/index.ts
+++ b/src/util/config/types/index.ts
@@ -30,6 +30,7 @@ export * from "./KafkaConfiguration";
 export * from "./LimitConfigurations";
 export * from "./LoginConfiguration";
 export * from "./MetricsConfiguration";
+export * from "./PasswordResetConfiguration";
 export * from "./RabbitMQConfiguration";
 export * from "./RegionConfiguration";
 export * from "./RegisterConfiguration";
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts
index 2947b205..f99a85e7 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -393,7 +393,7 @@ export class User extends BaseClass {
 
 		// send verification email if users aren't verified by default and we have an email
 		if (!Config.get().defaults.user.verified && email) {
-			await Email.sendVerificationEmail(user, email).catch((e) => {
+			await Email.sendVerifyEmail(user, email).catch((e) => {
 				console.error(
 					`Failed to send verification email to ${user.username}#${user.discriminator}: ${e}`,
 				);
diff --git a/src/util/schemas/ForgotPasswordSchema.ts b/src/util/schemas/ForgotPasswordSchema.ts
new file mode 100644
index 00000000..9a28bd18
--- /dev/null
+++ b/src/util/schemas/ForgotPasswordSchema.ts
@@ -0,0 +1,22 @@
+/*
+	Fosscord: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Fosscord and Fosscord Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+export interface ForgotPasswordSchema {
+	login: string;
+	captcha_key?: string;
+}
diff --git a/src/util/schemas/PasswordResetSchema.ts b/src/util/schemas/PasswordResetSchema.ts
new file mode 100644
index 00000000..9cc74940
--- /dev/null
+++ b/src/util/schemas/PasswordResetSchema.ts
@@ -0,0 +1,22 @@
+/*
+	Fosscord: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Fosscord and Fosscord Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+export interface PasswordResetSchema {
+	password: string;
+	token: string;
+}
diff --git a/src/util/schemas/index.ts b/src/util/schemas/index.ts
index 194d8571..44909a3a 100644
--- a/src/util/schemas/index.ts
+++ b/src/util/schemas/index.ts
@@ -16,6 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+export * from "./AckBulkSchema";
 export * from "./ActivitySchema";
 export * from "./ApplicationAuthorizeSchema";
 export * from "./ApplicationCreateSchema";
@@ -32,6 +33,7 @@ export * from "./CodesVerificationSchema";
 export * from "./DmChannelCreateSchema";
 export * from "./EmojiCreateSchema";
 export * from "./EmojiModifySchema";
+export * from "./ForgotPasswordSchema";
 export * from "./GatewayPayloadSchema";
 export * from "./GuildCreateSchema";
 export * from "./GuildTemplateCreateSchema";
@@ -45,8 +47,10 @@ export * from "./MemberChangeProfileSchema";
 export * from "./MemberChangeSchema";
 export * from "./MessageAcknowledgeSchema";
 export * from "./MessageCreateSchema";
+export * from "./MessageEditSchema";
 export * from "./MfaCodesSchema";
 export * from "./ModifyGuildStickerSchema";
+export * from "./PasswordResetSchema";
 export * from "./PurgeSchema";
 export * from "./RegisterSchema";
 export * from "./RelationshipPostSchema";
@@ -69,22 +73,6 @@ export * from "./VanityUrlSchema";
 export * from "./VoiceIdentifySchema";
 export * from "./VoiceStateUpdateSchema";
 export * from "./VoiceVideoSchema";
-export * from "./IdentifySchema";
-export * from "./ActivitySchema";
-export * from "./LazyRequestSchema";
-export * from "./GuildUpdateSchema";
-export * from "./ChannelPermissionOverwriteSchema";
-export * from "./UserGuildSettingsSchema";
-export * from "./GatewayPayloadSchema";
-export * from "./RolePositionUpdateSchema";
-export * from "./ChannelReorderSchema";
-export * from "./UserSettingsSchema";
-export * from "./BotModifySchema";
-export * from "./ApplicationModifySchema";
-export * from "./ApplicationCreateSchema";
-export * from "./ApplicationAuthorizeSchema";
-export * from "./AckBulkSchema";
 export * from "./WebAuthnSchema";
 export * from "./WebhookCreateSchema";
 export * from "./WidgetModifySchema";
-export * from "./MessageEditSchema";
diff --git a/src/util/util/Email.ts b/src/util/util/Email.ts
index 3028b063..fa72d9c0 100644
--- a/src/util/util/Email.ts
+++ b/src/util/util/Email.ts
@@ -194,8 +194,14 @@ const transporters = {
 export const Email: {
 	transporter: Transporter | null;
 	init: () => Promise<void>;
-	generateVerificationLink: (id: string, email: string) => Promise<string>;
-	sendVerificationEmail: (
+	generateLink: (
+		type: "verify" | "reset",
+		id: string,
+		email: string,
+	) => Promise<string>;
+	sendVerifyEmail: (user: User, email: string) => Promise<SentMessageInfo>;
+	sendResetPassword: (user: User, email: string) => Promise<SentMessageInfo>;
+	sendPasswordChanged: (
 		user: User,
 		email: string,
 	) => Promise<SentMessageInfo>;
@@ -231,10 +237,10 @@ export const Email: {
 	 * Replaces all placeholders in an email template with the correct values
 	 */
 	doReplacements: function (
-		template: string,
-		user: User,
-		emailVerificationUrl?: string,
-		passwordResetUrl?: string,
+		template,
+		user,
+		emailVerificationUrl?,
+		passwordResetUrl?,
 		ipInfo?: {
 			ip: string;
 			city: string;
@@ -285,23 +291,22 @@ export const Email: {
 	 *
 	 * @param id user id
 	 * @param email user email
-	 * @returns a verification link for the user
 	 */
-	generateVerificationLink: async function (id: string, email: string) {
+	generateLink: async function (type, id, email) {
 		const token = (await generateToken(id, email)) as string;
 		const instanceUrl =
 			Config.get().general.frontPage || "http://localhost:3001";
-		const link = `${instanceUrl}/verify#token=${token}`;
+		const link = `${instanceUrl}/${type}#token=${token}`;
 		return link;
 	},
-	sendVerificationEmail: async function (user: User, email: string) {
+	/**
+	 * Sends an email to the user with a link to verify their email address
+	 */
+	sendVerifyEmail: async function (user, email) {
 		if (!this.transporter) return;
 
 		// generate a verification link for the user
-		const verificationLink = await this.generateVerificationLink(
-			user.id,
-			email,
-		);
+		const link = await this.generateLink("verify", user.id, email);
 
 		// load the email template
 		const rawTemplate = fs.readFileSync(
@@ -314,7 +319,78 @@ export const Email: {
 		);
 
 		// replace email template placeholders
-		const html = this.doReplacements(rawTemplate, user, verificationLink);
+		const html = this.doReplacements(rawTemplate, user, link);
+
+		// extract the title from the email template to use as the email subject
+		const subject = html.match(/<title>(.*)<\/title>/)?.[1] || "";
+
+		// construct the email
+		const message = {
+			from:
+				Config.get().general.correspondenceEmail || "noreply@localhost",
+			to: email,
+			subject,
+			html,
+		};
+
+		// send the email
+		return this.transporter.sendMail(message);
+	},
+	/**
+	 * Sends an email to the user with a link to reset their password
+	 */
+	sendResetPassword: async function (user, email) {
+		if (!this.transporter) return;
+
+		// generate a password reset link for the user
+		const link = await this.generateLink("reset", user.id, email);
+
+		// load the email template
+		const rawTemplate = fs.readFileSync(
+			path.join(
+				ASSET_FOLDER_PATH,
+				"email_templates",
+				"password_reset_request.html",
+			),
+			{ encoding: "utf-8" },
+		);
+
+		// replace email template placeholders
+		const html = this.doReplacements(rawTemplate, user, undefined, link);
+
+		// extract the title from the email template to use as the email subject
+		const subject = html.match(/<title>(.*)<\/title>/)?.[1] || "";
+
+		// construct the email
+		const message = {
+			from:
+				Config.get().general.correspondenceEmail || "noreply@localhost",
+			to: email,
+			subject,
+			html,
+		};
+
+		// send the email
+		return this.transporter.sendMail(message);
+	},
+	/**
+	 * Sends an email to the user notifying them that their password has been changed
+	 */
+	sendPasswordChanged: async function (user, email) {
+		if (!this.transporter) return;
+
+		// load the email template
+		const rawTemplate = fs.readFileSync(
+			path.join(
+				ASSET_FOLDER_PATH,
+				"email_templates",
+				"password_changed.html",
+			),
+			{ encoding: "utf-8" },
+		);
+
+		// replace email template placeholders
+		const html = this.doReplacements(rawTemplate, user);
 
 		// extract the title from the email template to use as the email subject
 		const subject = html.match(/<title>(.*)<\/title>/)?.[1] || "";
diff --git a/src/util/util/Token.ts b/src/util/util/Token.ts
index e7b2006d..ffc442aa 100644
--- a/src/util/util/Token.ts
+++ b/src/util/util/Token.ts
@@ -38,6 +38,15 @@ async function checkEmailToken(
 			where: {
 				email: decoded.email,
 			},
+			select: [
+				"email",
+				"id",
+				"verified",
+				"deleted",
+				"disabled",
+				"username",
+				"data",
+			],
 		});
 
 		if (!user) return rej("Invalid Token");
-- 
cgit 1.5.1