Merge branch 'guild-settings' into guild-joining

types/interfaces.ts

@@ -44,7 +44,8 @@ export interface MessageResponse {
 	channel_uuid: string,
 	user_uuid: string,
 	message: string,
-	user: UserResponse
+	reply_to: string | null,
+	user: UserResponse,
 }
 
 export interface InviteResponse {
@@ -58,9 +59,12 @@ export interface UserResponse {
 	username: string,
 	display_name: string | null,
 	avatar: string | null,
+	pronouns: string | null,
+	about: string | null,
 	email?: string,
-	email_verified?: boolean
-  }
+	email_verified?: boolean,
+	friends_since: string | null,
+}
 
 export interface StatsResponse {
 	accounts: number,
@@ -94,3 +98,8 @@ export interface ModalProps {
 	onClose?: () => void,
 	onCancel?: () => void
 }
+
+export interface ContextMenuItem {
+	name: string,
+	callback: (...args: any[]) => any;
+}