From 0ff1daeaff31e7fc384d571e8f3eca94c32da84e Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Sun, 30 May 2021 20:24:45 +0200
Subject: [PATCH] :sparkles: Relationship types

---
 package-lock.json   | Bin 39064 -> 39066 bytes
 package.json        |   2 +-
 src/models/Event.ts |  19 +++++++++++++++++--
 src/models/User.ts  |  13 +++++++++----
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 529af71118f74b49045da25907fa6ad8dab81689..fb6be82b5f86f953eb616eb29d672b0d01993a75 100644
GIT binary patch
delta 272
zcmbQSk!jXOrU}Pb-2;5Wj3*zImz^xj#=h~bBO{~bW__j@4Mxk!g_`=4`^rRttczOm
zVTO6Z&fe+4rFm6(`pyyM>HgvANdX?A;r{-n{%Nj3$)*0`p24|=DQ1QSS$PJ<7EYm-
z-X<32mYH5*iAja&1pxs`j%FGD=0)x%7O92WY3{Br#=hy3<INN&R~S2NUaq~}3*F98
dn%Ft{e2mQGGGnL7%e5^gFQ{hQyruk!0swC8Tu}f3

delta 256
zcmbQWk!i+8rU}QGJ%gPm8!F09mS<z%_}-C`(PFb9Q;Y_q#pJ{?7a%#&N+HxG%d5=O
z+&DbT-_Nitu^>6A(#gfxG2c=@%+EN)J2KKjKQO}5H6W?j$jCd<Ik+g$v?wCqG%6~^
z#H1wL%eXwp*exfo$Sq3SyE3%I&%;dHFe)H$a-x~y<SJu_%`3IHdm&pFLJR9A3q;6F
Rt}u3*yi(g@^M>+Q3IJXUQ^)`S

diff --git a/package.json b/package.json
index 81e908d6..afcc6766 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
 		"env-paths": "^2.2.1",
 		"jsonwebtoken": "^8.5.1",
 		"missing-native-js-functions": "^1.2.2",
-		"mongodb": "^3.6.8",
+		"mongodb": "^3.6.9",
 		"mongoose": "^5.12.3",
 		"mongoose-autopopulate": "^0.12.3",
 		"typescript": "^4.1.3"
diff --git a/src/models/Event.ts b/src/models/Event.ts
index 635adc46..8c692be1 100644
--- a/src/models/Event.ts
+++ b/src/models/Event.ts
@@ -1,4 +1,4 @@
-import { ConnectedAccount, PublicUser, User, UserSettings } from "./User";
+import { ConnectedAccount, PublicUser, Relationship, User, UserSettings } from "./User";
 import { DMChannel, Channel } from "./Channel";
 import { Guild } from "./Guild";
 import { Member, PublicMember, UserGuildSettings } from "./Member";
@@ -49,7 +49,7 @@ export interface ReadyEventData {
 	user: PublicUser & {
 		mobile: boolean;
 		desktop: boolean;
-		email: string | null ;
+		email: string | null;
 		flags: bigint;
 		mfa_enabled: boolean;
 		nsfw_allowed: boolean;
@@ -431,6 +431,19 @@ export interface MessageAckEvent extends Event {
 	};
 }
 
+export interface RelationshipAddEvent extends Event {
+	event: "RELATIONSHIP_ADD";
+	data: Relationship & {
+		should_notify?: boolean;
+		user: PublicUser;
+	};
+}
+
+export interface RelationshipRemoveEvent extends Event {
+	event: "RELATIONSHIP_REMOVE";
+	data: Omit<Relationship, "nickname">;
+}
+
 // located in collection events
 
 export enum EVENTEnum {
@@ -520,6 +533,8 @@ export type EVENT =
 	| "APPLICATION_COMMAND_UPDATE"
 	| "APPLICATION_COMMAND_DELETE"
 	| "MESSAGE_ACK"
+	| "RELATIONSHIP_ADD"
+	| "RELATIONSHIP_REMOVE"
 	| CUSTOMEVENTS;
 
 export type CUSTOMEVENTS = "INVALIDATED";
diff --git a/src/models/User.ts b/src/models/User.ts
index 76922903..31f91a4b 100644
--- a/src/models/User.ts
+++ b/src/models/User.ts
@@ -80,8 +80,14 @@ export interface ConnectedAccount {
 export interface Relationship {
 	id: string;
 	nickname?: string;
-	type: number;
-	user_id: string;
+	type: RelationshipType;
+}
+
+export enum RelationshipType {
+	outgoing = 4,
+	incoming = 3,
+	blocked = 2,
+	friends = 1,
 }
 
 export interface UserSettings {
@@ -158,10 +164,9 @@ export const UserSchema = new Schema({
 		valid_tokens_since: Date, // all tokens with a previous issue date are invalid
 		relationships: [
 			{
-				id: String,
+				id: { type: String, required: true },
 				nickname: String,
 				type: { type: Number },
-				user_id: String,
 			},
 		],
 		connected_accounts: [