From d08689b4180c2a66382ca9a6174b1c177076a65f Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Tue, 5 Apr 2022 19:58:34 +1000
Subject: User Notes (#707)

* Notes implementation.
Bug: Client does not save note locally after uploading to server. Client does save after reloading page. Is this due to the response being sent by PUT?

* I don't know why the client doesn't do optimistic UI updates with this, or any updates at all without reloading the page

* Added USER_NOTE_UPDATE event, thanks @TheRealGeoDash2019 !
---
 util/src/entities/User.ts | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'util/src/entities/User.ts')

diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts
index ed7bd4ce..7091ee24 100644
--- a/util/src/entities/User.ts
+++ b/util/src/entities/User.ts
@@ -164,6 +164,9 @@ export class User extends BaseClass {
 	@Column({ type: "simple-json", select: false })
 	settings: UserSettings;
 
+	@Column({ type: "simple-json" })
+	notes: { [key: string]: string };	//key is ID of user
+
 	toPublicUser() {
 		const user: any = {};
 		PublicUserProjection.forEach((x) => {
@@ -271,6 +274,7 @@ export class User extends BaseClass {
 			},
 			settings: { ...defaultSettings, locale: language },
 			fingerprints: [],
+			notes: {},
 		});
 
 		await user.save();
-- 
cgit 1.5.1


From 66609ec5f49ad0fa3522a9ff0f340b7f61dcd9c8 Mon Sep 17 00:00:00 2001
From: Erkin Alp Güney <erkinalp9035@gmail.com>
Date: Sat, 9 Apr 2022 13:46:50 +0300
Subject: Update User.ts

---
 util/src/entities/User.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'util/src/entities/User.ts')

diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts
index 7091ee24..42d926b2 100644
--- a/util/src/entities/User.ts
+++ b/util/src/entities/User.ts
@@ -60,7 +60,7 @@ export class User extends BaseClass {
 	username: string; // username max length 32, min 2 (should be configurable)
 
 	@Column()
-	discriminator: string; // #0001 4 digit long string from #0001 - #9999
+	discriminator: string; // opaque string: 4 digits on discord.com
 
 	setDiscriminator(val: string) {
 		const number = Number(val);
@@ -88,10 +88,10 @@ export class User extends BaseClass {
 	mobile: boolean; // if the user has mobile app installed
 
 	@Column()
-	premium: boolean; // if user bought nitro
-
+	premium: boolean; // if user bought individual premium
+	
 	@Column()
-	premium_type: number; // nitro level
+	premium_type: number; // individual premium level
 
 	@Column()
 	bot: boolean; // if user is bot
@@ -100,11 +100,11 @@ export class User extends BaseClass {
 	bio: string; // short description of the user (max 190 chars -> should be configurable)
 
 	@Column()
-	system: boolean; // shouldn't be used, the api sents this field type true, if the generated message comes from a system generated author
+	system: boolean; // shouldn't be used, the api sends this field type true, if the generated message comes from a system generated author
 
 	@Column({ select: false })
-	nsfw_allowed: boolean; // if the user is older than 18 (resp. Config)
-
+	nsfw_allowed: boolean; // if the user can do age-restricted actions (NSFW channels/guilds/commands)
+	
 	@Column({ select: false })
 	mfa_enabled: boolean; // if multi factor authentication is enabled
 
-- 
cgit 1.5.1


From 467f2d6ed934543360c4381e0e7052996773b909 Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Sat, 9 Apr 2022 23:53:57 +1000
Subject: Resolves #715

---
 util/src/entities/User.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util/src/entities/User.ts')

diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts
index 42d926b2..a5c4c136 100644
--- a/util/src/entities/User.ts
+++ b/util/src/entities/User.ts
@@ -132,7 +132,7 @@ export class User extends BaseClass {
 	@Column()
 	public_flags: number;
 
-	@Column()
+	@Column({ type: "bigint" })
 	rights: string; // Rights
 
 	@OneToMany(() => Session, (session: Session) => session.user)
-- 
cgit 1.5.1