run cargo fmt && cargo fix

This commit is contained in:
bitfl0wer 2023-05-28 00:50:52 +02:00
parent 02eaddbcf6
commit 0a99e1637b
41 changed files with 799 additions and 309 deletions

View File

@ -1,3 +1 @@
pub mod guilds; pub mod guilds;
use guilds::*;

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,5 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct LatLong { pub struct LatLong {
pub latitude: f64, pub latitude: f64,

View File

@ -1,4 +1,3 @@
use crate::types::Message;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::types::utils::Snowflake; use crate::types::utils::Snowflake;

View File

@ -13,7 +13,7 @@ pub struct AuditLogEntry {
pub action_type: u8, pub action_type: u8,
// to:do add better options type // to:do add better options type
pub options: Option<serde_json::Value>, pub options: Option<serde_json::Value>,
pub reason: Option<String> pub reason: Option<String>,
} }
#[derive(Serialize, Deserialize, Debug, Default, Clone)] #[derive(Serialize, Deserialize, Debug, Default, Clone)]
@ -21,5 +21,5 @@ pub struct AuditLogEntry {
pub struct AuditLogChange { pub struct AuditLogChange {
pub new_value: Option<serde_json::Value>, pub new_value: Option<serde_json::Value>,
pub old_value: Option<serde_json::Value>, pub old_value: Option<serde_json::Value>,
pub key: String pub key: String,
} }

View File

@ -1,5 +1,5 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_repr::{Serialize_repr, Deserialize_repr}; use serde_repr::{Deserialize_repr, Serialize_repr};
use crate::types::utils::Snowflake; use crate::types::utils::Snowflake;
@ -25,7 +25,7 @@ pub struct AutoModerationRule {
/// See https://discord.com/developers/docs/resources/auto-moderation#auto-moderation-rule-object-event-types /// See https://discord.com/developers/docs/resources/auto-moderation#auto-moderation-rule-object-event-types
pub enum AutoModerationRuleEventType { pub enum AutoModerationRuleEventType {
#[default] #[default]
MessageSend = 1 MessageSend = 1,
} }
#[derive(Serialize_repr, Deserialize_repr, Debug, Clone, Default)] #[derive(Serialize_repr, Deserialize_repr, Debug, Clone, Default)]
@ -37,7 +37,7 @@ pub enum AutoModerationRuleTriggerType {
Keyword = 1, Keyword = 1,
Spam = 3, Spam = 3,
KeywordPreset = 4, KeywordPreset = 4,
MentionSpam = 5 MentionSpam = 5,
} }
#[derive(Serialize, Deserialize, Debug, Clone, Default)] #[derive(Serialize, Deserialize, Debug, Clone, Default)]
@ -48,7 +48,7 @@ pub enum AutoModerationRuleTriggerMetadata {
ForKeywordPreset(AutoModerationRuleTriggerMetadataForKeywordPreset), ForKeywordPreset(AutoModerationRuleTriggerMetadataForKeywordPreset),
ForMentionSpam(AutoModerationRuleTriggerMetadataForMentionSpam), ForMentionSpam(AutoModerationRuleTriggerMetadataForMentionSpam),
#[default] #[default]
None None,
} }
#[derive(Serialize, Deserialize, Debug, Clone, Default)] #[derive(Serialize, Deserialize, Debug, Clone, Default)]
@ -71,7 +71,7 @@ pub struct AutoModerationRuleTriggerMetadataForKeywordPreset {
pub struct AutoModerationRuleTriggerMetadataForMentionSpam { pub struct AutoModerationRuleTriggerMetadataForMentionSpam {
/// Max 50 /// Max 50
pub mention_total_limit: u8, pub mention_total_limit: u8,
pub mention_raid_protection_enabled: bool pub mention_raid_protection_enabled: bool,
} }
#[derive(Serialize_repr, Deserialize_repr, Debug, Clone, Default)] #[derive(Serialize_repr, Deserialize_repr, Debug, Clone, Default)]
@ -82,7 +82,7 @@ pub enum AutoModerationRuleKeywordPresetType {
#[default] #[default]
Profanity = 1, Profanity = 1,
SexualContent = 2, SexualContent = 2,
Slurs = 3 Slurs = 3,
} }
#[derive(Serialize, Deserialize, Debug, Clone, Default)] #[derive(Serialize, Deserialize, Debug, Clone, Default)]
@ -90,7 +90,7 @@ pub enum AutoModerationRuleKeywordPresetType {
pub struct AutoModerationAction { pub struct AutoModerationAction {
#[serde(rename = "type")] #[serde(rename = "type")]
pub action_type: AutoModerationActionType, pub action_type: AutoModerationActionType,
pub metadata: Option<AutoModerationActionMetadata> pub metadata: Option<AutoModerationActionMetadata>,
} }
#[derive(Serialize_repr, Deserialize_repr, Debug, Clone, Default)] #[derive(Serialize_repr, Deserialize_repr, Debug, Clone, Default)]
@ -101,7 +101,7 @@ pub enum AutoModerationActionType {
#[default] #[default]
BlockMessage = 1, BlockMessage = 1,
SendAlertMessage = 2, SendAlertMessage = 2,
Timeout = 3 Timeout = 3,
} }
#[derive(Serialize, Deserialize, Debug, Clone, Default)] #[derive(Serialize, Deserialize, Debug, Clone, Default)]
@ -112,19 +112,19 @@ pub enum AutoModerationActionMetadata {
ForSendAlertMessage(AutoModerationActionMetadataForSendAlertMessage), ForSendAlertMessage(AutoModerationActionMetadataForSendAlertMessage),
ForTimeout(AutoModerationActionMetadataForTimeout), ForTimeout(AutoModerationActionMetadataForTimeout),
#[default] #[default]
None None,
} }
#[derive(Serialize, Deserialize, Debug, Clone, Default)] #[derive(Serialize, Deserialize, Debug, Clone, Default)]
/// See https://discord.com/developers/docs/resources/auto-moderation#auto-moderation-action-object-action-metadata /// See https://discord.com/developers/docs/resources/auto-moderation#auto-moderation-action-object-action-metadata
pub struct AutoModerationActionMetadataForBlockMessage { pub struct AutoModerationActionMetadataForBlockMessage {
pub custom_message: Option<String> pub custom_message: Option<String>,
} }
#[derive(Serialize, Deserialize, Debug, Clone, Default)] #[derive(Serialize, Deserialize, Debug, Clone, Default)]
/// See https://discord.com/developers/docs/resources/auto-moderation#auto-moderation-action-object-action-metadata /// See https://discord.com/developers/docs/resources/auto-moderation#auto-moderation-action-object-action-metadata
pub struct AutoModerationActionMetadataForSendAlertMessage { pub struct AutoModerationActionMetadataForSendAlertMessage {
pub channel_id: Snowflake pub channel_id: Snowflake,
} }
#[derive(Serialize, Deserialize, Debug, Clone, Default)] #[derive(Serialize, Deserialize, Debug, Clone, Default)]

View File

@ -1,6 +1,9 @@
use chrono::Utc; use chrono::Utc;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_aux::prelude::{deserialize_number_from_string, deserialize_option_number_from_string, deserialize_string_from_number}; use serde_aux::prelude::{
deserialize_number_from_string, deserialize_option_number_from_string,
deserialize_string_from_number,
};
use serde_repr::{Deserialize_repr, Serialize_repr}; use serde_repr::{Deserialize_repr, Serialize_repr};
use crate::types::{ use crate::types::{

View File

@ -1,8 +1,7 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_aux::prelude::deserialize_option_number_from_string;
use crate::types::entities::User; use crate::types::entities::User;
use crate::types::{Guild, Snowflake}; use crate::types::Snowflake;
#[derive(Debug, PartialEq, Clone, Deserialize, Serialize, Default)] #[derive(Debug, PartialEq, Clone, Deserialize, Serialize, Default)]
#[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))] #[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))]

View File

@ -1,9 +1,9 @@
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_repr::{Serialize_repr, Deserialize_repr}; use serde_repr::{Deserialize_repr, Serialize_repr};
use crate::types::{ use crate::types::{
entities::{Channel, Emoji, GuildTemplate, RoleObject, Sticker, User, VoiceState, Webhook}, entities::{Channel, Emoji, RoleObject, Sticker, User, VoiceState, Webhook},
interfaces::WelcomeScreenObject, interfaces::WelcomeScreenObject,
utils::Snowflake, utils::Snowflake,
}; };
@ -140,7 +140,7 @@ pub struct GuildScheduledEvent {
pub entity_metadata: Option<GuildScheduledEventEntityMetadata>, pub entity_metadata: Option<GuildScheduledEventEntityMetadata>,
pub creator: Option<User>, pub creator: Option<User>,
pub user_count: Option<u64>, pub user_count: Option<u64>,
pub image: Option<String> pub image: Option<String>,
} }
#[derive(Serialize_repr, Deserialize_repr, Debug, Default, Clone)] #[derive(Serialize_repr, Deserialize_repr, Debug, Default, Clone)]
@ -159,7 +159,7 @@ pub enum GuildScheduledEventStatus {
Scheduled = 1, Scheduled = 1,
Active = 2, Active = 2,
Completed = 3, Completed = 3,
Canceled = 4 Canceled = 4,
} }
#[derive(Serialize_repr, Deserialize_repr, Debug, Default, Clone)] #[derive(Serialize_repr, Deserialize_repr, Debug, Default, Clone)]
@ -175,5 +175,5 @@ pub enum GuildScheduledEventEntityType {
#[derive(Serialize, Deserialize, Debug, Default, Clone)] #[derive(Serialize, Deserialize, Debug, Default, Clone)]
/// See https://discord.com/developers/docs/resources/guild-scheduled-event#guild-scheduled-event-object-guild-scheduled-event-entity-metadata /// See https://discord.com/developers/docs/resources/guild-scheduled-event#guild-scheduled-event-object-guild-scheduled-event-entity-metadata
pub struct GuildScheduledEventEntityMetadata { pub struct GuildScheduledEventEntityMetadata {
pub location: Option<String> pub location: Option<String>,
} }

View File

@ -1,5 +1,7 @@
mod application; mod application;
mod attachment; mod attachment;
mod audit_log;
mod auto_moderation;
mod channel; mod channel;
mod config; mod config;
mod emoji; mod emoji;
@ -7,8 +9,10 @@ mod guild;
mod guild_member; mod guild_member;
mod integration; mod integration;
mod message; mod message;
mod relationship;
mod role; mod role;
mod security_key; mod security_key;
mod stage_instance;
mod sticker; mod sticker;
mod team; mod team;
mod template; mod template;
@ -16,13 +20,11 @@ mod user;
mod user_settings; mod user_settings;
mod voice_state; mod voice_state;
mod webhook; mod webhook;
mod audit_log;
mod relationship;
mod auto_moderation;
mod stage_instance;
pub use application::*; pub use application::*;
pub use attachment::*; pub use attachment::*;
pub use audit_log::*;
pub use auto_moderation::*;
pub use channel::*; pub use channel::*;
pub use config::*; pub use config::*;
pub use emoji::*; pub use emoji::*;
@ -30,8 +32,10 @@ pub use guild::*;
pub use guild_member::*; pub use guild_member::*;
pub use integration::*; pub use integration::*;
pub use message::*; pub use message::*;
pub use relationship::*;
pub use role::*; pub use role::*;
pub use security_key::*; pub use security_key::*;
pub use stage_instance::*;
pub use sticker::*; pub use sticker::*;
pub use team::*; pub use team::*;
pub use template::*; pub use template::*;
@ -39,7 +43,3 @@ pub use user::*;
pub use user_settings::*; pub use user_settings::*;
pub use voice_state::*; pub use voice_state::*;
pub use webhook::*; pub use webhook::*;
pub use audit_log::*;
pub use relationship::*;
pub use auto_moderation::*;
pub use stage_instance::*;

View File

@ -1,5 +1,5 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_repr::{Serialize_repr, Deserialize_repr}; use serde_repr::{Deserialize_repr, Serialize_repr};
use crate::types::Snowflake; use crate::types::Snowflake;
@ -12,7 +12,7 @@ pub struct Relationship {
#[serde(rename = "type")] #[serde(rename = "type")]
pub relationship_type: RelationshipType, pub relationship_type: RelationshipType,
pub nickname: Option<String>, pub nickname: Option<String>,
pub user: PublicUser pub user: PublicUser,
} }
#[derive(Serialize_repr, Deserialize_repr, Debug, Clone, Default)] #[derive(Serialize_repr, Deserialize_repr, Debug, Clone, Default)]

View File

@ -1,5 +1,5 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_aux::prelude::{deserialize_string_from_number, deserialize_option_number_from_string}; use serde_aux::prelude::{deserialize_option_number_from_string, deserialize_string_from_number};
use crate::types::utils::Snowflake; use crate::types::utils::Snowflake;
@ -19,7 +19,7 @@ pub struct RoleObject {
pub permissions: String, pub permissions: String,
pub managed: bool, pub managed: bool,
pub mentionable: bool, pub mentionable: bool,
pub tags: Option<RoleTags> pub tags: Option<RoleTags>,
} }
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

View File

@ -1,5 +1,5 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_repr::{Serialize_repr, Deserialize_repr}; use serde_repr::{Deserialize_repr, Serialize_repr};
use crate::types::Snowflake; use crate::types::Snowflake;
@ -25,5 +25,5 @@ pub enum StageInstancePrivacyLevel {
/// deprecated, apparently /// deprecated, apparently
Public = 1, Public = 1,
#[default] #[default]
GuildOnly = 2 GuildOnly = 2,
} }

View File

@ -1,5 +1,4 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_aux::prelude::{deserialize_option_number_from_string};
use crate::types::{entities::User, utils::Snowflake}; use crate::types::{entities::User, utils::Snowflake};

View File

@ -1,12 +1,8 @@
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_aux::prelude::deserialize_option_number_from_string; use serde_aux::prelude::deserialize_option_number_from_string;
use serde_json::{Map, Value};
use crate::types::{ use crate::types::utils::Snowflake;
errors::Error,
utils::Snowflake, //util::{email::adjust_email, entities::user_setting::UserSettings},
};
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)] #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
#[cfg_attr(feature = "sqlx", derive(sqlx::Type))] #[cfg_attr(feature = "sqlx", derive(sqlx::Type))]

View File

@ -1,8 +1,6 @@
use chrono::{serde::ts_milliseconds_option, Utc}; use chrono::{serde::ts_milliseconds_option, Utc};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::types::utils::Snowflake;
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)] #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
#[cfg_attr(feature = "sqlx", derive(sqlx::Type))] #[cfg_attr(feature = "sqlx", derive(sqlx::Type))]
#[serde(rename_all = "lowercase")] #[serde(rename_all = "lowercase")]

View File

@ -2,7 +2,7 @@ use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::types::{ use crate::types::{
entities::{Channel, Guild, GuildMember, User}, entities::{Guild, GuildMember},
utils::Snowflake, utils::Snowflake,
}; };

View File

@ -1,7 +1,7 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::types::{ use crate::types::{
entities::{Application, Channel, Guild, User}, entities::{Guild, User},
utils::Snowflake, utils::Snowflake,
}; };

View File

@ -1,6 +1,6 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::types::{WebSocketEvent, GuildApplicationCommandPermissions}; use crate::types::{GuildApplicationCommandPermissions, WebSocketEvent};
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
/// See https://discord.com/developers/docs/topics/gateway-events#application-command-permissions-update /// See https://discord.com/developers/docs/topics/gateway-events#application-command-permissions-update
@ -9,4 +9,4 @@ pub struct ApplicationCommandPermissionsUpdate {
pub permissions: GuildApplicationCommandPermissions, pub permissions: GuildApplicationCommandPermissions,
} }
impl WebSocketEvent for ApplicationCommandPermissionsUpdate {} impl WebSocketEvent for ApplicationCommandPermissionsUpdate {}

View File

@ -1,6 +1,9 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::types::{WebSocketEvent, AutoModerationRule, Snowflake, AutoModerationAction, AutoModerationRuleTriggerType}; use crate::types::{
AutoModerationAction, AutoModerationRule, AutoModerationRuleTriggerType, Snowflake,
WebSocketEvent,
};
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
/// See https://discord.com/developers/docs/topics/gateway-events#auto-moderation-rule-create /// See https://discord.com/developers/docs/topics/gateway-events#auto-moderation-rule-create
@ -9,7 +12,7 @@ pub struct AutoModerationRuleCreate {
pub rule: AutoModerationRule, pub rule: AutoModerationRule,
} }
impl WebSocketEvent for AutoModerationRuleCreate {} impl WebSocketEvent for AutoModerationRuleCreate {}
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
/// See https://discord.com/developers/docs/topics/gateway-events#auto-moderation-rule-update /// See https://discord.com/developers/docs/topics/gateway-events#auto-moderation-rule-update
@ -18,7 +21,7 @@ pub struct AutoModerationRuleUpdate {
pub rule: AutoModerationRule, pub rule: AutoModerationRule,
} }
impl WebSocketEvent for AutoModerationRuleUpdate {} impl WebSocketEvent for AutoModerationRuleUpdate {}
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
/// See https://discord.com/developers/docs/topics/gateway-events#auto-moderation-rule-delete /// See https://discord.com/developers/docs/topics/gateway-events#auto-moderation-rule-delete
@ -27,7 +30,7 @@ pub struct AutoModerationRuleDelete {
pub rule: AutoModerationRule, pub rule: AutoModerationRule,
} }
impl WebSocketEvent for AutoModerationRuleDelete {} impl WebSocketEvent for AutoModerationRuleDelete {}
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
/// See https://discord.com/developers/docs/topics/gateway-events#auto-moderation-action-execution /// See https://discord.com/developers/docs/topics/gateway-events#auto-moderation-action-execution
@ -42,7 +45,7 @@ pub struct AutoModerationActionExecution {
pub alert_system_message_id: Option<Snowflake>, pub alert_system_message_id: Option<Snowflake>,
pub content: Option<String>, pub content: Option<String>,
pub matched_keyword: Option<String>, pub matched_keyword: Option<String>,
pub matched_content: Option<String> pub matched_content: Option<String>,
} }
impl WebSocketEvent for AutoModerationActionExecution {} impl WebSocketEvent for AutoModerationActionExecution {}

View File

@ -46,7 +46,7 @@ pub struct ChannelUnreadUpdate {
pub struct ChannelUnreadUpdateObject { pub struct ChannelUnreadUpdateObject {
pub id: String, pub id: String,
pub last_message_id: String, pub last_message_id: String,
pub last_pin_timestamp: Option<String> pub last_pin_timestamp: Option<String>,
} }
impl WebSocketEvent for ChannelUnreadUpdate {} impl WebSocketEvent for ChannelUnreadUpdate {}

View File

@ -6,7 +6,7 @@ use crate::types::{GuildInvite, WebSocketEvent};
/// See https://discord.com/developers/docs/topics/gateway-events#invite-create /// See https://discord.com/developers/docs/topics/gateway-events#invite-create
pub struct InviteCreate { pub struct InviteCreate {
#[serde(flatten)] #[serde(flatten)]
pub invite: GuildInvite pub invite: GuildInvite,
} }
impl WebSocketEvent for InviteCreate {} impl WebSocketEvent for InviteCreate {}

View File

@ -22,6 +22,6 @@ pub struct LazyRequest {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub members: Option<bool>, pub members: Option<bool>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub channels: Option<HashMap<String, Vec<Vec<u64>>>> pub channels: Option<HashMap<String, Vec<Vec<u64>>>>,
} }
impl WebSocketEvent for LazyRequest {} impl WebSocketEvent for LazyRequest {}

View File

@ -1,10 +1,7 @@
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::types::{ use crate::types::entities::{Emoji, GuildMember, Message, User};
entities::{Emoji, GuildMember, Message, User},
utils::Snowflake,
};
use super::WebSocketEvent; use super::WebSocketEvent;
@ -56,7 +53,7 @@ pub struct MessageCreateUser {
purchased_flags: Option<i32>, purchased_flags: Option<i32>,
premium_usage_flags: Option<i32>, premium_usage_flags: Option<i32>,
disabled: Option<bool>, disabled: Option<bool>,
member: GuildMember member: GuildMember,
} }
impl WebSocketEvent for MessageCreate {} impl WebSocketEvent for MessageCreate {}

View File

@ -1,56 +1,56 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
mod application;
mod auto_moderation;
mod call;
mod channel; mod channel;
mod guild; mod guild;
mod heartbeat; mod heartbeat;
mod hello; mod hello;
mod identify; mod identify;
mod integration;
mod interaction;
mod invite;
mod lazy_request;
mod message; mod message;
mod passive_update;
mod presence; mod presence;
mod ready; mod ready;
mod relationship;
mod request_members; mod request_members;
mod resume; mod resume;
mod session;
mod stage_instance;
mod thread; mod thread;
mod user; mod user;
mod voice; mod voice;
mod session;
mod webhooks; mod webhooks;
mod passive_update;
mod integration;
mod invite;
mod call;
mod lazy_request;
mod relationship;
mod auto_moderation;
mod stage_instance;
mod interaction;
mod application;
pub use application::*;
pub use auto_moderation::*;
pub use call::*;
pub use channel::*; pub use channel::*;
pub use guild::*; pub use guild::*;
pub use heartbeat::*; pub use heartbeat::*;
pub use hello::*; pub use hello::*;
pub use identify::*; pub use identify::*;
pub use integration::*;
pub use interaction::*;
pub use invite::*;
pub use lazy_request::*;
pub use message::*; pub use message::*;
pub use passive_update::*;
pub use presence::*; pub use presence::*;
pub use ready::*; pub use ready::*;
pub use relationship::*;
pub use request_members::*; pub use request_members::*;
pub use resume::*; pub use resume::*;
pub use session::*;
pub use stage_instance::*;
pub use thread::*; pub use thread::*;
pub use user::*; pub use user::*;
pub use voice::*; pub use voice::*;
pub use session::*;
pub use webhooks::*; pub use webhooks::*;
pub use passive_update::*;
pub use integration::*;
pub use invite::*;
pub use call::*;
pub use lazy_request::*;
pub use relationship::*;
pub use auto_moderation::*;
pub use stage_instance::*;
pub use interaction::*;
pub use application::*;
pub trait WebSocketEvent {} pub trait WebSocketEvent {}

View File

@ -1,7 +1,7 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::types::{VoiceState, GuildMember};
use super::{ChannelUnreadUpdateObject, WebSocketEvent}; use super::{ChannelUnreadUpdateObject, WebSocketEvent};
use crate::types::{GuildMember, VoiceState};
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
/// Officially Undocumented /// Officially Undocumented

View File

@ -1,6 +1,6 @@
use crate::types::PublicUser;
use crate::types::events::WebSocketEvent; use crate::types::events::WebSocketEvent;
use crate::types::interfaces::Activity; use crate::types::interfaces::Activity;
use crate::types::PublicUser;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[derive(Debug, Deserialize, Serialize, Default, Clone)] #[derive(Debug, Deserialize, Serialize, Default, Clone)]

View File

@ -1,7 +1,7 @@
use crate::types::entities::{UnavailableGuild, User, Guild}; use crate::types::entities::{Guild, User};
use crate::types::events::{WebSocketEvent, Session}; use crate::types::events::{Session, WebSocketEvent};
use crate::types::interfaces::ClientStatusObject; use crate::types::interfaces::ClientStatusObject;
use crate::types::{PresenceUpdate, GuildMember, Activity, VoiceState}; use crate::types::{Activity, GuildMember, PresenceUpdate, VoiceState};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
@ -46,7 +46,7 @@ impl WebSocketEvent for GatewayReadySupplemental {}
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
pub struct MergedPresences { pub struct MergedPresences {
pub guilds: Vec<Vec<MergedPresenceGuild>>, pub guilds: Vec<Vec<MergedPresenceGuild>>,
pub friends: Vec<MergedPresenceFriend> pub friends: Vec<MergedPresenceFriend>,
} }
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
@ -56,7 +56,7 @@ pub struct MergedPresenceFriend {
/// Looks like ms?? /// Looks like ms??
pub last_modified: u128, pub last_modified: u128,
pub client_status: ClientStatusObject, pub client_status: ClientStatusObject,
pub activities: Vec<Activity> pub activities: Vec<Activity>,
} }
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
@ -66,12 +66,12 @@ pub struct MergedPresenceGuild {
// ? // ?
pub game: Option<serde_json::Value>, pub game: Option<serde_json::Value>,
pub client_status: ClientStatusObject, pub client_status: ClientStatusObject,
pub activities: Vec<Activity> pub activities: Vec<Activity>,
} }
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
pub struct SupplimentalGuild { pub struct SupplimentalGuild {
pub voice_states: Option<Vec<VoiceState>>, pub voice_states: Option<Vec<VoiceState>>,
pub id: String, pub id: String,
pub embedded_activities: Vec<serde_json::Value> pub embedded_activities: Vec<serde_json::Value>,
} }

View File

@ -1,4 +1,4 @@
use crate::types::{events::WebSocketEvent, Relationship, Snowflake, RelationshipType}; use crate::types::{events::WebSocketEvent, Relationship, RelationshipType, Snowflake};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]

View File

@ -7,7 +7,7 @@ use crate::types::{Activity, WebSocketEvent};
/// Seems like it sends active session info to users on connect /// Seems like it sends active session info to users on connect
/// [{"activities":[],"client_info":{"client":"web","os":"other","version":0},"session_id":"ab5941b50d818b1f8d93b4b1b581b192","status":"online"}] /// [{"activities":[],"client_info":{"client":"web","os":"other","version":0},"session_id":"ab5941b50d818b1f8d93b4b1b581b192","status":"online"}]
pub struct SessionsReplace { pub struct SessionsReplace {
pub sessions: Vec<Session> pub sessions: Vec<Session>,
} }
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
@ -26,7 +26,7 @@ pub struct Session {
pub struct ClientInfo { pub struct ClientInfo {
pub client: String, pub client: String,
pub os: String, pub os: String,
pub version: u8 pub version: u8,
} }
impl WebSocketEvent for SessionsReplace {} impl WebSocketEvent for SessionsReplace {}

View File

@ -1,6 +1,6 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::types::{WebSocketEvent, StageInstance}; use crate::types::{StageInstance, WebSocketEvent};
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
/// See https://discord.com/developers/docs/topics/gateway-events#stage-instance-create /// See https://discord.com/developers/docs/topics/gateway-events#stage-instance-create
@ -9,7 +9,7 @@ pub struct StageInstanceCreate {
pub stage_instance: StageInstance, pub stage_instance: StageInstance,
} }
impl WebSocketEvent for StageInstanceCreate {} impl WebSocketEvent for StageInstanceCreate {}
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
/// See https://discord.com/developers/docs/topics/gateway-events#stage-instance-update /// See https://discord.com/developers/docs/topics/gateway-events#stage-instance-update
@ -18,7 +18,7 @@ pub struct StageInstanceUpdate {
pub stage_instance: StageInstance, pub stage_instance: StageInstance,
} }
impl WebSocketEvent for StageInstanceUpdate {} impl WebSocketEvent for StageInstanceUpdate {}
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
/// See https://discord.com/developers/docs/topics/gateway-events#stage-instance-delete /// See https://discord.com/developers/docs/topics/gateway-events#stage-instance-delete
@ -27,4 +27,4 @@ pub struct StageInstanceDelete {
pub stage_instance: StageInstance, pub stage_instance: StageInstance,
} }
impl WebSocketEvent for StageInstanceDelete {} impl WebSocketEvent for StageInstanceDelete {}

View File

@ -1,4 +1,4 @@
use crate::types::entities::{Channel, GuildMember, ThreadMember}; use crate::types::entities::{Channel, ThreadMember};
use crate::types::events::WebSocketEvent; use crate::types::events::WebSocketEvent;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};

View File

@ -24,7 +24,7 @@ impl WebSocketEvent for UpdateVoiceState {}
/// Not to be confused with [UpdateVoiceState] /// Not to be confused with [UpdateVoiceState]
pub struct VoiceStateUpdate { pub struct VoiceStateUpdate {
#[serde(flatten)] #[serde(flatten)]
pub state: VoiceState pub state: VoiceState,
} }
impl WebSocketEvent for VoiceStateUpdate {} impl WebSocketEvent for VoiceStateUpdate {}
@ -34,7 +34,7 @@ impl WebSocketEvent for VoiceStateUpdate {}
pub struct VoiceServerUpdate { pub struct VoiceServerUpdate {
pub token: String, pub token: String,
pub guild_id: String, pub guild_id: String,
pub endpoint: Option<String> pub endpoint: Option<String>,
} }
impl WebSocketEvent for VoiceServerUpdate {} impl WebSocketEvent for VoiceServerUpdate {}

View File

@ -0,0 +1 @@