From be238a89b9e31986d33432dcc5b78924931b4148 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Sun, 29 Aug 2021 16:58:46 +0200
Subject: [PATCH] fix login register + message

---
 api/package-lock.json           | Bin 745991 -> 746104 bytes
 api/package.json                |   4 ++--
 api/src/routes/auth/login.ts    |   2 +-
 api/src/routes/auth/register.ts |  18 +++++++++++++++---
 api/src/schema/Message.ts       |   4 ++--
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/api/package-lock.json b/api/package-lock.json
index bff4e940a650cbd1c7c3030556b7237df0d274a3..1b673d4a0c582577bf250172bdb261d7dc86e6a5 100644
GIT binary patch
delta 650
zcmZoaqWj~B?gn9ICPRbi@24?qu^8zY8g6!CzQr>650f~G==8)1Y%0@d=CH~06r?Lz
zDJaER=$Y#oPT!Ejwy;@_vt5pp5r~<#%W*QN^h__v;xw4fWzMNGT}gmZG1SS!Js`Ir
zv?wS$$IZ(lpwytu(b2-sDYd-BHO0g;!ot8Us36QFFT%3QBHJS*G}5CmFVZ95DK*qJ
zJU=wI!ZFn?uq-e!)zGmb+cYRJA}BE1B+PF*<2`1@>Dkkm*D(W~J^f-3lkD`o8O&VM
zyDT`jOg~`3q&Gdol9P9`e3<m~13Q>mwg=2$RyCjQY|XAeeL)td{q)5rITb=fEzLcP
zll`20Ov2MG6H_9yT%AHp%si3|d{RtP0zxdxl2XduBD6#Ns@#j*0-cjh!VB}=9i#F~
z6Mg*L%0mk)s;WGqEM3CVO)X3F%JTv%Q$0Ncr#sGMk!mlxzzoDJ+lwx+-knWsfVKkz
v6o}ckZ^+@$K1H8^Y`nlFGkw1~=X!AbFE6y<G@?r|wTEPLZV$=k+WZXw?Ah0$

delta 565
zcmexyM7RBj?gn9IMvLhSbJ%nl4K_P7-(s1*GKWo-(O~-d95(0a?rT_8n(uS8-{)Wi
zVy5l)Ihb$uOtzh<KfThNQ)POS1gk<=S*E^sseWK-N~CtUXNtSOWm2+1p-);^Mp~(t
zTX;map>}FXYH>igVOhA5WpO}KZfcp2kC|tATA6c6xwgJ<WmS-)myds?vr}52v7tet
znT57dVBq9~i{+;;n#R1I(QvxqD^|JbXXY?-ZLglrY-};z%bZhx`rY%)_S2j1vMYoZ
z7i#A_mg_qk`<H}PdgmAT`1z;lYlm8xM*3BlrzDxBRhs67rMZWB=eVaNhgp<F7@4?d
z`3GkwN2NMD<~e$1`MT!i1UiL>6d9U(MI;*gdu16JwNJdj48$zkCthIvJ{u!YCg0~M
zZQq~E2E^>!_vdnSokR_lP@06w^ul$Va?_VgV_wT_sAsYKkp-s_eFEcXHs|)E*<72y
F0RT9Z$EpAT

diff --git a/api/package.json b/api/package.json
index 1310d577..eef2d069 100644
--- a/api/package.json
+++ b/api/package.json
@@ -74,8 +74,8 @@
 		"i18next-http-middleware": "^3.1.3",
 		"i18next-node-fs-backend": "^2.1.3",
 		"jsonwebtoken": "^8.5.1",
-		"lambert-server": "^1.2.8",
-		"missing-native-js-functions": "^1.2.10",
+		"lambert-server": "^1.2.10",
+		"missing-native-js-functions": "^1.2.11",
 		"mongoose": "^5.12.3",
 		"mongoose-autopopulate": "^0.12.3",
 		"mongoose-long": "^0.3.2",
diff --git a/api/src/routes/auth/login.ts b/api/src/routes/auth/login.ts
index c0acad4e..7fd0f870 100644
--- a/api/src/routes/auth/login.ts
+++ b/api/src/routes/auth/login.ts
@@ -21,7 +21,7 @@ router.post(
 	async (req: Request, res: Response) => {
 		const { login, password, captcha_key, undelete } = req.body;
 		const email = adjustEmail(login);
-		console.log(req.body, email);
+		console.log("login", email);
 
 		const config = Config.get();
 
diff --git a/api/src/routes/auth/register.ts b/api/src/routes/auth/register.ts
index 5ad6d6a4..b0d8c9bd 100644
--- a/api/src/routes/auth/register.ts
+++ b/api/src/routes/auth/register.ts
@@ -1,5 +1,5 @@
 import { Request, Response, Router } from "express";
-import { trimSpecial, User, Snowflake, Config } from "@fosscord/util";
+import { trimSpecial, User, Snowflake, Config, defaultSettings } from "@fosscord/util";
 import bcrypt from "bcrypt";
 import { check, Email, EMAIL_REGEX, FieldErrors, Length } from "../../util/instanceOf";
 import "missing-native-js-functions";
@@ -182,17 +182,29 @@ router.post(
 		// if nsfw_allowed is null/undefined it'll require date_of_birth to set it to true/false
 
 		const user = await new User({
+			created_at: new Date(),
 			username: adjusted_username,
 			discriminator,
+			bot: false,
+			system: false,
+			desktop: false,
+			mobile: false,
 			premium: true,
 			premium_type: 2,
+			bio: "",
+			mfa_enabled: false,
+			verified: false,
+			disabled: false,
+			deleted: false,
 			email: adjusted_email,
 			nsfw_allowed: true, // TODO: depending on age
-			guilds: [],
+			public_flags: "0",
+			flags: "0", // TODO: generate
 			data: {
 				hash: adjusted_password,
 				valid_tokens_since: new Date()
-			}
+			},
+			settings: defaultSettings
 		}).save();
 
 		return res.json({ token: await generateToken(user.id) });
diff --git a/api/src/schema/Message.ts b/api/src/schema/Message.ts
index f9bfcc67..bf10c037 100644
--- a/api/src/schema/Message.ts
+++ b/api/src/schema/Message.ts
@@ -11,7 +11,7 @@ export const MessageCreateSchema = {
 	$content: new Length(String, 0, 2000),
 	$nonce: String,
 	$tts: Boolean,
-	$flags: BigInt,
+	$flags: String,
 	$embed: {
 		$title: new Length(String, 0, 256), //title of embed
 		$type: String, // type of embed (always "rich" for webhook embeds)
@@ -69,7 +69,7 @@ export interface MessageCreateSchema {
 	content?: string;
 	nonce?: string;
 	tts?: boolean;
-	flags?: bigint;
+	flags?: string;
 	embed?: Embed & { timestamp?: string };
 	allowed_mentions?: {
 		parse?: string[];