summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-02-12 15:13:02 +0100
committerFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-02-12 15:13:02 +0100
commitf572c7142b070533e874be048a1b43f568bb334e (patch)
tree138dfde3a1b6f00d95b2c2578de2392b84d21e56
parent:bug: fix export (diff)
downloadserver-f572c7142b070533e874be048a1b43f568bb334e.tar.xz
move guild arrays into seperate collections
-rw-r--r--dist/models/Activity.d.ts2
-rw-r--r--dist/models/Event.d.ts2
-rw-r--r--dist/models/Guild.d.ts7
-rw-r--r--dist/models/User.d.ts7
-rw-r--r--src/models/Activity.ts2
-rw-r--r--src/models/Event.ts2
-rw-r--r--src/models/Guild.ts7
-rw-r--r--src/models/User.ts8
8 files changed, 22 insertions, 15 deletions
diff --git a/dist/models/Activity.d.ts b/dist/models/Activity.d.ts

index 65e9d202..72c4a890 100644 --- a/dist/models/Activity.d.ts +++ b/dist/models/Activity.d.ts
@@ -2,7 +2,7 @@ import { User } from ".."; import { ClientStatus, Status } from "./Status"; export interface Presence { user: User; - guild_id: bigint; + guild_id?: bigint; status: Status; activities: Activity[]; client_status: ClientStatus; diff --git a/dist/models/Event.d.ts b/dist/models/Event.d.ts
index 693c1b5a..51bca8e3 100644 --- a/dist/models/Event.d.ts +++ b/dist/models/Event.d.ts
@@ -14,7 +14,7 @@ export interface Event { guild_id?: bigint; user_id?: bigint; channel_id?: bigint; - created_at: number; + created_at?: number; event: EVENT; data?: any; } diff --git a/dist/models/Guild.d.ts b/dist/models/Guild.d.ts
index 324fc27b..43bd6311 100644 --- a/dist/models/Guild.d.ts +++ b/dist/models/Guild.d.ts
@@ -1,13 +1,9 @@ -import { GuildChannel } from "./Channel"; import { Emoji } from "./Emoji"; -import { Member } from "./Member"; -import { Role } from "./Role"; export interface Guild { afk_channel_id?: bigint; afk_timeout?: number; application_id?: bigint; banner?: string; - channels: GuildChannel[]; default_message_notifications?: number; description?: string; discovery_splash?: string; @@ -22,17 +18,14 @@ export interface Guild { max_video_channel_users?: number; member_count?: number; presence_count?: number; - members?: Member[]; mfa_level?: number; name: string; owner_id: bigint; preferred_locale?: string; premium_subscription_count?: number; premium_tier?: number; - presences: []; public_updates_channel_id?: bigint; region?: string; - roles: Role[]; rules_channel_id?: bigint; splash?: string; system_channel_flags?: number; diff --git a/dist/models/User.d.ts b/dist/models/User.d.ts
index fad4ccfd..c23c0118 100644 --- a/dist/models/User.d.ts +++ b/dist/models/User.d.ts
@@ -1,3 +1,5 @@ +import { Activity } from "./Activity"; +import { ClientStatus, Status } from "./Status"; export interface User { id: bigint; username: string; @@ -23,6 +25,11 @@ export interface User { user_settings: UserSettings; relationships: Relationship[]; connected_accounts: ConnectedAccount[]; + presence: { + status: Status; + activities: Activity[]; + client_status: ClientStatus; + }; } export interface PublicUser { id: bigint; diff --git a/src/models/Activity.ts b/src/models/Activity.ts
index d89a84a6..e9e4224f 100644 --- a/src/models/Activity.ts +++ b/src/models/Activity.ts
@@ -3,7 +3,7 @@ import { ClientStatus, Status } from "./Status"; export interface Presence { user: User; - guild_id: bigint; + guild_id?: bigint; status: Status; activities: Activity[]; client_status: ClientStatus; diff --git a/src/models/Event.ts b/src/models/Event.ts
index d22c00ad..4925c7ca 100644 --- a/src/models/Event.ts +++ b/src/models/Event.ts
@@ -15,7 +15,7 @@ export interface Event { guild_id?: bigint; user_id?: bigint; channel_id?: bigint; - created_at: number; + created_at?: number; event: EVENT; data?: any; } diff --git a/src/models/Guild.ts b/src/models/Guild.ts
index 7cf3b193..348f8c7c 100644 --- a/src/models/Guild.ts +++ b/src/models/Guild.ts
@@ -8,7 +8,6 @@ export interface Guild { afk_timeout?: number; application_id?: bigint; banner?: string; - channels: GuildChannel[]; default_message_notifications?: number; description?: string; discovery_splash?: string; @@ -24,17 +23,17 @@ export interface Guild { max_video_channel_users?: number; // ? default: 25, is this max 25 streaming or watching member_count?: number; presence_count?: number; // users online - members?: Member[]; + // members?: Member[]; // * Members are stored in a seperate collection + // roles: Role[]; // * Role are stroed in a seperate collection + // channels: GuildChannel[]; // * Channels are stroed in a seperate collection mfa_level?: number; name: string; owner_id: bigint; preferred_locale?: string; // only community guilds can choose this premium_subscription_count?: number; premium_tier?: number; // nitro boost level - presences: []; // TODO: add model public_updates_channel_id?: bigint; region?: string; - roles: Role[]; rules_channel_id?: bigint; splash?: string; system_channel_flags?: number; diff --git a/src/models/User.ts b/src/models/User.ts
index 36184ce6..f591d26e 100644 --- a/src/models/User.ts +++ b/src/models/User.ts
@@ -1,3 +1,6 @@ +import { Activity } from "./Activity"; +import { ClientStatus, Status } from "./Status"; + export interface User { id: bigint; username: string; @@ -23,6 +26,11 @@ export interface User { user_settings: UserSettings; relationships: Relationship[]; connected_accounts: ConnectedAccount[]; + presence: { + status: Status; + activities: Activity[]; + client_status: ClientStatus; + }; } export interface PublicUser {