Merge pull request #71 from polyphony-chat/refactor/types
Refactor/types
This commit is contained in:
commit
8d162f26c3
19
Cargo.toml
19
Cargo.toml
|
@ -5,9 +5,10 @@ license = "AGPL-3"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tokio = {version = "1.27.0", features = ["rt", "macros", "rt-multi-thread"]}
|
tokio = {version = "1.28.1", features = ["rt", "macros", "rt-multi-thread", "full"]}
|
||||||
serde = {version = "1.0.159", features = ["derive"]}
|
serde = {version = "1.0.162", features = ["derive"]}
|
||||||
serde_json = "1.0.95"
|
serde_json = { version = "1.0.96", features = ["raw_value"] }
|
||||||
|
serde_repr = "0.1.12"
|
||||||
reqwest = {version = "0.11.16", features = ["multipart"]}
|
reqwest = {version = "0.11.16", features = ["multipart"]}
|
||||||
url = "2.3.1"
|
url = "2.3.1"
|
||||||
chrono = {version = "0.4.24", features = ["serde"]}
|
chrono = {version = "0.4.24", features = ["serde"]}
|
||||||
|
@ -17,6 +18,18 @@ native-tls = "0.2.11"
|
||||||
tokio-tungstenite = {version = "0.18.0", features = ["native-tls"]}
|
tokio-tungstenite = {version = "0.18.0", features = ["native-tls"]}
|
||||||
futures-util = "0.3.28"
|
futures-util = "0.3.28"
|
||||||
http = "0.2.9"
|
http = "0.2.9"
|
||||||
|
openssl = "0.10.52"
|
||||||
|
base64 = "0.21.2"
|
||||||
|
hostname = "0.3.1"
|
||||||
|
bitflags = { version = "2.2.1", features = ["serde"] }
|
||||||
|
atomic = "0.5.3"
|
||||||
|
bigdecimal = "0.3.1"
|
||||||
|
num-bigint = "0.4.3"
|
||||||
|
lazy_static = "1.4.0"
|
||||||
|
poem = { version = "1.3.55", optional = true }
|
||||||
|
sqlx = { version = "0.6.3", features = ["mysql", "sqlite", "json", "chrono", "ipnetwork", "runtime-tokio-native-tls", "any"], optional = true }
|
||||||
|
thiserror = "1.0.40"
|
||||||
|
jsonwebtoken = "8.3.0"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
lazy_static = "1.4.0"
|
lazy_static = "1.4.0"
|
|
@ -6,17 +6,16 @@ pub mod login {
|
||||||
use serde_json::{from_str, json};
|
use serde_json::{from_str, json};
|
||||||
|
|
||||||
use crate::api::limits::LimitType;
|
use crate::api::limits::LimitType;
|
||||||
use crate::api::schemas::LoginSchema;
|
|
||||||
use crate::api::types::{ErrorResponse, LoginResult};
|
|
||||||
use crate::errors::InstanceServerError;
|
use crate::errors::InstanceServerError;
|
||||||
use crate::instance::Instance;
|
use crate::instance::{Instance, UserMeta};
|
||||||
use crate::limit::LimitedRequester;
|
use crate::limit::LimitedRequester;
|
||||||
|
use crate::types::{ErrorResponse, LoginResult, LoginSchema};
|
||||||
|
|
||||||
impl Instance {
|
impl Instance {
|
||||||
pub async fn login_account(
|
pub async fn login_account(
|
||||||
&mut self,
|
&mut self,
|
||||||
login_schema: &LoginSchema,
|
login_schema: &LoginSchema,
|
||||||
) -> Result<crate::api::types::User, InstanceServerError> {
|
) -> Result<UserMeta, InstanceServerError> {
|
||||||
let mut requester = LimitedRequester::new().await;
|
let mut requester = LimitedRequester::new().await;
|
||||||
let json_schema = json!(login_schema);
|
let json_schema = json!(login_schema);
|
||||||
let client = Client::new();
|
let client = Client::new();
|
||||||
|
@ -59,7 +58,7 @@ pub mod login {
|
||||||
.get_user(login_result.token.clone(), None)
|
.get_user(login_result.token.clone(), None)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let user = crate::api::types::User::new(
|
let user = UserMeta::new(
|
||||||
Rc::new(RefCell::new(self.clone())),
|
Rc::new(RefCell::new(self.clone())),
|
||||||
login_result.token,
|
login_result.token,
|
||||||
cloned_limits,
|
cloned_limits,
|
||||||
|
|
|
@ -5,10 +5,11 @@ pub mod register {
|
||||||
use serde_json::{from_str, json};
|
use serde_json::{from_str, json};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
api::{limits::LimitType, schemas::RegisterSchema, types::ErrorResponse, Token},
|
api::limits::LimitType,
|
||||||
errors::InstanceServerError,
|
errors::InstanceServerError,
|
||||||
instance::Instance,
|
instance::{Instance, Token, UserMeta},
|
||||||
limit::LimitedRequester,
|
limit::LimitedRequester,
|
||||||
|
types::{ErrorResponse, RegisterSchema},
|
||||||
};
|
};
|
||||||
|
|
||||||
impl Instance {
|
impl Instance {
|
||||||
|
@ -22,7 +23,7 @@ pub mod register {
|
||||||
pub async fn register_account(
|
pub async fn register_account(
|
||||||
&mut self,
|
&mut self,
|
||||||
register_schema: &RegisterSchema,
|
register_schema: &RegisterSchema,
|
||||||
) -> Result<crate::api::types::User, InstanceServerError> {
|
) -> Result<UserMeta, InstanceServerError> {
|
||||||
let json_schema = json!(register_schema);
|
let json_schema = json!(register_schema);
|
||||||
let mut limited_requester = LimitedRequester::new().await;
|
let mut limited_requester = LimitedRequester::new().await;
|
||||||
let client = Client::new();
|
let client = Client::new();
|
||||||
|
@ -62,14 +63,11 @@ pub mod register {
|
||||||
return Err(InstanceServerError::InvalidFormBodyError { error_type, error });
|
return Err(InstanceServerError::InvalidFormBodyError { error_type, error });
|
||||||
}
|
}
|
||||||
let user_object = self.get_user(token.clone(), None).await.unwrap();
|
let user_object = self.get_user(token.clone(), None).await.unwrap();
|
||||||
let settings = crate::api::types::User::get_settings(
|
let settings =
|
||||||
&token,
|
UserMeta::get_settings(&token, &self.urls.get_api().to_string(), &mut self.limits)
|
||||||
&self.urls.get_api().to_string(),
|
|
||||||
&mut self.limits,
|
|
||||||
)
|
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let user: crate::api::types::User = crate::api::types::User::new(
|
let user: UserMeta = UserMeta::new(
|
||||||
Rc::new(RefCell::new(self.clone())),
|
Rc::new(RefCell::new(self.clone())),
|
||||||
token.clone(),
|
token.clone(),
|
||||||
cloned_limits,
|
cloned_limits,
|
||||||
|
@ -83,9 +81,9 @@ pub mod register {
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
use crate::api::schemas::{AuthUsername, RegisterSchema};
|
|
||||||
use crate::instance::Instance;
|
use crate::instance::Instance;
|
||||||
use crate::limit::LimitedRequester;
|
use crate::limit::LimitedRequester;
|
||||||
|
use crate::types::RegisterSchema;
|
||||||
use crate::URLBundle;
|
use crate::URLBundle;
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
|
@ -95,10 +93,10 @@ mod test {
|
||||||
"http://localhost:3001".to_string(),
|
"http://localhost:3001".to_string(),
|
||||||
"http://localhost:3001".to_string(),
|
"http://localhost:3001".to_string(),
|
||||||
);
|
);
|
||||||
let limited_requester = LimitedRequester::new().await;
|
let _limited_requester = LimitedRequester::new().await;
|
||||||
let mut test_instance = Instance::new(urls.clone()).await.unwrap();
|
let mut test_instance = Instance::new(urls.clone()).await.unwrap();
|
||||||
let reg = RegisterSchema::new(
|
let reg = RegisterSchema::new(
|
||||||
AuthUsername::new("Hiiii".to_string()).unwrap(),
|
"Hiiii".to_string(),
|
||||||
None,
|
None,
|
||||||
true,
|
true,
|
||||||
None,
|
None,
|
||||||
|
|
|
@ -2,19 +2,17 @@ use reqwest::Client;
|
||||||
use serde_json::from_str;
|
use serde_json::from_str;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
api::{limits::Limits, types},
|
api::limits::Limits, errors::InstanceServerError, limit::LimitedRequester, types::Channel,
|
||||||
errors::InstanceServerError,
|
|
||||||
limit::LimitedRequester,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
impl types::Channel {
|
impl Channel {
|
||||||
pub async fn get(
|
pub async fn get(
|
||||||
token: &str,
|
token: &str,
|
||||||
url_api: &str,
|
url_api: &str,
|
||||||
channel_id: &str,
|
channel_id: &str,
|
||||||
limits_user: &mut Limits,
|
limits_user: &mut Limits,
|
||||||
limits_instance: &mut Limits,
|
limits_instance: &mut Limits,
|
||||||
) -> Result<types::Channel, InstanceServerError> {
|
) -> Result<Channel, InstanceServerError> {
|
||||||
let request = Client::new()
|
let request = Client::new()
|
||||||
.get(format!("{}/channels/{}/", url_api, channel_id))
|
.get(format!("{}/channels/{}/", url_api, channel_id))
|
||||||
.bearer_auth(token);
|
.bearer_auth(token);
|
||||||
|
@ -32,7 +30,7 @@ impl types::Channel {
|
||||||
Err(e) => return Err(e),
|
Err(e) => return Err(e),
|
||||||
};
|
};
|
||||||
let result_text = result.text().await.unwrap();
|
let result_text = result.text().await.unwrap();
|
||||||
match from_str::<types::Channel>(&result_text) {
|
match from_str::<Channel>(&result_text) {
|
||||||
Ok(object) => Ok(object),
|
Ok(object) => Ok(object),
|
||||||
Err(e) => Err(InstanceServerError::RequestErrorError {
|
Err(e) => Err(InstanceServerError::RequestErrorError {
|
||||||
url: format!("{}/channels/{}/", url_api, channel_id),
|
url: format!("{}/channels/{}/", url_api, channel_id),
|
||||||
|
|
|
@ -5,8 +5,9 @@ pub mod messages {
|
||||||
use serde_json::to_string;
|
use serde_json::to_string;
|
||||||
|
|
||||||
use crate::api::limits::Limits;
|
use crate::api::limits::Limits;
|
||||||
use crate::api::types::{Message, PartialDiscordFileAttachment, User};
|
use crate::instance::UserMeta;
|
||||||
use crate::limit::LimitedRequester;
|
use crate::limit::LimitedRequester;
|
||||||
|
use crate::types::{Message, MessageSendSchema, PartialDiscordFileAttachment};
|
||||||
|
|
||||||
impl Message {
|
impl Message {
|
||||||
/**
|
/**
|
||||||
|
@ -23,7 +24,7 @@ pub mod messages {
|
||||||
pub async fn send<'a>(
|
pub async fn send<'a>(
|
||||||
url_api: String,
|
url_api: String,
|
||||||
channel_id: String,
|
channel_id: String,
|
||||||
message: &mut crate::api::schemas::MessageSendSchema,
|
message: &mut MessageSendSchema,
|
||||||
files: Option<Vec<PartialDiscordFileAttachment>>,
|
files: Option<Vec<PartialDiscordFileAttachment>>,
|
||||||
token: String,
|
token: String,
|
||||||
limits_user: &mut Limits,
|
limits_user: &mut Limits,
|
||||||
|
@ -65,7 +66,7 @@ pub mod messages {
|
||||||
let mut header_map = HeaderMap::new();
|
let mut header_map = HeaderMap::new();
|
||||||
header_map.insert(CONTENT_DISPOSITION, content_disposition.parse().unwrap());
|
header_map.insert(CONTENT_DISPOSITION, content_disposition.parse().unwrap());
|
||||||
|
|
||||||
let mut part = multipart::Part::bytes(attachment_content)
|
let part = multipart::Part::bytes(attachment_content)
|
||||||
.file_name(attachment_filename)
|
.file_name(attachment_filename)
|
||||||
.headers(header_map);
|
.headers(header_map);
|
||||||
|
|
||||||
|
@ -91,10 +92,10 @@ pub mod messages {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl User {
|
impl UserMeta {
|
||||||
pub async fn send_message(
|
pub async fn send_message(
|
||||||
&mut self,
|
&mut self,
|
||||||
message: &mut crate::api::schemas::MessageSendSchema,
|
message: &mut MessageSendSchema,
|
||||||
channel_id: String,
|
channel_id: String,
|
||||||
files: Option<Vec<PartialDiscordFileAttachment>>,
|
files: Option<Vec<PartialDiscordFileAttachment>>,
|
||||||
) -> Result<reqwest::Response, crate::errors::InstanceServerError> {
|
) -> Result<reqwest::Response, crate::errors::InstanceServerError> {
|
||||||
|
@ -116,11 +117,9 @@ pub mod messages {
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
use crate::{
|
use crate::instance::UserMeta;
|
||||||
api::{AuthUsername, LoginSchema},
|
use crate::types::{LoginSchema, MessageSendSchema, PartialDiscordFileAttachment};
|
||||||
instance::Instance,
|
use crate::{instance::Instance};
|
||||||
limit::LimitedRequester,
|
|
||||||
};
|
|
||||||
|
|
||||||
use std::io::Read;
|
use std::io::Read;
|
||||||
use std::{cell::RefCell, fs::File};
|
use std::{cell::RefCell, fs::File};
|
||||||
|
@ -129,7 +128,7 @@ mod test {
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn send_message() {
|
async fn send_message() {
|
||||||
let channel_id = "1106954414356168802".to_string();
|
let channel_id = "1106954414356168802".to_string();
|
||||||
let mut message = crate::api::schemas::MessageSendSchema::new(
|
let mut message = MessageSendSchema::new(
|
||||||
None,
|
None,
|
||||||
Some("A Message!".to_string()),
|
Some("A Message!".to_string()),
|
||||||
None,
|
None,
|
||||||
|
@ -149,7 +148,7 @@ mod test {
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let login_schema: LoginSchema = LoginSchema::new(
|
let login_schema: LoginSchema = LoginSchema::new(
|
||||||
AuthUsername::new("user@test.xyz".to_string()).unwrap(),
|
"user@test.xyz".to_string(),
|
||||||
"transrights".to_string(),
|
"transrights".to_string(),
|
||||||
None,
|
None,
|
||||||
None,
|
None,
|
||||||
|
@ -162,7 +161,7 @@ mod test {
|
||||||
println!("TOKEN: {}", token);
|
println!("TOKEN: {}", token);
|
||||||
let settings = login_result.settings;
|
let settings = login_result.settings;
|
||||||
let limits = instance.limits.clone();
|
let limits = instance.limits.clone();
|
||||||
let mut user = crate::api::types::User::new(
|
let mut user = UserMeta::new(
|
||||||
Rc::new(RefCell::new(instance)),
|
Rc::new(RefCell::new(instance)),
|
||||||
token,
|
token,
|
||||||
limits,
|
limits,
|
||||||
|
@ -185,7 +184,7 @@ mod test {
|
||||||
|
|
||||||
reader.read_to_end(&mut buffer).unwrap();
|
reader.read_to_end(&mut buffer).unwrap();
|
||||||
|
|
||||||
let attachment = crate::api::types::PartialDiscordFileAttachment {
|
let attachment = PartialDiscordFileAttachment {
|
||||||
id: None,
|
id: None,
|
||||||
filename: "README.md".to_string(),
|
filename: "README.md".to_string(),
|
||||||
description: None,
|
description: None,
|
||||||
|
@ -201,7 +200,7 @@ mod test {
|
||||||
content: buffer,
|
content: buffer,
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut message = crate::api::schemas::MessageSendSchema::new(
|
let mut message = MessageSendSchema::new(
|
||||||
None,
|
None,
|
||||||
Some("trans rights now".to_string()),
|
Some("trans rights now".to_string()),
|
||||||
None,
|
None,
|
||||||
|
@ -221,7 +220,7 @@ mod test {
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let login_schema: LoginSchema = LoginSchema::new(
|
let login_schema: LoginSchema = LoginSchema::new(
|
||||||
AuthUsername::new("user@test.xyz".to_string()).unwrap(),
|
"user@test.xyz".to_string(),
|
||||||
"transrights".to_string(),
|
"transrights".to_string(),
|
||||||
None,
|
None,
|
||||||
None,
|
None,
|
||||||
|
@ -233,7 +232,7 @@ mod test {
|
||||||
let token = login_result.token;
|
let token = login_result.token;
|
||||||
let settings = login_result.settings;
|
let settings = login_result.settings;
|
||||||
let limits = instance.limits.clone();
|
let limits = instance.limits.clone();
|
||||||
let mut user = crate::api::types::User::new(
|
let mut user = UserMeta::new(
|
||||||
Rc::new(RefCell::new(instance)),
|
Rc::new(RefCell::new(instance)),
|
||||||
token,
|
token,
|
||||||
limits,
|
limits,
|
||||||
|
|
|
@ -3,12 +3,12 @@ use serde_json::from_str;
|
||||||
use serde_json::to_string;
|
use serde_json::to_string;
|
||||||
|
|
||||||
use crate::api::limits::Limits;
|
use crate::api::limits::Limits;
|
||||||
use crate::api::schemas;
|
|
||||||
use crate::api::types;
|
|
||||||
use crate::errors::InstanceServerError;
|
use crate::errors::InstanceServerError;
|
||||||
|
use crate::instance::UserMeta;
|
||||||
use crate::limit::LimitedRequester;
|
use crate::limit::LimitedRequester;
|
||||||
|
use crate::types::{Channel, ChannelCreateSchema, Guild, GuildCreateResponse, GuildCreateSchema};
|
||||||
|
|
||||||
impl types::Guild {
|
impl Guild {
|
||||||
/// Creates a new guild with the given parameters.
|
/// Creates a new guild with the given parameters.
|
||||||
///
|
///
|
||||||
/// # Arguments
|
/// # Arguments
|
||||||
|
@ -38,9 +38,9 @@ impl types::Guild {
|
||||||
/// }
|
/// }
|
||||||
/// ```
|
/// ```
|
||||||
pub async fn create(
|
pub async fn create(
|
||||||
user: &mut types::User,
|
user: &mut UserMeta,
|
||||||
url_api: &str,
|
url_api: &str,
|
||||||
guild_create_schema: schemas::GuildCreateSchema,
|
guild_create_schema: GuildCreateSchema,
|
||||||
) -> Result<String, crate::errors::InstanceServerError> {
|
) -> Result<String, crate::errors::InstanceServerError> {
|
||||||
let url = format!("{}/guilds/", url_api);
|
let url = format!("{}/guilds/", url_api);
|
||||||
let limits_user = user.limits.get_as_mut();
|
let limits_user = user.limits.get_as_mut();
|
||||||
|
@ -62,7 +62,7 @@ impl types::Guild {
|
||||||
Ok(result) => result,
|
Ok(result) => result,
|
||||||
Err(e) => return Err(e),
|
Err(e) => return Err(e),
|
||||||
};
|
};
|
||||||
let id: types::GuildCreateResponse = from_str(&result.text().await.unwrap()).unwrap();
|
let id: GuildCreateResponse = from_str(&result.text().await.unwrap()).unwrap();
|
||||||
Ok(id.id)
|
Ok(id.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -91,7 +91,7 @@ impl types::Guild {
|
||||||
/// }
|
/// }
|
||||||
/// ```
|
/// ```
|
||||||
pub async fn delete(
|
pub async fn delete(
|
||||||
user: &mut types::User,
|
user: &mut UserMeta,
|
||||||
url_api: &str,
|
url_api: &str,
|
||||||
guild_id: String,
|
guild_id: String,
|
||||||
) -> Option<InstanceServerError> {
|
) -> Option<InstanceServerError> {
|
||||||
|
@ -134,14 +134,14 @@ impl types::Guild {
|
||||||
&self,
|
&self,
|
||||||
url_api: &str,
|
url_api: &str,
|
||||||
token: &str,
|
token: &str,
|
||||||
schema: schemas::ChannelCreateSchema,
|
schema: ChannelCreateSchema,
|
||||||
limits_user: &mut Limits,
|
limits_user: &mut Limits,
|
||||||
limits_instance: &mut Limits,
|
limits_instance: &mut Limits,
|
||||||
) -> Result<types::Channel, InstanceServerError> {
|
) -> Result<Channel, InstanceServerError> {
|
||||||
types::Channel::create(
|
Channel::create(
|
||||||
token,
|
token,
|
||||||
url_api,
|
url_api,
|
||||||
&self.id,
|
&self.id.to_string(),
|
||||||
schema,
|
schema,
|
||||||
limits_user,
|
limits_user,
|
||||||
limits_instance,
|
limits_instance,
|
||||||
|
@ -150,7 +150,7 @@ impl types::Guild {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl types::Channel {
|
impl Channel {
|
||||||
/// Sends a request to create a new channel in a guild.
|
/// Sends a request to create a new channel in a guild.
|
||||||
///
|
///
|
||||||
/// # Arguments
|
/// # Arguments
|
||||||
|
@ -169,10 +169,10 @@ impl types::Channel {
|
||||||
token: &str,
|
token: &str,
|
||||||
url_api: &str,
|
url_api: &str,
|
||||||
guild_id: &str,
|
guild_id: &str,
|
||||||
schema: schemas::ChannelCreateSchema,
|
schema: ChannelCreateSchema,
|
||||||
limits_user: &mut Limits,
|
limits_user: &mut Limits,
|
||||||
limits_instance: &mut Limits,
|
limits_instance: &mut Limits,
|
||||||
) -> Result<types::Channel, InstanceServerError> {
|
) -> Result<Channel, InstanceServerError> {
|
||||||
let request = Client::new()
|
let request = Client::new()
|
||||||
.post(format!("{}/guilds/{}/channels/", url_api, guild_id))
|
.post(format!("{}/guilds/{}/channels/", url_api, guild_id))
|
||||||
.bearer_auth(token)
|
.bearer_auth(token)
|
||||||
|
@ -190,7 +190,7 @@ impl types::Channel {
|
||||||
Ok(result) => result,
|
Ok(result) => result,
|
||||||
Err(e) => return Err(e),
|
Err(e) => return Err(e),
|
||||||
};
|
};
|
||||||
match from_str::<types::Channel>(&result.text().await.unwrap()) {
|
match from_str::<Channel>(&result.text().await.unwrap()) {
|
||||||
Ok(object) => Ok(object),
|
Ok(object) => Ok(object),
|
||||||
Err(e) => Err(InstanceServerError::RequestErrorError {
|
Err(e) => Err(InstanceServerError::RequestErrorError {
|
||||||
url: format!("{}/guilds/{}/channels/", url_api, guild_id),
|
url: format!("{}/guilds/{}/channels/", url_api, guild_id),
|
||||||
|
|
|
@ -2,13 +2,9 @@ pub mod auth;
|
||||||
pub mod channels;
|
pub mod channels;
|
||||||
pub mod guilds;
|
pub mod guilds;
|
||||||
pub mod policies;
|
pub mod policies;
|
||||||
pub mod schemas;
|
|
||||||
pub mod types;
|
|
||||||
pub mod users;
|
pub mod users;
|
||||||
|
|
||||||
pub use channels::messages::*;
|
pub use channels::messages::*;
|
||||||
pub use guilds::*;
|
pub use guilds::*;
|
||||||
pub use policies::instance::instance::*;
|
pub use policies::instance::instance::*;
|
||||||
pub use policies::instance::limits::*;
|
pub use policies::instance::limits::*;
|
||||||
pub use schemas::*;
|
|
||||||
pub use types::*;
|
|
||||||
|
|
|
@ -2,7 +2,8 @@ use reqwest::Client;
|
||||||
use serde_json::from_str;
|
use serde_json::from_str;
|
||||||
|
|
||||||
use crate::errors::InstanceServerError;
|
use crate::errors::InstanceServerError;
|
||||||
use crate::{api::types::InstancePolicies, instance::Instance};
|
use crate::instance::Instance;
|
||||||
|
use crate::types::GeneralConfiguration;
|
||||||
|
|
||||||
impl Instance {
|
impl Instance {
|
||||||
/**
|
/**
|
||||||
|
@ -10,7 +11,9 @@ impl Instance {
|
||||||
# Errors
|
# Errors
|
||||||
[`InstanceServerError`] - If the request fails.
|
[`InstanceServerError`] - If the request fails.
|
||||||
*/
|
*/
|
||||||
pub async fn instance_policies_schema(&self) -> Result<InstancePolicies, InstanceServerError> {
|
pub async fn general_configuration_schema(
|
||||||
|
&self,
|
||||||
|
) -> Result<GeneralConfiguration, InstanceServerError> {
|
||||||
let client = Client::new();
|
let client = Client::new();
|
||||||
let endpoint_url = self.urls.get_api().to_string() + "/policies/instance/";
|
let endpoint_url = self.urls.get_api().to_string() + "/policies/instance/";
|
||||||
let request = match client.get(&endpoint_url).send().await {
|
let request = match client.get(&endpoint_url).send().await {
|
||||||
|
@ -30,7 +33,7 @@ impl Instance {
|
||||||
}
|
}
|
||||||
|
|
||||||
let body = request.text().await.unwrap();
|
let body = request.text().await.unwrap();
|
||||||
let instance_policies_schema: InstancePolicies = from_str(&body).unwrap();
|
let instance_policies_schema: GeneralConfiguration = from_str(&body).unwrap();
|
||||||
Ok(instance_policies_schema)
|
Ok(instance_policies_schema)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -46,9 +49,9 @@ mod instance_policies_schema_test {
|
||||||
"http://localhost:3001".to_string(),
|
"http://localhost:3001".to_string(),
|
||||||
"http://localhost:3001".to_string(),
|
"http://localhost:3001".to_string(),
|
||||||
);
|
);
|
||||||
let limited_requester = LimitedRequester::new().await;
|
let _limited_requester = LimitedRequester::new().await;
|
||||||
let test_instance = Instance::new(urls.clone()).await.unwrap();
|
let test_instance = Instance::new(urls.clone()).await.unwrap();
|
||||||
|
|
||||||
let _schema = test_instance.instance_policies_schema().await.unwrap();
|
let _schema = test_instance.general_configuration_schema().await.unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,432 +0,0 @@
|
||||||
use regex::Regex;
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
use crate::errors::FieldFormatError;
|
|
||||||
|
|
||||||
use super::{Channel, Embed};
|
|
||||||
|
|
||||||
/**
|
|
||||||
A struct that represents a well-formed email address.
|
|
||||||
*/
|
|
||||||
#[derive(Clone, PartialEq, Eq, Debug)]
|
|
||||||
pub struct AuthEmail {
|
|
||||||
pub email: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl AuthEmail {
|
|
||||||
/**
|
|
||||||
Returns a new [`Result<AuthEmail, FieldFormatError>`].
|
|
||||||
## Arguments
|
|
||||||
The email address you want to validate.
|
|
||||||
## Errors
|
|
||||||
You will receive a [`FieldFormatError`], if:
|
|
||||||
- The email address is not in a valid format.
|
|
||||||
|
|
||||||
*/
|
|
||||||
pub fn new(email: String) -> Result<AuthEmail, FieldFormatError> {
|
|
||||||
let regex = Regex::new(r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$").unwrap();
|
|
||||||
if !regex.is_match(email.as_str()) {
|
|
||||||
return Err(FieldFormatError::EmailError);
|
|
||||||
}
|
|
||||||
Ok(AuthEmail { email })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
A struct that represents a well-formed username.
|
|
||||||
## Arguments
|
|
||||||
Please use new() to create a new instance of this struct.
|
|
||||||
## Errors
|
|
||||||
You will receive a [`FieldFormatError`], if:
|
|
||||||
- The username is not between 2 and 32 characters.
|
|
||||||
*/
|
|
||||||
#[derive(Clone, PartialEq, Eq, Debug)]
|
|
||||||
pub struct AuthUsername {
|
|
||||||
pub username: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl AuthUsername {
|
|
||||||
/**
|
|
||||||
Returns a new [`Result<AuthUsername, FieldFormatError>`].
|
|
||||||
## Arguments
|
|
||||||
The username you want to validate.
|
|
||||||
## Errors
|
|
||||||
You will receive a [`FieldFormatError`], if:
|
|
||||||
- The username is not between 2 and 32 characters.
|
|
||||||
*/
|
|
||||||
pub fn new(username: String) -> Result<AuthUsername, FieldFormatError> {
|
|
||||||
if username.len() < 2 || username.len() > 32 {
|
|
||||||
Err(FieldFormatError::UsernameError)
|
|
||||||
} else {
|
|
||||||
Ok(AuthUsername { username })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
A struct that represents a well-formed password.
|
|
||||||
## Arguments
|
|
||||||
Please use new() to create a new instance of this struct.
|
|
||||||
## Errors
|
|
||||||
You will receive a [`FieldFormatError`], if:
|
|
||||||
- The password is not between 1 and 72 characters.
|
|
||||||
*/
|
|
||||||
#[derive(Clone, PartialEq, Eq, Debug)]
|
|
||||||
pub struct AuthPassword {
|
|
||||||
pub password: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl AuthPassword {
|
|
||||||
/**
|
|
||||||
Returns a new [`Result<AuthPassword, FieldFormatError>`].
|
|
||||||
## Arguments
|
|
||||||
The password you want to validate.
|
|
||||||
## Errors
|
|
||||||
You will receive a [`FieldFormatError`], if:
|
|
||||||
- The password is not between 1 and 72 characters.
|
|
||||||
*/
|
|
||||||
pub fn new(password: String) -> Result<AuthPassword, FieldFormatError> {
|
|
||||||
if password.is_empty() || password.len() > 72 {
|
|
||||||
Err(FieldFormatError::PasswordError)
|
|
||||||
} else {
|
|
||||||
Ok(AuthPassword { password })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
A struct that represents a well-formed register request.
|
|
||||||
## Arguments
|
|
||||||
Please use new() to create a new instance of this struct.
|
|
||||||
## Errors
|
|
||||||
You will receive a [`FieldFormatError`], if:
|
|
||||||
- The username is not between 2 and 32 characters.
|
|
||||||
- The password is not between 1 and 72 characters.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
pub struct RegisterSchema {
|
|
||||||
username: String,
|
|
||||||
password: Option<String>,
|
|
||||||
consent: bool,
|
|
||||||
email: Option<String>,
|
|
||||||
fingerprint: Option<String>,
|
|
||||||
invite: Option<String>,
|
|
||||||
date_of_birth: Option<String>,
|
|
||||||
gift_code_sku_id: Option<String>,
|
|
||||||
captcha_key: Option<String>,
|
|
||||||
promotional_email_opt_in: Option<bool>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl RegisterSchema {
|
|
||||||
/**
|
|
||||||
Returns a new [`Result<RegisterSchema, FieldFormatError>`].
|
|
||||||
## Arguments
|
|
||||||
All but "String::username" and "bool::consent" are optional.
|
|
||||||
|
|
||||||
## Errors
|
|
||||||
You will receive a [`FieldFormatError`], if:
|
|
||||||
- The username is less than 2 or more than 32 characters in length
|
|
||||||
- You supply a `password` which is less than 1 or more than 72 characters in length.
|
|
||||||
|
|
||||||
These constraints have been defined [in the Spacebar-API](https://docs.spacebar.chat/routes/)
|
|
||||||
*/
|
|
||||||
pub fn new(
|
|
||||||
username: AuthUsername,
|
|
||||||
password: Option<AuthPassword>,
|
|
||||||
consent: bool,
|
|
||||||
email: Option<AuthEmail>,
|
|
||||||
fingerprint: Option<String>,
|
|
||||||
invite: Option<String>,
|
|
||||||
date_of_birth: Option<String>,
|
|
||||||
gift_code_sku_id: Option<String>,
|
|
||||||
captcha_key: Option<String>,
|
|
||||||
promotional_email_opt_in: Option<bool>,
|
|
||||||
) -> Result<RegisterSchema, FieldFormatError> {
|
|
||||||
let username = username.username;
|
|
||||||
|
|
||||||
let email_addr;
|
|
||||||
if email.is_some() {
|
|
||||||
email_addr = Some(email.unwrap().email);
|
|
||||||
} else {
|
|
||||||
email_addr = None;
|
|
||||||
}
|
|
||||||
|
|
||||||
let has_password;
|
|
||||||
if password.is_some() {
|
|
||||||
has_password = Some(password.unwrap().password);
|
|
||||||
} else {
|
|
||||||
has_password = None;
|
|
||||||
}
|
|
||||||
|
|
||||||
if !consent {
|
|
||||||
return Err(FieldFormatError::ConsentError);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(RegisterSchema {
|
|
||||||
username,
|
|
||||||
password: has_password,
|
|
||||||
consent,
|
|
||||||
email: email_addr,
|
|
||||||
fingerprint,
|
|
||||||
invite,
|
|
||||||
date_of_birth,
|
|
||||||
gift_code_sku_id,
|
|
||||||
captcha_key,
|
|
||||||
promotional_email_opt_in,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
A struct that represents a well-formed login request.
|
|
||||||
## Arguments
|
|
||||||
Please use new() to create a new instance of this struct.
|
|
||||||
## Errors
|
|
||||||
You will receive a [`FieldFormatError`], if:
|
|
||||||
- The username is not between 2 and 32 characters.
|
|
||||||
- The password is not between 1 and 72 characters.
|
|
||||||
*/
|
|
||||||
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
pub struct LoginSchema {
|
|
||||||
login: String,
|
|
||||||
password: String,
|
|
||||||
undelete: Option<bool>,
|
|
||||||
captcha_key: Option<String>,
|
|
||||||
login_source: Option<String>,
|
|
||||||
gift_code_sku_id: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl LoginSchema {
|
|
||||||
/**
|
|
||||||
Returns a new [`Result<LoginSchema, FieldFormatError>`].
|
|
||||||
## Arguments
|
|
||||||
login: The username you want to login with.
|
|
||||||
password: The password you want to login with.
|
|
||||||
undelete: Honestly no idea what this is for.
|
|
||||||
captcha_key: The captcha key you want to login with.
|
|
||||||
login_source: The login source.
|
|
||||||
gift_code_sku_id: The gift code sku id.
|
|
||||||
## Errors
|
|
||||||
You will receive a [`FieldFormatError`], if:
|
|
||||||
- The username is less than 2 or more than 32 characters in length
|
|
||||||
*/
|
|
||||||
pub fn new(
|
|
||||||
login: AuthUsername,
|
|
||||||
password: String,
|
|
||||||
undelete: Option<bool>,
|
|
||||||
captcha_key: Option<String>,
|
|
||||||
login_source: Option<String>,
|
|
||||||
gift_code_sku_id: Option<String>,
|
|
||||||
) -> Result<LoginSchema, FieldFormatError> {
|
|
||||||
let login = login.username;
|
|
||||||
Ok(LoginSchema {
|
|
||||||
login,
|
|
||||||
password,
|
|
||||||
undelete,
|
|
||||||
captcha_key,
|
|
||||||
login_source,
|
|
||||||
gift_code_sku_id,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
pub struct TotpSchema {
|
|
||||||
code: String,
|
|
||||||
ticket: String,
|
|
||||||
gift_code_sku_id: Option<String>,
|
|
||||||
login_source: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
pub struct MessageSendSchema {
|
|
||||||
#[serde(rename = "type")]
|
|
||||||
message_type: Option<i32>,
|
|
||||||
content: Option<String>,
|
|
||||||
nonce: Option<String>,
|
|
||||||
tts: Option<bool>,
|
|
||||||
embeds: Option<Vec<super::Embed>>,
|
|
||||||
allowed_mentions: Option<super::AllowedMention>,
|
|
||||||
message_reference: Option<super::MessageReference>,
|
|
||||||
components: Option<Vec<super::Component>>,
|
|
||||||
sticker_ids: Option<Vec<String>>,
|
|
||||||
pub attachments: Option<Vec<super::PartialDiscordFileAttachment>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
// make a new() method for MessageSendSchema
|
|
||||||
impl MessageSendSchema {
|
|
||||||
pub fn new(
|
|
||||||
message_type: Option<i32>,
|
|
||||||
content: Option<String>,
|
|
||||||
nonce: Option<String>,
|
|
||||||
tts: Option<bool>,
|
|
||||||
embeds: Option<Vec<Embed>>,
|
|
||||||
allowed_mentions: Option<super::AllowedMention>,
|
|
||||||
message_reference: Option<super::MessageReference>,
|
|
||||||
components: Option<Vec<super::Component>>,
|
|
||||||
sticker_ids: Option<Vec<String>>,
|
|
||||||
attachments: Option<Vec<super::PartialDiscordFileAttachment>>,
|
|
||||||
) -> MessageSendSchema {
|
|
||||||
MessageSendSchema {
|
|
||||||
message_type,
|
|
||||||
content,
|
|
||||||
nonce,
|
|
||||||
tts,
|
|
||||||
embeds,
|
|
||||||
allowed_mentions,
|
|
||||||
message_reference,
|
|
||||||
components,
|
|
||||||
sticker_ids,
|
|
||||||
attachments,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
pub struct GuildCreateSchema {
|
|
||||||
pub name: Option<String>,
|
|
||||||
pub region: Option<String>,
|
|
||||||
pub icon: Option<String>,
|
|
||||||
pub channels: Option<Vec<Channel>>,
|
|
||||||
pub guild_template_code: Option<String>,
|
|
||||||
pub system_channel_id: Option<String>,
|
|
||||||
pub rules_channel_id: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
pub struct UserModifySchema {
|
|
||||||
pub username: Option<String>,
|
|
||||||
pub avatar: Option<String>,
|
|
||||||
pub bio: Option<String>,
|
|
||||||
pub accent_color: Option<u64>,
|
|
||||||
pub banner: Option<String>,
|
|
||||||
pub current_password: Option<String>,
|
|
||||||
pub new_password: Option<String>,
|
|
||||||
pub code: Option<String>,
|
|
||||||
pub email: Option<String>,
|
|
||||||
pub discriminator: Option<i16>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
|
||||||
#[serde(rename_all = "snake_case")]
|
|
||||||
// TODO: Implement in polyphony/types
|
|
||||||
pub struct ChannelCreateSchema {
|
|
||||||
pub name: String,
|
|
||||||
#[serde(rename = "type")]
|
|
||||||
pub channel_type: Option<u8>,
|
|
||||||
pub topic: Option<String>,
|
|
||||||
pub icon: Option<String>,
|
|
||||||
pub bitrate: Option<i32>,
|
|
||||||
pub user_limit: Option<i32>,
|
|
||||||
pub rate_limit_per_user: Option<i32>,
|
|
||||||
pub position: Option<i32>,
|
|
||||||
pub permission_overwrites: Option<Vec<crate::api::types::PermissionOverwrite>>,
|
|
||||||
pub parent_id: Option<String>,
|
|
||||||
pub id: Option<String>,
|
|
||||||
pub nsfw: Option<bool>,
|
|
||||||
pub rtc_region: Option<String>,
|
|
||||||
pub default_auto_archive_duration: Option<i32>,
|
|
||||||
pub default_reaction_emoji: Option<String>,
|
|
||||||
pub flags: Option<i32>,
|
|
||||||
pub default_thread_rate_limit_per_user: Option<i32>,
|
|
||||||
pub video_quality_mode: Option<i32>,
|
|
||||||
}
|
|
||||||
|
|
||||||
// I know that some of these tests are... really really basic and unneccessary, but sometimes, I
|
|
||||||
// just feel like writing tests, so there you go :) -@bitfl0wer
|
|
||||||
#[cfg(test)]
|
|
||||||
mod schemas_tests {
|
|
||||||
use super::*;
|
|
||||||
use crate::errors::FieldFormatError;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn password_too_short() {
|
|
||||||
assert_eq!(
|
|
||||||
AuthPassword::new("".to_string()),
|
|
||||||
Err(FieldFormatError::PasswordError)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn password_too_long() {
|
|
||||||
let mut long_pw = String::new();
|
|
||||||
for _ in 0..73 {
|
|
||||||
long_pw += "a";
|
|
||||||
}
|
|
||||||
assert_eq!(
|
|
||||||
AuthPassword::new(long_pw),
|
|
||||||
Err(FieldFormatError::PasswordError)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn username_too_short() {
|
|
||||||
assert_eq!(
|
|
||||||
AuthUsername::new("T".to_string()),
|
|
||||||
Err(FieldFormatError::UsernameError)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn username_too_long() {
|
|
||||||
let mut long_un = String::new();
|
|
||||||
for _ in 0..33 {
|
|
||||||
long_un += "a";
|
|
||||||
}
|
|
||||||
assert_eq!(
|
|
||||||
AuthUsername::new(long_un),
|
|
||||||
Err(FieldFormatError::UsernameError)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn consent_false() {
|
|
||||||
assert_eq!(
|
|
||||||
RegisterSchema::new(
|
|
||||||
AuthUsername::new("Test".to_string()).unwrap(),
|
|
||||||
None,
|
|
||||||
false,
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
),
|
|
||||||
Err(FieldFormatError::ConsentError)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn invalid_email() {
|
|
||||||
assert_eq!(
|
|
||||||
AuthEmail::new("p@p.p".to_string()),
|
|
||||||
Err(FieldFormatError::EmailError)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn valid_email() {
|
|
||||||
let reg = RegisterSchema::new(
|
|
||||||
AuthUsername::new("Testy".to_string()).unwrap(),
|
|
||||||
None,
|
|
||||||
true,
|
|
||||||
Some(AuthEmail::new("me@mail.de".to_string()).unwrap()),
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
);
|
|
||||||
assert_ne!(reg, Err(FieldFormatError::EmailError));
|
|
||||||
}
|
|
||||||
}
|
|
1482
src/api/types.rs
1482
src/api/types.rs
File diff suppressed because it is too large
Load Diff
|
@ -2,17 +2,14 @@ use reqwest::Client;
|
||||||
use serde_json::{from_str, to_string};
|
use serde_json::{from_str, to_string};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
api::{
|
api::limits::Limits,
|
||||||
limits::Limits,
|
|
||||||
types::{User, UserObject},
|
|
||||||
UserModifySchema, UserSettings,
|
|
||||||
},
|
|
||||||
errors::InstanceServerError,
|
errors::InstanceServerError,
|
||||||
instance::Instance,
|
instance::{Instance, UserMeta},
|
||||||
limit::LimitedRequester,
|
limit::LimitedRequester,
|
||||||
|
types::{User, UserModifySchema, UserSettings},
|
||||||
};
|
};
|
||||||
|
|
||||||
impl User {
|
impl UserMeta {
|
||||||
/**
|
/**
|
||||||
Get a user object by id, or get the current user.
|
Get a user object by id, or get the current user.
|
||||||
# Arguments
|
# Arguments
|
||||||
|
@ -28,7 +25,7 @@ impl User {
|
||||||
url_api: &String,
|
url_api: &String,
|
||||||
id: Option<&String>,
|
id: Option<&String>,
|
||||||
instance_limits: &mut Limits,
|
instance_limits: &mut Limits,
|
||||||
) -> Result<UserObject, InstanceServerError> {
|
) -> Result<User, InstanceServerError> {
|
||||||
let url: String;
|
let url: String;
|
||||||
if id.is_none() {
|
if id.is_none() {
|
||||||
url = format!("{}/users/@me/", url_api);
|
url = format!("{}/users/@me/", url_api);
|
||||||
|
@ -49,7 +46,7 @@ impl User {
|
||||||
{
|
{
|
||||||
Ok(result) => {
|
Ok(result) => {
|
||||||
let result_text = result.text().await.unwrap();
|
let result_text = result.text().await.unwrap();
|
||||||
Ok(serde_json::from_str::<UserObject>(&result_text).unwrap())
|
Ok(serde_json::from_str::<User>(&result_text).unwrap())
|
||||||
}
|
}
|
||||||
Err(e) => Err(e),
|
Err(e) => Err(e),
|
||||||
}
|
}
|
||||||
|
@ -91,7 +88,7 @@ impl User {
|
||||||
pub async fn modify(
|
pub async fn modify(
|
||||||
&mut self,
|
&mut self,
|
||||||
modify_schema: UserModifySchema,
|
modify_schema: UserModifySchema,
|
||||||
) -> Result<UserObject, InstanceServerError> {
|
) -> Result<User, InstanceServerError> {
|
||||||
if modify_schema.new_password.is_some()
|
if modify_schema.new_password.is_some()
|
||||||
|| modify_schema.email.is_some()
|
|| modify_schema.email.is_some()
|
||||||
|| modify_schema.code.is_some()
|
|| modify_schema.code.is_some()
|
||||||
|
@ -118,7 +115,7 @@ impl User {
|
||||||
Ok(response) => response,
|
Ok(response) => response,
|
||||||
Err(e) => return Err(e),
|
Err(e) => return Err(e),
|
||||||
};
|
};
|
||||||
let user_updated: UserObject = from_str(&result.text().await.unwrap()).unwrap();
|
let user_updated: User = from_str(&result.text().await.unwrap()).unwrap();
|
||||||
let _ = std::mem::replace(
|
let _ = std::mem::replace(
|
||||||
&mut self.object.as_mut().unwrap(),
|
&mut self.object.as_mut().unwrap(),
|
||||||
&mut user_updated.clone(),
|
&mut user_updated.clone(),
|
||||||
|
@ -171,8 +168,8 @@ impl Instance {
|
||||||
&mut self,
|
&mut self,
|
||||||
token: String,
|
token: String,
|
||||||
id: Option<&String>,
|
id: Option<&String>,
|
||||||
) -> Result<UserObject, InstanceServerError> {
|
) -> Result<User, InstanceServerError> {
|
||||||
User::get(
|
UserMeta::get(
|
||||||
&token,
|
&token,
|
||||||
&self.urls.get_api().to_string(),
|
&self.urls.get_api().to_string(),
|
||||||
id,
|
id,
|
||||||
|
|
487
src/gateway.rs
487
src/gateway.rs
|
@ -1,12 +1,11 @@
|
||||||
use std::sync::Arc;
|
|
||||||
use crate::api::types::*;
|
|
||||||
use crate::api::WebSocketEvent;
|
|
||||||
use crate::errors::ObserverError;
|
use crate::errors::ObserverError;
|
||||||
use crate::gateway::events::Events;
|
use crate::gateway::events::Events;
|
||||||
|
use crate::types;
|
||||||
|
use futures_util::stream::SplitSink;
|
||||||
use futures_util::SinkExt;
|
use futures_util::SinkExt;
|
||||||
use futures_util::StreamExt;
|
use futures_util::StreamExt;
|
||||||
use futures_util::stream::SplitSink;
|
|
||||||
use native_tls::TlsConnector;
|
use native_tls::TlsConnector;
|
||||||
|
use std::sync::Arc;
|
||||||
use tokio::net::TcpStream;
|
use tokio::net::TcpStream;
|
||||||
use tokio::sync::mpsc;
|
use tokio::sync::mpsc;
|
||||||
use tokio::sync::mpsc::error::TryRecvError;
|
use tokio::sync::mpsc::error::TryRecvError;
|
||||||
|
@ -16,7 +15,7 @@ use tokio::task;
|
||||||
use tokio::time;
|
use tokio::time;
|
||||||
use tokio::time::Instant;
|
use tokio::time::Instant;
|
||||||
use tokio_tungstenite::MaybeTlsStream;
|
use tokio_tungstenite::MaybeTlsStream;
|
||||||
use tokio_tungstenite::{WebSocketStream, Connector, connect_async_tls_with_config};
|
use tokio_tungstenite::{connect_async_tls_with_config, Connector, WebSocketStream};
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
/**
|
/**
|
||||||
|
@ -28,14 +27,25 @@ Using this handle you can also send Gateway Events directly.
|
||||||
pub struct GatewayHandle {
|
pub struct GatewayHandle {
|
||||||
pub url: String,
|
pub url: String,
|
||||||
pub events: Arc<Mutex<Events>>,
|
pub events: Arc<Mutex<Events>>,
|
||||||
pub websocket_tx: Arc<Mutex<SplitSink<WebSocketStream<MaybeTlsStream<TcpStream>>, tokio_tungstenite::tungstenite::Message>>>,
|
pub websocket_tx: Arc<
|
||||||
|
Mutex<
|
||||||
|
SplitSink<
|
||||||
|
WebSocketStream<MaybeTlsStream<TcpStream>>,
|
||||||
|
tokio_tungstenite::tungstenite::Message,
|
||||||
|
>,
|
||||||
|
>,
|
||||||
|
>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl GatewayHandle {
|
impl GatewayHandle {
|
||||||
/// Sends json to the gateway with an opcode
|
/// Sends json to the gateway with an opcode
|
||||||
async fn send_json_event(&self, op: u8, to_send: serde_json::Value) {
|
async fn send_json_event(&self, op: u8, to_send: serde_json::Value) {
|
||||||
|
let gateway_payload = types::GatewayPayload {
|
||||||
let gateway_payload = GatewayPayload { op, d: Some(to_send), s: None, t: None };
|
op,
|
||||||
|
d: Some(to_send),
|
||||||
|
s: None,
|
||||||
|
t: None,
|
||||||
|
};
|
||||||
|
|
||||||
let payload_json = serde_json::to_string(&gateway_payload).unwrap();
|
let payload_json = serde_json::to_string(&gateway_payload).unwrap();
|
||||||
|
|
||||||
|
@ -45,8 +55,7 @@ impl GatewayHandle {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sends an identify event to the gateway
|
/// Sends an identify event to the gateway
|
||||||
pub async fn send_identify(&self, to_send: GatewayIdentifyPayload) {
|
pub async fn send_identify(&self, to_send: types::GatewayIdentifyPayload) {
|
||||||
|
|
||||||
let to_send_value = serde_json::to_value(&to_send).unwrap();
|
let to_send_value = serde_json::to_value(&to_send).unwrap();
|
||||||
|
|
||||||
println!("GW: Sending Identify..");
|
println!("GW: Sending Identify..");
|
||||||
|
@ -55,8 +64,7 @@ impl GatewayHandle {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sends a resume event to the gateway
|
/// Sends a resume event to the gateway
|
||||||
pub async fn send_resume(&self, to_send: GatewayResume) {
|
pub async fn send_resume(&self, to_send: types::GatewayResume) {
|
||||||
|
|
||||||
let to_send_value = serde_json::to_value(&to_send).unwrap();
|
let to_send_value = serde_json::to_value(&to_send).unwrap();
|
||||||
|
|
||||||
println!("GW: Sending Resume..");
|
println!("GW: Sending Resume..");
|
||||||
|
@ -65,8 +73,7 @@ impl GatewayHandle {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sends an update presence event to the gateway
|
/// Sends an update presence event to the gateway
|
||||||
pub async fn send_update_presence(&self, to_send: PresenceUpdate) {
|
pub async fn send_update_presence(&self, to_send: types::PresenceUpdate) {
|
||||||
|
|
||||||
let to_send_value = serde_json::to_value(&to_send).unwrap();
|
let to_send_value = serde_json::to_value(&to_send).unwrap();
|
||||||
|
|
||||||
println!("GW: Sending Presence Update..");
|
println!("GW: Sending Presence Update..");
|
||||||
|
@ -75,8 +82,7 @@ impl GatewayHandle {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sends a Request Guild Members to the server
|
/// Sends a Request Guild Members to the server
|
||||||
pub async fn send_request_guild_members(&self, to_send: GatewayRequestGuildMembers) {
|
pub async fn send_request_guild_members(&self, to_send: types::GatewayRequestGuildMembers) {
|
||||||
|
|
||||||
let to_send_value = serde_json::to_value(&to_send).unwrap();
|
let to_send_value = serde_json::to_value(&to_send).unwrap();
|
||||||
|
|
||||||
println!("GW: Sending Request Guild Members..");
|
println!("GW: Sending Request Guild Members..");
|
||||||
|
@ -85,8 +91,7 @@ impl GatewayHandle {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sends a Request Guild Members to the server
|
/// Sends a Request Guild Members to the server
|
||||||
pub async fn send_update_voice_state(&self, to_send: GatewayVoiceStateUpdate) {
|
pub async fn send_update_voice_state(&self, to_send: types::GatewayVoiceStateUpdate) {
|
||||||
|
|
||||||
let to_send_value = serde_json::to_value(&to_send).unwrap();
|
let to_send_value = serde_json::to_value(&to_send).unwrap();
|
||||||
|
|
||||||
println!("GW: Sending Voice State Update..");
|
println!("GW: Sending Voice State Update..");
|
||||||
|
@ -98,14 +103,20 @@ impl GatewayHandle {
|
||||||
pub struct Gateway {
|
pub struct Gateway {
|
||||||
pub events: Arc<Mutex<Events>>,
|
pub events: Arc<Mutex<Events>>,
|
||||||
heartbeat_handler: Option<HeartbeatHandler>,
|
heartbeat_handler: Option<HeartbeatHandler>,
|
||||||
pub websocket_tx: Arc<Mutex<SplitSink<WebSocketStream<MaybeTlsStream<TcpStream>>, tokio_tungstenite::tungstenite::Message>>>
|
pub websocket_tx: Arc<
|
||||||
|
Mutex<
|
||||||
|
SplitSink<
|
||||||
|
WebSocketStream<MaybeTlsStream<TcpStream>>,
|
||||||
|
tokio_tungstenite::tungstenite::Message,
|
||||||
|
>,
|
||||||
|
>,
|
||||||
|
>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Gateway {
|
impl Gateway {
|
||||||
pub async fn new(
|
pub async fn new(
|
||||||
websocket_url: String,
|
websocket_url: String,
|
||||||
) -> Result<GatewayHandle, tokio_tungstenite::tungstenite::Error> {
|
) -> Result<GatewayHandle, tokio_tungstenite::tungstenite::Error> {
|
||||||
|
|
||||||
let (ws_stream, _) = match connect_async_tls_with_config(
|
let (ws_stream, _) = match connect_async_tls_with_config(
|
||||||
&websocket_url,
|
&websocket_url,
|
||||||
None,
|
None,
|
||||||
|
@ -123,24 +134,37 @@ impl Gateway {
|
||||||
|
|
||||||
let shared_tx = Arc::new(Mutex::new(ws_tx));
|
let shared_tx = Arc::new(Mutex::new(ws_tx));
|
||||||
|
|
||||||
let mut gateway = Gateway { events: Arc::new(Mutex::new(Events::default())), heartbeat_handler: None, websocket_tx: shared_tx.clone() };
|
let mut gateway = Gateway {
|
||||||
|
events: Arc::new(Mutex::new(Events::default())),
|
||||||
|
heartbeat_handler: None,
|
||||||
|
websocket_tx: shared_tx.clone(),
|
||||||
|
};
|
||||||
|
|
||||||
let shared_events = gateway.events.clone();
|
let shared_events = gateway.events.clone();
|
||||||
|
|
||||||
// Wait for the first hello and then spawn both tasks so we avoid nested tasks
|
// Wait for the first hello and then spawn both tasks so we avoid nested tasks
|
||||||
// This automatically spawns the heartbeat task, but from the main thread
|
// This automatically spawns the heartbeat task, but from the main thread
|
||||||
let msg = ws_rx.next().await.unwrap().unwrap();
|
let msg = ws_rx.next().await.unwrap().unwrap();
|
||||||
let gateway_payload: GatewayPayload = serde_json::from_str(msg.to_text().unwrap()).unwrap();
|
let gateway_payload: types::GatewayPayload =
|
||||||
|
serde_json::from_str(msg.to_text().unwrap()).unwrap();
|
||||||
|
|
||||||
if gateway_payload.op != 10 {
|
if gateway_payload.op != 10 {
|
||||||
println!("Recieved non hello on gateway init, what is happening?");
|
println!("Recieved non hello on gateway init, what is happening?");
|
||||||
return Err(tokio_tungstenite::tungstenite::Error::Protocol(tokio_tungstenite::tungstenite::error::ProtocolError::InvalidOpcode(gateway_payload.op)))
|
return Err(tokio_tungstenite::tungstenite::Error::Protocol(
|
||||||
|
tokio_tungstenite::tungstenite::error::ProtocolError::InvalidOpcode(
|
||||||
|
gateway_payload.op,
|
||||||
|
),
|
||||||
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
println!("GW: Received Hello");
|
println!("GW: Received Hello");
|
||||||
|
|
||||||
let gateway_hello: HelloData = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let gateway_hello: types::HelloData =
|
||||||
gateway.heartbeat_handler = Some(HeartbeatHandler::new(gateway_hello.heartbeat_interval, shared_tx.clone()));
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
gateway.heartbeat_handler = Some(HeartbeatHandler::new(
|
||||||
|
gateway_hello.heartbeat_interval,
|
||||||
|
shared_tx.clone(),
|
||||||
|
));
|
||||||
|
|
||||||
// Now we can continously check for messages in a different task, since we aren't going to receive another hello
|
// Now we can continously check for messages in a different task, since we aren't going to receive another hello
|
||||||
task::spawn(async move {
|
task::spawn(async move {
|
||||||
|
@ -162,14 +186,13 @@ impl Gateway {
|
||||||
|
|
||||||
/// This handles a message as a websocket event and updates its events along with the events' observers
|
/// This handles a message as a websocket event and updates its events along with the events' observers
|
||||||
pub async fn handle_event(&mut self, msg: tokio_tungstenite::tungstenite::Message) {
|
pub async fn handle_event(&mut self, msg: tokio_tungstenite::tungstenite::Message) {
|
||||||
|
|
||||||
if msg.to_string() == String::new() {
|
if msg.to_string() == String::new() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let msg_string = msg.to_string();
|
let msg_string = msg.to_string();
|
||||||
|
|
||||||
let gateway_payload: GatewayPayload = serde_json::from_str(&msg_string).unwrap();
|
let gateway_payload: types::GatewayPayload = serde_json::from_str(&msg_string).unwrap();
|
||||||
|
|
||||||
// See https://discord.com/developers/docs/topics/opcodes-and-status-codes#gateway-gateway-opcodes
|
// See https://discord.com/developers/docs/topics/opcodes-and-status-codes#gateway-gateway-opcodes
|
||||||
match gateway_payload.op {
|
match gateway_payload.op {
|
||||||
|
@ -183,7 +206,8 @@ impl Gateway {
|
||||||
// See https://discord.com/developers/docs/topics/gateway-events#receive-events
|
// See https://discord.com/developers/docs/topics/gateway-events#receive-events
|
||||||
match gateway_payload_t.as_str() {
|
match gateway_payload_t.as_str() {
|
||||||
"READY" => {
|
"READY" => {
|
||||||
let _data: GatewayReady = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let _data: types::GatewayReady =
|
||||||
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
}
|
}
|
||||||
"RESUMED" => {}
|
"RESUMED" => {}
|
||||||
"APPLICATION_COMMAND_PERMISSIONS_UPDATE" => {}
|
"APPLICATION_COMMAND_PERMISSIONS_UPDATE" => {}
|
||||||
|
@ -192,65 +216,145 @@ impl Gateway {
|
||||||
"AUTO_MODERATION_RULE_DELETE" => {}
|
"AUTO_MODERATION_RULE_DELETE" => {}
|
||||||
"AUTO_MODERATION_ACTION_EXECUTION" => {}
|
"AUTO_MODERATION_ACTION_EXECUTION" => {}
|
||||||
"CHANNEL_CREATE" => {
|
"CHANNEL_CREATE" => {
|
||||||
let channel: Channel = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let channel: types::Channel =
|
||||||
let new_data = ChannelCreate {channel};
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
self.events.lock().await.channel.create.update_data(new_data).await;
|
let new_data = types::ChannelCreate { channel };
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.channel
|
||||||
|
.create
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"CHANNEL_UPDATE" => {
|
"CHANNEL_UPDATE" => {
|
||||||
let channel: Channel = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let channel: types::Channel =
|
||||||
let new_data = ChannelUpdate {channel};
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
self.events.lock().await.channel.update.update_data(new_data).await;
|
let new_data = types::ChannelUpdate { channel };
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.channel
|
||||||
|
.update
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"CHANNEL_DELETE" => {
|
"CHANNEL_DELETE" => {
|
||||||
let channel: Channel = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let channel: types::Channel =
|
||||||
let new_data = ChannelDelete {channel};
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
self.events.lock().await.channel.delete.update_data(new_data).await;
|
let new_data = types::ChannelDelete { channel };
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.channel
|
||||||
|
.delete
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"CHANNEL_PINS_UPDATE" => {
|
"CHANNEL_PINS_UPDATE" => {
|
||||||
let new_data: ChannelPinsUpdate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let new_data: types::ChannelPinsUpdate =
|
||||||
self.events.lock().await.channel.pins_update.update_data(new_data).await;
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.channel
|
||||||
|
.pins_update
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"THREAD_CREATE" => {
|
"THREAD_CREATE" => {
|
||||||
let thread: Channel = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let thread: types::Channel =
|
||||||
let new_data = ThreadCreate {thread};
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
self.events.lock().await.thread.create.update_data(new_data).await;
|
let new_data = types::ThreadCreate { thread };
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.thread
|
||||||
|
.create
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"THREAD_UPDATE" => {
|
"THREAD_UPDATE" => {
|
||||||
let thread: Channel = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let thread: types::Channel =
|
||||||
let new_data = ThreadUpdate {thread};
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
self.events.lock().await.thread.update.update_data(new_data).await;
|
let new_data = types::ThreadUpdate { thread };
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.thread
|
||||||
|
.update
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"THREAD_DELETE" => {
|
"THREAD_DELETE" => {
|
||||||
let thread: Channel = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let thread: types::Channel =
|
||||||
let new_data = ThreadDelete {thread};
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
self.events.lock().await.thread.delete.update_data(new_data).await;
|
let new_data = types::ThreadDelete { thread };
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.thread
|
||||||
|
.delete
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"THREAD_LIST_SYNC" => {
|
"THREAD_LIST_SYNC" => {
|
||||||
let new_data: ThreadListSync = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let new_data: types::ThreadListSync =
|
||||||
self.events.lock().await.thread.list_sync.update_data(new_data).await;
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.thread
|
||||||
|
.list_sync
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"THREAD_MEMBER_UPDATE" => {
|
"THREAD_MEMBER_UPDATE" => {
|
||||||
let new_data: ThreadMemberUpdate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let new_data: types::ThreadMemberUpdate =
|
||||||
self.events.lock().await.thread.member_update.update_data(new_data).await;
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.thread
|
||||||
|
.member_update
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"THREAD_MEMBERS_UPDATE" => {
|
"THREAD_MEMBERS_UPDATE" => {
|
||||||
let new_data: ThreadMembersUpdate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let new_data: types::ThreadMembersUpdate =
|
||||||
self.events.lock().await.thread.members_update.update_data(new_data).await;
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.thread
|
||||||
|
.members_update
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"GUILD_CREATE" => {
|
"GUILD_CREATE" => {
|
||||||
let new_data: GuildCreate = serde_json::from_str(&msg_string).unwrap();
|
let new_data: types::GuildCreate =
|
||||||
self.events.lock().await.guild.create.update_data(new_data).await;
|
serde_json::from_str(&msg_string).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.guild
|
||||||
|
.create
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"GUILD_UPDATE" => {}
|
"GUILD_UPDATE" => {}
|
||||||
"GUILD_DELETE" => {
|
"GUILD_DELETE" => {
|
||||||
let _new_data: UnavailableGuild = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let _new_data: types::UnavailableGuild =
|
||||||
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
}
|
}
|
||||||
"GUILD_AUDIT_LOG_ENTRY_CREATE" => {}
|
"GUILD_AUDIT_LOG_ENTRY_CREATE" => {}
|
||||||
"GUILD_BAN_ADD" => {
|
"GUILD_BAN_ADD" => {
|
||||||
let _new_data: GuildBanAdd = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let _new_data: types::GuildBanAdd =
|
||||||
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
}
|
}
|
||||||
"GUILD_BAN_REMOVE" => {
|
"GUILD_BAN_REMOVE" => {
|
||||||
let _new_data: GuildBanRemove = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let _new_data: types::GuildBanRemove =
|
||||||
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
}
|
}
|
||||||
"GUILD_EMOJIS_UPDATE" => {}
|
"GUILD_EMOJIS_UPDATE" => {}
|
||||||
"GUILD_STICKERS_UPDATE" => {}
|
"GUILD_STICKERS_UPDATE" => {}
|
||||||
|
@ -274,40 +378,103 @@ impl Gateway {
|
||||||
"INVITE_CREATE" => {}
|
"INVITE_CREATE" => {}
|
||||||
"INVITE_DELETE" => {}
|
"INVITE_DELETE" => {}
|
||||||
"MESSAGE_CREATE" => {
|
"MESSAGE_CREATE" => {
|
||||||
let new_data: MessageCreate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let new_data: types::MessageCreate =
|
||||||
self.events.lock().await.message.create.update_data(new_data).await;
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.message
|
||||||
|
.create
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"MESSAGE_UPDATE" => {
|
"MESSAGE_UPDATE" => {
|
||||||
let new_data: MessageUpdate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let new_data: types::MessageUpdate =
|
||||||
self.events.lock().await.message.update.update_data(new_data).await;
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.message
|
||||||
|
.update
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"MESSAGE_DELETE" => {
|
"MESSAGE_DELETE" => {
|
||||||
let new_data: MessageDelete = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let new_data: types::MessageDelete =
|
||||||
self.events.lock().await.message.delete.update_data(new_data).await;
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.message
|
||||||
|
.delete
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"MESSAGE_DELETE_BULK" => {
|
"MESSAGE_DELETE_BULK" => {
|
||||||
let new_data: MessageDeleteBulk = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let new_data: types::MessageDeleteBulk =
|
||||||
self.events.lock().await.message.delete_bulk.update_data(new_data).await;
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.message
|
||||||
|
.delete_bulk
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"MESSAGE_REACTION_ADD" => {
|
"MESSAGE_REACTION_ADD" => {
|
||||||
let new_data: MessageReactionAdd = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let new_data: types::MessageReactionAdd =
|
||||||
self.events.lock().await.message.reaction_add.update_data(new_data).await;
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.message
|
||||||
|
.reaction_add
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"MESSAGE_REACTION_REMOVE" => {
|
"MESSAGE_REACTION_REMOVE" => {
|
||||||
let new_data: MessageReactionRemove = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let new_data: types::MessageReactionRemove =
|
||||||
self.events.lock().await.message.reaction_remove.update_data(new_data).await;
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.message
|
||||||
|
.reaction_remove
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"MESSAGE_REACTION_REMOVE_ALL" => {
|
"MESSAGE_REACTION_REMOVE_ALL" => {
|
||||||
let new_data: MessageReactionRemoveAll = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let new_data: types::MessageReactionRemoveAll =
|
||||||
self.events.lock().await.message.reaction_remove_all.update_data(new_data).await;
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.message
|
||||||
|
.reaction_remove_all
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"MESSAGE_REACTION_REMOVE_EMOJI" => {
|
"MESSAGE_REACTION_REMOVE_EMOJI" => {
|
||||||
let new_data: MessageReactionRemoveEmoji= serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let new_data: types::MessageReactionRemoveEmoji =
|
||||||
self.events.lock().await.message.reaction_remove_emoji.update_data(new_data).await;
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.message
|
||||||
|
.reaction_remove_emoji
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"PRESENCE_UPDATE" => {
|
"PRESENCE_UPDATE" => {
|
||||||
let new_data: PresenceUpdate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let new_data: types::PresenceUpdate =
|
||||||
self.events.lock().await.user.presence_update.update_data(new_data).await;
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.user
|
||||||
|
.presence_update
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"STAGE_INSTANCE_CREATE" => {}
|
"STAGE_INSTANCE_CREATE" => {}
|
||||||
"STAGE_INSTANCE_UPDATE" => {}
|
"STAGE_INSTANCE_UPDATE" => {}
|
||||||
|
@ -315,27 +482,47 @@ impl Gateway {
|
||||||
// Not documented in discord docs, I assume this isnt for bots / apps but is for users?
|
// Not documented in discord docs, I assume this isnt for bots / apps but is for users?
|
||||||
"SESSIONS_REPLACE" => {}
|
"SESSIONS_REPLACE" => {}
|
||||||
"TYPING_START" => {
|
"TYPING_START" => {
|
||||||
let new_data: TypingStartEvent = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let new_data: types::TypingStartEvent =
|
||||||
self.events.lock().await.user.typing_start_event.update_data(new_data).await;
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.user
|
||||||
|
.typing_start_event
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"USER_UPDATE" => {
|
"USER_UPDATE" => {
|
||||||
let user: UserObject = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
let user: types::User =
|
||||||
let new_data = UserUpdate {user};
|
serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
|
||||||
self.events.lock().await.user.update.update_data(new_data).await;
|
let new_data = types::UserUpdate { user };
|
||||||
|
self.events
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.user
|
||||||
|
.update
|
||||||
|
.update_data(new_data)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
"VOICE_STATE_UPDATE" => {}
|
"VOICE_STATE_UPDATE" => {}
|
||||||
"VOICE_SERVER_UPDATE" => {}
|
"VOICE_SERVER_UPDATE" => {}
|
||||||
"WEBHOOKS_UPDATE" => {}
|
"WEBHOOKS_UPDATE" => {}
|
||||||
_ => {panic!("Invalid gateway event ({})", &gateway_payload_t)}
|
_ => {
|
||||||
|
panic!("Invalid gateway event ({})", &gateway_payload_t)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Heartbeat
|
// Heartbeat
|
||||||
// We received a heartbeat from the server
|
// We received a heartbeat from the server
|
||||||
1 => {}
|
1 => {}
|
||||||
// Reconnect
|
// Reconnect
|
||||||
7 => {todo!()}
|
7 => {
|
||||||
|
todo!()
|
||||||
|
}
|
||||||
// Invalid Session
|
// Invalid Session
|
||||||
9 => {todo!()}
|
9 => {
|
||||||
|
todo!()
|
||||||
|
}
|
||||||
// Hello
|
// Hello
|
||||||
// Starts our heartbeat
|
// Starts our heartbeat
|
||||||
// We should have already handled this in gateway init
|
// We should have already handled this in gateway init
|
||||||
|
@ -346,17 +533,32 @@ impl Gateway {
|
||||||
11 => {
|
11 => {
|
||||||
println!("GW: Received Heartbeat ACK");
|
println!("GW: Received Heartbeat ACK");
|
||||||
}
|
}
|
||||||
2 | 3 | 4 | 6 | 8 => {panic!("Received Gateway op code that's meant to be sent, not received ({})", gateway_payload.op)}
|
2 | 3 | 4 | 6 | 8 => {
|
||||||
_ => {panic!("Received Invalid Gateway op code ({})", gateway_payload.op)}
|
panic!(
|
||||||
|
"Received Gateway op code that's meant to be sent, not received ({})",
|
||||||
|
gateway_payload.op
|
||||||
|
)
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
panic!("Received Invalid Gateway op code ({})", gateway_payload.op)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If we have an active heartbeat thread and we received a seq number we should let it know
|
// If we have an active heartbeat thread and we received a seq number we should let it know
|
||||||
if gateway_payload.s.is_some() {
|
if gateway_payload.s.is_some() {
|
||||||
if self.heartbeat_handler.is_some() {
|
if self.heartbeat_handler.is_some() {
|
||||||
|
let heartbeat_communication = HeartbeatThreadCommunication {
|
||||||
|
op: gateway_payload.op,
|
||||||
|
d: gateway_payload.s.unwrap(),
|
||||||
|
};
|
||||||
|
|
||||||
let heartbeat_communication = HeartbeatThreadCommunication { op: gateway_payload.op, d: gateway_payload.s.unwrap() };
|
self.heartbeat_handler
|
||||||
|
.as_mut()
|
||||||
self.heartbeat_handler.as_mut().unwrap().tx.send(heartbeat_communication).await.unwrap();
|
.unwrap()
|
||||||
|
.tx
|
||||||
|
.send(heartbeat_communication)
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -372,7 +574,17 @@ struct HeartbeatHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl HeartbeatHandler {
|
impl HeartbeatHandler {
|
||||||
pub fn new(heartbeat_interval: u128, websocket_tx: Arc<Mutex<SplitSink<WebSocketStream<MaybeTlsStream<TcpStream>>, tokio_tungstenite::tungstenite::Message>>>) -> HeartbeatHandler {
|
pub fn new(
|
||||||
|
heartbeat_interval: u128,
|
||||||
|
websocket_tx: Arc<
|
||||||
|
Mutex<
|
||||||
|
SplitSink<
|
||||||
|
WebSocketStream<MaybeTlsStream<TcpStream>>,
|
||||||
|
tokio_tungstenite::tungstenite::Message,
|
||||||
|
>,
|
||||||
|
>,
|
||||||
|
>,
|
||||||
|
) -> HeartbeatHandler {
|
||||||
let (tx, mut rx) = mpsc::channel(32);
|
let (tx, mut rx) = mpsc::channel(32);
|
||||||
|
|
||||||
task::spawn(async move {
|
task::spawn(async move {
|
||||||
|
@ -380,37 +592,36 @@ impl HeartbeatHandler {
|
||||||
let mut last_seq_number: Option<u64> = None;
|
let mut last_seq_number: Option<u64> = None;
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
|
|
||||||
// If we received a seq number update, use that as the last seq number
|
// If we received a seq number update, use that as the last seq number
|
||||||
let hb_communication: Result<HeartbeatThreadCommunication, TryRecvError> = rx.try_recv();
|
let hb_communication: Result<HeartbeatThreadCommunication, TryRecvError> =
|
||||||
|
rx.try_recv();
|
||||||
if hb_communication.is_ok() {
|
if hb_communication.is_ok() {
|
||||||
last_seq_number = Some(hb_communication.unwrap().d);
|
last_seq_number = Some(hb_communication.unwrap().d);
|
||||||
}
|
}
|
||||||
|
|
||||||
if last_heartbeat.elapsed().as_millis() > heartbeat_interval {
|
if last_heartbeat.elapsed().as_millis() > heartbeat_interval {
|
||||||
|
|
||||||
println!("GW: Sending Heartbeat..");
|
println!("GW: Sending Heartbeat..");
|
||||||
|
|
||||||
let heartbeat = GatewayHeartbeat {
|
let heartbeat = types::GatewayHeartbeat {
|
||||||
op: 1,
|
op: 1,
|
||||||
d: last_seq_number
|
d: last_seq_number,
|
||||||
};
|
};
|
||||||
|
|
||||||
let heartbeat_json = serde_json::to_string(&heartbeat).unwrap();
|
let heartbeat_json = serde_json::to_string(&heartbeat).unwrap();
|
||||||
|
|
||||||
let msg = tokio_tungstenite::tungstenite::Message::text(heartbeat_json);
|
let msg = tokio_tungstenite::tungstenite::Message::text(heartbeat_json);
|
||||||
|
|
||||||
websocket_tx.lock().await
|
websocket_tx.lock().await.send(msg).await.unwrap();
|
||||||
.send(msg)
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
last_heartbeat = time::Instant::now();
|
last_heartbeat = time::Instant::now();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
Self { heartbeat_interval, tx }
|
Self {
|
||||||
|
heartbeat_interval,
|
||||||
|
tx,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -423,7 +634,7 @@ struct HeartbeatThreadCommunication {
|
||||||
/// An opcode for the communication we received
|
/// An opcode for the communication we received
|
||||||
op: u8,
|
op: u8,
|
||||||
/// The sequence number we got from discord
|
/// The sequence number we got from discord
|
||||||
d: u64
|
d: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -431,7 +642,7 @@ Trait which defines the behaviour of an Observer. An Observer is an object which
|
||||||
an Observable. The Observer is notified when the Observable's data changes.
|
an Observable. The Observer is notified when the Observable's data changes.
|
||||||
In this case, the Observable is a [`GatewayEvent`], which is a wrapper around a WebSocketEvent.
|
In this case, the Observable is a [`GatewayEvent`], which is a wrapper around a WebSocketEvent.
|
||||||
*/
|
*/
|
||||||
pub trait Observer<T: WebSocketEvent>: std::fmt::Debug {
|
pub trait Observer<T: types::WebSocketEvent>: std::fmt::Debug {
|
||||||
fn update(&self, data: &T);
|
fn update(&self, data: &T);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -440,13 +651,13 @@ change in the WebSocketEvent. GatewayEvents are observable.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#[derive(Default, Debug)]
|
#[derive(Default, Debug)]
|
||||||
pub struct GatewayEvent<T: WebSocketEvent> {
|
pub struct GatewayEvent<T: types::WebSocketEvent> {
|
||||||
observers: Vec<Arc<Mutex<dyn Observer<T> + Sync + Send>>>,
|
observers: Vec<Arc<Mutex<dyn Observer<T> + Sync + Send>>>,
|
||||||
pub event_data: T,
|
pub event_data: T,
|
||||||
pub is_observed: bool,
|
pub is_observed: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<T: WebSocketEvent> GatewayEvent<T> {
|
impl<T: types::WebSocketEvent> GatewayEvent<T> {
|
||||||
fn new(event_data: T) -> Self {
|
fn new(event_data: T) -> Self {
|
||||||
Self {
|
Self {
|
||||||
is_observed: false,
|
is_observed: false,
|
||||||
|
@ -469,7 +680,10 @@ impl<T: WebSocketEvent> GatewayEvent<T> {
|
||||||
Returns an error if the GatewayEvent is already observed.
|
Returns an error if the GatewayEvent is already observed.
|
||||||
Error type: [`ObserverError::AlreadySubscribedError`]
|
Error type: [`ObserverError::AlreadySubscribedError`]
|
||||||
*/
|
*/
|
||||||
pub fn subscribe(&mut self, observable: Arc<Mutex<dyn Observer<T> + Sync + Send>>) -> Option<ObserverError> {
|
pub fn subscribe(
|
||||||
|
&mut self,
|
||||||
|
observable: Arc<Mutex<dyn Observer<T> + Sync + Send>>,
|
||||||
|
) -> Option<ObserverError> {
|
||||||
if self.is_observed {
|
if self.is_observed {
|
||||||
return Some(ObserverError::AlreadySubscribedError);
|
return Some(ObserverError::AlreadySubscribedError);
|
||||||
}
|
}
|
||||||
|
@ -486,7 +700,8 @@ impl<T: WebSocketEvent> GatewayEvent<T> {
|
||||||
// pointer value than observable.
|
// pointer value than observable.
|
||||||
// The usage of the debug format to compare the generic T of observers is quite stupid, but the only thing to compare between them is T and if T == T they are the same
|
// The usage of the debug format to compare the generic T of observers is quite stupid, but the only thing to compare between them is T and if T == T they are the same
|
||||||
// anddd there is no way to do that without using format
|
// anddd there is no way to do that without using format
|
||||||
self.observers.retain(|obs| !(format!("{:?}", obs) == format!("{:?}", &observable)));
|
self.observers
|
||||||
|
.retain(|obs| !(format!("{:?}", obs) == format!("{:?}", &observable)));
|
||||||
self.is_observed = !self.observers.is_empty();
|
self.is_observed = !self.observers.is_empty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -517,50 +732,50 @@ mod events {
|
||||||
pub channel: Channel,
|
pub channel: Channel,
|
||||||
pub thread: Thread,
|
pub thread: Thread,
|
||||||
pub guild: Guild,
|
pub guild: Guild,
|
||||||
pub gateway_identify_payload: GatewayEvent<GatewayIdentifyPayload>,
|
pub gateway_identify_payload: GatewayEvent<types::GatewayIdentifyPayload>,
|
||||||
pub gateway_resume: GatewayEvent<GatewayResume>,
|
pub gateway_resume: GatewayEvent<types::GatewayResume>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default, Debug)]
|
#[derive(Default, Debug)]
|
||||||
pub struct Message {
|
pub struct Message {
|
||||||
pub create: GatewayEvent<MessageCreate>,
|
pub create: GatewayEvent<types::MessageCreate>,
|
||||||
pub update: GatewayEvent<MessageUpdate>,
|
pub update: GatewayEvent<types::MessageUpdate>,
|
||||||
pub delete: GatewayEvent<MessageDelete>,
|
pub delete: GatewayEvent<types::MessageDelete>,
|
||||||
pub delete_bulk: GatewayEvent<MessageDeleteBulk>,
|
pub delete_bulk: GatewayEvent<types::MessageDeleteBulk>,
|
||||||
pub reaction_add: GatewayEvent<MessageReactionAdd>,
|
pub reaction_add: GatewayEvent<types::MessageReactionAdd>,
|
||||||
pub reaction_remove: GatewayEvent<MessageReactionRemove>,
|
pub reaction_remove: GatewayEvent<types::MessageReactionRemove>,
|
||||||
pub reaction_remove_all: GatewayEvent<MessageReactionRemoveAll>,
|
pub reaction_remove_all: GatewayEvent<types::MessageReactionRemoveAll>,
|
||||||
pub reaction_remove_emoji: GatewayEvent<MessageReactionRemoveEmoji>,
|
pub reaction_remove_emoji: GatewayEvent<types::MessageReactionRemoveEmoji>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default, Debug)]
|
#[derive(Default, Debug)]
|
||||||
pub struct User {
|
pub struct User {
|
||||||
pub update: GatewayEvent<UserUpdate>,
|
pub update: GatewayEvent<types::UserUpdate>,
|
||||||
pub presence_update: GatewayEvent<PresenceUpdate>,
|
pub presence_update: GatewayEvent<types::PresenceUpdate>,
|
||||||
pub typing_start_event: GatewayEvent<TypingStartEvent>,
|
pub typing_start_event: GatewayEvent<types::TypingStartEvent>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default, Debug)]
|
#[derive(Default, Debug)]
|
||||||
pub struct Channel {
|
pub struct Channel {
|
||||||
pub create: GatewayEvent<ChannelCreate>,
|
pub create: GatewayEvent<types::ChannelCreate>,
|
||||||
pub update: GatewayEvent<ChannelUpdate>,
|
pub update: GatewayEvent<types::ChannelUpdate>,
|
||||||
pub delete: GatewayEvent<ChannelDelete>,
|
pub delete: GatewayEvent<types::ChannelDelete>,
|
||||||
pub pins_update: GatewayEvent<ChannelPinsUpdate>
|
pub pins_update: GatewayEvent<types::ChannelPinsUpdate>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default, Debug)]
|
#[derive(Default, Debug)]
|
||||||
pub struct Thread {
|
pub struct Thread {
|
||||||
pub create: GatewayEvent<ThreadCreate>,
|
pub create: GatewayEvent<types::ThreadCreate>,
|
||||||
pub update: GatewayEvent<ThreadUpdate>,
|
pub update: GatewayEvent<types::ThreadUpdate>,
|
||||||
pub delete: GatewayEvent<ThreadDelete>,
|
pub delete: GatewayEvent<types::ThreadDelete>,
|
||||||
pub list_sync: GatewayEvent<ThreadListSync>,
|
pub list_sync: GatewayEvent<types::ThreadListSync>,
|
||||||
pub member_update: GatewayEvent<ThreadMemberUpdate>,
|
pub member_update: GatewayEvent<types::ThreadMemberUpdate>,
|
||||||
pub members_update: GatewayEvent<ThreadMembersUpdate>,
|
pub members_update: GatewayEvent<types::ThreadMembersUpdate>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default, Debug)]
|
#[derive(Default, Debug)]
|
||||||
pub struct Guild {
|
pub struct Guild {
|
||||||
pub create: GatewayEvent<GuildCreate>,
|
pub create: GatewayEvent<types::GuildCreate>,
|
||||||
/*pub update: GatewayEvent<ThreadCreate>,
|
/*pub update: GatewayEvent<ThreadCreate>,
|
||||||
pub delete: GatewayEvent<ThreadCreate>,
|
pub delete: GatewayEvent<ThreadCreate>,
|
||||||
pub audit_log_entry_create: GatewayEvent<ThreadCreate>,
|
pub audit_log_entry_create: GatewayEvent<ThreadCreate>,
|
||||||
|
@ -587,25 +802,24 @@ mod events {
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod example {
|
mod example {
|
||||||
use super::*;
|
use super::*;
|
||||||
use crate::api::types::GatewayResume;
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
struct Consumer;
|
struct Consumer;
|
||||||
impl Observer<GatewayResume> for Consumer {
|
impl Observer<types::GatewayResume> for Consumer {
|
||||||
fn update(&self, data: &GatewayResume) {
|
fn update(&self, data: &types::GatewayResume) {
|
||||||
println!("{}", data.token)
|
println!("{}", data.token)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_observer_behaviour() {
|
async fn test_observer_behaviour() {
|
||||||
let mut event = GatewayEvent::new(GatewayResume {
|
let mut event = GatewayEvent::new(types::GatewayResume {
|
||||||
token: "start".to_string(),
|
token: "start".to_string(),
|
||||||
session_id: "start".to_string(),
|
session_id: "start".to_string(),
|
||||||
seq: "start".to_string(),
|
seq: "start".to_string(),
|
||||||
});
|
});
|
||||||
|
|
||||||
let new_data = GatewayResume {
|
let new_data = types::GatewayResume {
|
||||||
token: "token_3276ha37am3".to_string(),
|
token: "token_3276ha37am3".to_string(),
|
||||||
session_id: "89346671230".to_string(),
|
session_id: "89346671230".to_string(),
|
||||||
seq: "3".to_string(),
|
seq: "3".to_string(),
|
||||||
|
@ -634,7 +848,6 @@ mod example {
|
||||||
None => assert!(true),
|
None => assert!(true),
|
||||||
Some(_) => assert!(false),
|
Some(_) => assert!(false),
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
|
|
|
@ -1,9 +1,13 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use crate::api::limits::Limits;
|
use crate::api::limits::Limits;
|
||||||
use crate::api::types::InstancePolicies;
|
|
||||||
use crate::errors::{FieldFormatError, InstanceServerError};
|
use crate::errors::{FieldFormatError, InstanceServerError};
|
||||||
|
use crate::types::{GeneralConfiguration, User, UserSettings};
|
||||||
use crate::URLBundle;
|
use crate::URLBundle;
|
||||||
|
|
||||||
|
use std::cell::RefCell;
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
|
use std::rc::Rc;
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
/**
|
/**
|
||||||
|
@ -11,7 +15,7 @@ The [`Instance`] what you will be using to perform all sorts of actions on the S
|
||||||
*/
|
*/
|
||||||
pub struct Instance {
|
pub struct Instance {
|
||||||
pub urls: URLBundle,
|
pub urls: URLBundle,
|
||||||
pub instance_info: InstancePolicies,
|
pub instance_info: GeneralConfiguration,
|
||||||
pub limits: Limits,
|
pub limits: Limits,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -25,7 +29,7 @@ impl Instance {
|
||||||
pub async fn new(urls: URLBundle) -> Result<Instance, InstanceServerError> {
|
pub async fn new(urls: URLBundle) -> Result<Instance, InstanceServerError> {
|
||||||
let mut instance = Instance {
|
let mut instance = Instance {
|
||||||
urls: urls.clone(),
|
urls: urls.clone(),
|
||||||
instance_info: InstancePolicies::new(
|
instance_info: GeneralConfiguration::new(
|
||||||
// This is okay, because the instance_info will be overwritten by the instance_policies_schema() function.
|
// This is okay, because the instance_info will be overwritten by the instance_policies_schema() function.
|
||||||
"".to_string(),
|
"".to_string(),
|
||||||
None,
|
None,
|
||||||
|
@ -38,7 +42,7 @@ impl Instance {
|
||||||
),
|
),
|
||||||
limits: Limits::check_limits(urls.api).await,
|
limits: Limits::check_limits(urls.api).await,
|
||||||
};
|
};
|
||||||
instance.instance_info = match instance.instance_policies_schema().await {
|
instance.instance_info = match instance.general_configuration_schema().await {
|
||||||
Ok(schema) => schema,
|
Ok(schema) => schema,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
return Err(InstanceServerError::CantGetInfoError {
|
return Err(InstanceServerError::CantGetInfoError {
|
||||||
|
@ -50,7 +54,7 @@ impl Instance {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Eq)]
|
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
pub struct Token {
|
pub struct Token {
|
||||||
pub token: String,
|
pub token: String,
|
||||||
}
|
}
|
||||||
|
@ -79,3 +83,38 @@ impl Username {
|
||||||
Ok(Username { username })
|
Ok(Username { username })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct UserMeta {
|
||||||
|
pub belongs_to: Rc<RefCell<Instance>>,
|
||||||
|
pub token: String,
|
||||||
|
pub limits: Limits,
|
||||||
|
pub settings: UserSettings,
|
||||||
|
pub object: Option<User>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl UserMeta {
|
||||||
|
pub fn token(&self) -> String {
|
||||||
|
self.token.clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_token(&mut self, token: String) {
|
||||||
|
self.token = token;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn new(
|
||||||
|
belongs_to: Rc<RefCell<Instance>>,
|
||||||
|
token: String,
|
||||||
|
limits: Limits,
|
||||||
|
settings: UserSettings,
|
||||||
|
object: Option<User>,
|
||||||
|
) -> UserMeta {
|
||||||
|
UserMeta {
|
||||||
|
belongs_to,
|
||||||
|
token,
|
||||||
|
limits,
|
||||||
|
settings,
|
||||||
|
object,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@ pub mod errors;
|
||||||
pub mod gateway;
|
pub mod gateway;
|
||||||
pub mod instance;
|
pub mod instance;
|
||||||
pub mod limit;
|
pub mod limit;
|
||||||
|
pub mod types;
|
||||||
pub mod voice;
|
pub mod voice;
|
||||||
|
|
||||||
use url::{ParseError, Url};
|
use url::{ParseError, Url};
|
||||||
|
|
|
@ -0,0 +1,187 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use serde_json::{Map, Value};
|
||||||
|
|
||||||
|
pub use crate::{
|
||||||
|
types::config::types::{
|
||||||
|
api_configuration::ApiConfiguration, cdn_configuration::CdnConfiguration,
|
||||||
|
defaults_configuration::DefaultsConfiguration, email_configuration::EmailConfiguration,
|
||||||
|
endpoint_configuration::EndpointConfiguration,
|
||||||
|
external_tokens_configuration::ExternalTokensConfiguration,
|
||||||
|
general_configuration::GeneralConfiguration, gif_configuration::GifConfiguration,
|
||||||
|
guild_configuration::GuildConfiguration, kafka_configuration::KafkaConfiguration,
|
||||||
|
limit_configuration::LimitsConfiguration, login_configuration::LoginConfiguration,
|
||||||
|
metrics_configuration::MetricsConfiguration,
|
||||||
|
password_reset_configuration::PasswordResetConfiguration,
|
||||||
|
rabbit_mq_configuration::RabbitMQConfiguration, region_configuration::RegionConfiguration,
|
||||||
|
register_configuration::RegisterConfiguration,
|
||||||
|
security_configuration::SecurityConfiguration, sentry_configuration::SentryConfiguration,
|
||||||
|
template_configuration::TemplateConfiguration,
|
||||||
|
},
|
||||||
|
types::entities::ConfigEntity,
|
||||||
|
};
|
||||||
|
|
||||||
|
pub mod types;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ConfigValue {
|
||||||
|
pub gateway: EndpointConfiguration,
|
||||||
|
pub cdn: CdnConfiguration,
|
||||||
|
pub api: ApiConfiguration,
|
||||||
|
pub general: GeneralConfiguration,
|
||||||
|
pub limits: LimitsConfiguration,
|
||||||
|
pub security: SecurityConfiguration,
|
||||||
|
pub login: LoginConfiguration,
|
||||||
|
pub register: RegisterConfiguration,
|
||||||
|
pub regions: RegionConfiguration,
|
||||||
|
pub guild: GuildConfiguration,
|
||||||
|
pub gif: GifConfiguration,
|
||||||
|
pub rabbitmq: RabbitMQConfiguration,
|
||||||
|
pub kafka: KafkaConfiguration,
|
||||||
|
pub templates: TemplateConfiguration,
|
||||||
|
pub metrics: MetricsConfiguration,
|
||||||
|
pub sentry: SentryConfiguration,
|
||||||
|
pub defaults: DefaultsConfiguration,
|
||||||
|
pub external: ExternalTokensConfiguration,
|
||||||
|
pub email: EmailConfiguration,
|
||||||
|
pub password_reset: PasswordResetConfiguration,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ConfigValue {
|
||||||
|
pub fn to_pairs(&self) -> Vec<ConfigEntity> {
|
||||||
|
let v = serde_json::json!(self);
|
||||||
|
|
||||||
|
generate_pairs(&v, "")
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn from_pairs(pairs: Vec<ConfigEntity>) -> Self {
|
||||||
|
pairs_to_config(pairs)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn generate_pairs(obj: &Value, key: &str) -> Vec<ConfigEntity> {
|
||||||
|
let mut pairs = Vec::new();
|
||||||
|
match obj {
|
||||||
|
Value::Object(map) => {
|
||||||
|
for (k, v) in map {
|
||||||
|
let new_key = if key.is_empty() {
|
||||||
|
k.to_string()
|
||||||
|
} else {
|
||||||
|
format!("{}_{}", key, k)
|
||||||
|
};
|
||||||
|
pairs.extend(generate_pairs(v, &new_key));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Value::Array(arr) => {
|
||||||
|
for (i, v) in arr.iter().enumerate() {
|
||||||
|
let new_key = format!("{}_{}", key, i);
|
||||||
|
pairs.extend(generate_pairs(v, &new_key));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => pairs.push(ConfigEntity {
|
||||||
|
key: key.to_string(),
|
||||||
|
value: Some(obj.clone()),
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
pairs
|
||||||
|
}
|
||||||
|
|
||||||
|
fn pairs_to_config(pairs: Vec<ConfigEntity>) -> ConfigValue {
|
||||||
|
let mut value = Value::Object(Map::new());
|
||||||
|
|
||||||
|
for p in pairs {
|
||||||
|
let keys: Vec<&str> = p.key.split('_').collect();
|
||||||
|
let mut path = vec![];
|
||||||
|
|
||||||
|
for (i, &key) in keys.iter().enumerate() {
|
||||||
|
path.push(key);
|
||||||
|
|
||||||
|
if i == keys.len() - 1 {
|
||||||
|
insert_into(&mut value, &path, p.value.clone().unwrap_or(Value::Null));
|
||||||
|
} else if keys[i + 1].parse::<usize>().is_ok() {
|
||||||
|
if !path_exists(&value, &path) {
|
||||||
|
insert_into(&mut value, &path, Value::Array(Vec::new()));
|
||||||
|
}
|
||||||
|
} else if !path_exists(&value, &path) {
|
||||||
|
insert_into(&mut value, &path, Value::Object(Map::new()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
serde_json::from_value(value).unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn path_exists(value: &Value, path: &[&str]) -> bool {
|
||||||
|
let mut current = value;
|
||||||
|
|
||||||
|
for &key in path {
|
||||||
|
match current {
|
||||||
|
Value::Object(map) => {
|
||||||
|
if let Some(v) = map.get(key) {
|
||||||
|
current = v;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Value::Array(arr) => {
|
||||||
|
if let Ok(index) = key.parse::<usize>() {
|
||||||
|
if let Some(v) = arr.get(index) {
|
||||||
|
current = v;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => return false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
fn insert_into(value: &mut Value, path: &[&str], new_value: Value) {
|
||||||
|
let last_key = path.last().unwrap();
|
||||||
|
let parent_path = &path[0..path.len() - 1];
|
||||||
|
|
||||||
|
let mut current = value;
|
||||||
|
|
||||||
|
for &key in parent_path {
|
||||||
|
current = match current {
|
||||||
|
Value::Object(map) => map.get_mut(key).unwrap(),
|
||||||
|
Value::Array(arr) => arr.get_mut(key.parse::<usize>().unwrap()).unwrap(),
|
||||||
|
_ => unreachable!(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
match current {
|
||||||
|
Value::Object(map) => {
|
||||||
|
map.insert((*last_key).to_string(), new_value);
|
||||||
|
}
|
||||||
|
Value::Array(arr) => {
|
||||||
|
let index = last_key.parse::<usize>().unwrap();
|
||||||
|
if index >= arr.len() {
|
||||||
|
arr.resize(index + 1, Value::Null);
|
||||||
|
}
|
||||||
|
arr[index] = new_value;
|
||||||
|
}
|
||||||
|
_ => unreachable!(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use crate::types::config::{generate_pairs, pairs_to_config, ConfigValue};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_pairs() {
|
||||||
|
let c = ConfigValue::default();
|
||||||
|
let v = serde_json::json!(&c);
|
||||||
|
|
||||||
|
let pairs = generate_pairs(&v, "");
|
||||||
|
|
||||||
|
let cfg = pairs_to_config(pairs);
|
||||||
|
assert_eq!(cfg, c)
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,24 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ApiConfiguration {
|
||||||
|
pub default_version: String,
|
||||||
|
pub active_versions: Vec<String>,
|
||||||
|
pub endpoint_public: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for ApiConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
default_version: String::from("9"),
|
||||||
|
active_versions: vec![
|
||||||
|
String::from("6"),
|
||||||
|
String::from("7"),
|
||||||
|
String::from("8"),
|
||||||
|
String::from("9"),
|
||||||
|
],
|
||||||
|
endpoint_public: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,25 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct CdnConfiguration {
|
||||||
|
pub resize_height_max: u64,
|
||||||
|
pub resize_width_max: u64,
|
||||||
|
pub imagor_server_url: Option<String>,
|
||||||
|
|
||||||
|
pub endpoint_public: Option<String>,
|
||||||
|
pub endpoint_private: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for CdnConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
resize_height_max: 1000,
|
||||||
|
resize_width_max: 1000,
|
||||||
|
imagor_server_url: None,
|
||||||
|
|
||||||
|
endpoint_private: None,
|
||||||
|
endpoint_public: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::config::types::subconfigs::defaults::{guild::GuildDefaults, user::UserDefaults};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct DefaultsConfiguration {
|
||||||
|
pub guild: GuildDefaults,
|
||||||
|
pub user: UserDefaults,
|
||||||
|
}
|
|
@ -0,0 +1,25 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::config::types::subconfigs::email::{
|
||||||
|
mailgun::MailGunConfiguration, mailjet::MailJetConfiguration, sendgrid::SendGridConfiguration,
|
||||||
|
smtp::SMTPConfiguration,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq, Eq, Clone, Copy, Serialize, Deserialize)]
|
||||||
|
pub enum EmailProvider {
|
||||||
|
Smtp,
|
||||||
|
MailGun,
|
||||||
|
MailJet,
|
||||||
|
SendGrid,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
#[derive(Default)]
|
||||||
|
pub struct EmailConfiguration {
|
||||||
|
pub provider: Option<EmailProvider>,
|
||||||
|
pub smtp: SMTPConfiguration,
|
||||||
|
pub mailgun: MailGunConfiguration,
|
||||||
|
pub mailjet: MailJetConfiguration,
|
||||||
|
pub sendgrid: SendGridConfiguration,
|
||||||
|
}
|
|
@ -0,0 +1,9 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct EndpointConfiguration {
|
||||||
|
pub endpoint_client: Option<String>,
|
||||||
|
pub endpoint_private: Option<String>,
|
||||||
|
pub endpoint_public: Option<String>,
|
||||||
|
}
|
|
@ -0,0 +1,7 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ExternalTokensConfiguration {
|
||||||
|
pub twitter: Option<String>,
|
||||||
|
}
|
|
@ -0,0 +1,57 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::utils::Snowflake;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct GeneralConfiguration {
|
||||||
|
pub instance_name: String,
|
||||||
|
pub instance_description: Option<String>,
|
||||||
|
pub front_page: Option<String>,
|
||||||
|
pub tos_page: Option<String>,
|
||||||
|
pub correspondence_email: Option<String>,
|
||||||
|
pub correspondence_user_id: Option<String>,
|
||||||
|
pub image: Option<String>,
|
||||||
|
pub instance_id: Option<Snowflake>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for GeneralConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
instance_name: String::from("Spacebar Instance"),
|
||||||
|
instance_description: Some(String::from(
|
||||||
|
"This is a Spacebar instance made in the pre-release days",
|
||||||
|
)),
|
||||||
|
front_page: None,
|
||||||
|
tos_page: None,
|
||||||
|
correspondence_email: None,
|
||||||
|
correspondence_user_id: None,
|
||||||
|
image: None,
|
||||||
|
instance_id: Some(Snowflake::generate()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl GeneralConfiguration {
|
||||||
|
pub fn new(
|
||||||
|
instance_name: String,
|
||||||
|
instance_description: Option<String>,
|
||||||
|
front_page: Option<String>,
|
||||||
|
tos_page: Option<String>,
|
||||||
|
correspondence_email: Option<String>,
|
||||||
|
correspondence_user_id: Option<String>,
|
||||||
|
image: Option<String>,
|
||||||
|
instance_id: Option<Snowflake>,
|
||||||
|
) -> Self {
|
||||||
|
Self {
|
||||||
|
instance_name,
|
||||||
|
instance_description,
|
||||||
|
front_page,
|
||||||
|
tos_page,
|
||||||
|
correspondence_email,
|
||||||
|
correspondence_user_id,
|
||||||
|
image,
|
||||||
|
instance_id,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,26 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "lowercase")]
|
||||||
|
pub enum GifProvider {
|
||||||
|
#[default]
|
||||||
|
Tenor,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct GifConfiguration {
|
||||||
|
pub enabled: bool,
|
||||||
|
pub provider: GifProvider,
|
||||||
|
pub api_key: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for GifConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
enabled: true,
|
||||||
|
provider: GifProvider::Tenor,
|
||||||
|
api_key: Some(String::from("LIVDSRZULELA")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,126 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::config::types::subconfigs::guild::{
|
||||||
|
autojoin::AutoJoinConfiguration, discovery::DiscoverConfiguration,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq, Eq, Clone, Copy, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
||||||
|
pub enum GuildFeatures {
|
||||||
|
ActivitiesAlpha,
|
||||||
|
ActivitiesEmployee,
|
||||||
|
ActivitiesInternalDev,
|
||||||
|
AnimatedBanner,
|
||||||
|
AnimatedIcon,
|
||||||
|
ApplicationCommandPermissionsV2,
|
||||||
|
AutoModeration,
|
||||||
|
AutoModTriggerKeywordFilter,
|
||||||
|
AutoModTriggerMLSpamFilter,
|
||||||
|
AutoModTriggerSpamLinkFilter,
|
||||||
|
AutoModTriggerUserProfile,
|
||||||
|
Banner,
|
||||||
|
BFG,
|
||||||
|
BoostingTiersExperimentMediumGuild,
|
||||||
|
BoostingTiersExperimentSmallGuild,
|
||||||
|
BotDeveloperEarlyAccess,
|
||||||
|
BurstReactions,
|
||||||
|
CommunityCanary,
|
||||||
|
CommunityExpLargeGated,
|
||||||
|
CommunityExpLargeUngated,
|
||||||
|
CommunityExpMedium,
|
||||||
|
ChannelEmojisGenerated,
|
||||||
|
ChannelHighlights,
|
||||||
|
ChannelHighlightsDisabled,
|
||||||
|
ClydeEnabled,
|
||||||
|
ClydeExperimentEnabled,
|
||||||
|
ClydeDisabled,
|
||||||
|
Community,
|
||||||
|
CreatorAcceptedNewTerms,
|
||||||
|
CreatorMonetizable,
|
||||||
|
CreatorMonetizableDisabled,
|
||||||
|
CreatorMonetizablePendingNewOwnerOnboarding,
|
||||||
|
CreatorMonetizableProvisional,
|
||||||
|
CreatorMonetizableRestricted,
|
||||||
|
CreatorMonetizableWhiteglove,
|
||||||
|
CreatorMonetizableApplicationAllowlist,
|
||||||
|
CreateStorePage,
|
||||||
|
DeveloperSupportServer,
|
||||||
|
DiscoverableDisabled,
|
||||||
|
Discoverable,
|
||||||
|
EnabledDiscoverableBefore,
|
||||||
|
ExposedToActivitiesWTPExperiment,
|
||||||
|
GuestsEnabled,
|
||||||
|
GuildAutomodDefaultList,
|
||||||
|
GuildCommunicationDisabledGuilds,
|
||||||
|
GuildHomeDeprecationOverride,
|
||||||
|
GuildHomeOverride,
|
||||||
|
GuildHomeTest,
|
||||||
|
GuildMemberVerificationExperiment,
|
||||||
|
GuildOnboarding,
|
||||||
|
GuildOnboardingAdminOnly,
|
||||||
|
GuildOnboardingEverEnabled,
|
||||||
|
GuildOnboardingHasPrompts,
|
||||||
|
GuildRoleSubscription,
|
||||||
|
GuildRoleSubscriptionPurchaseFeedbackLoop,
|
||||||
|
GuildRoleSubscriptionTrials,
|
||||||
|
GuildServerGuide,
|
||||||
|
GuildWebPageVanityURL,
|
||||||
|
HadEarlyActivitiesAccess,
|
||||||
|
HasDirectoryEntry,
|
||||||
|
HideFromExperimentUI,
|
||||||
|
Hub,
|
||||||
|
IncreasedThreadLimit,
|
||||||
|
InternalEmployeeOnly,
|
||||||
|
InviteSplash,
|
||||||
|
InvitesDisabled,
|
||||||
|
LinkedToHub,
|
||||||
|
MarketplacesConnectionRoles,
|
||||||
|
MemberProfiles,
|
||||||
|
MemberVerificationGateEnabled,
|
||||||
|
MemberVerificationManualApproval,
|
||||||
|
MobileWebRoleSubscriptionPurchasePage,
|
||||||
|
MonetizationEnabled,
|
||||||
|
MoreEmoji,
|
||||||
|
MoreStickers,
|
||||||
|
News,
|
||||||
|
NewThreadPermissions,
|
||||||
|
Partnered,
|
||||||
|
PremiumTier3Override,
|
||||||
|
PreviewEnabled,
|
||||||
|
RaidAlertsDisabled,
|
||||||
|
RelayEnabled,
|
||||||
|
RestrictSpamRiskGuild,
|
||||||
|
RoleIcons,
|
||||||
|
RoleSubscriptionsAvailableForPurchase,
|
||||||
|
RoleSubscriptionsEnabled,
|
||||||
|
RoleSubscriptionsEnabledForPurchase,
|
||||||
|
Shard,
|
||||||
|
SharedCanvasFriendsAndFamilyTest,
|
||||||
|
Soundboard,
|
||||||
|
SummariesEnabled,
|
||||||
|
SummariesEnabledGA,
|
||||||
|
SummariesDisabledByUser,
|
||||||
|
SummariesEnabledByUser,
|
||||||
|
TextInStageEnabled,
|
||||||
|
TextInVoiceEnabled,
|
||||||
|
ThreadsEnabledTesting,
|
||||||
|
ThreadsEnabled,
|
||||||
|
ThreadDefaultAutoArchiveDuration,
|
||||||
|
ThreadsOnlyChannel,
|
||||||
|
TicketedEventsEnabled,
|
||||||
|
TicketingEnabled,
|
||||||
|
VanityUrls,
|
||||||
|
Verified,
|
||||||
|
VIPRegions,
|
||||||
|
VoiceChannelEffects,
|
||||||
|
WelcomeScreenEnabled,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct GuildConfiguration {
|
||||||
|
pub discovery: DiscoverConfiguration,
|
||||||
|
pub auto_join: AutoJoinConfiguration,
|
||||||
|
#[serde(default)]
|
||||||
|
pub default_features: Vec<GuildFeatures>,
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::config::types::subconfigs::kafka::KafkaBroker;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct KafkaConfiguration {
|
||||||
|
#[serde(default)]
|
||||||
|
pub brokers: Option<Vec<KafkaBroker>>,
|
||||||
|
}
|
|
@ -0,0 +1,17 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::config::types::subconfigs::limits::{
|
||||||
|
channel::ChannelLimits, global::GlobalRateLimits, guild::GuildLimits, message::MessageLimits,
|
||||||
|
rates::RateLimits, user::UserLimits,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct LimitsConfiguration {
|
||||||
|
pub user: UserLimits,
|
||||||
|
pub guild: GuildLimits,
|
||||||
|
pub message: MessageLimits,
|
||||||
|
pub channel: ChannelLimits,
|
||||||
|
pub rate: RateLimits,
|
||||||
|
pub absolute_rate: GlobalRateLimits,
|
||||||
|
}
|
|
@ -0,0 +1,8 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct LoginConfiguration {
|
||||||
|
pub require_captcha: bool,
|
||||||
|
pub require_verification: bool,
|
||||||
|
}
|
|
@ -0,0 +1,13 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct MetricsConfiguration {
|
||||||
|
pub timeout: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for MetricsConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self { timeout: 30000 }
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,21 @@
|
||||||
|
pub mod api_configuration;
|
||||||
|
pub mod cdn_configuration;
|
||||||
|
pub mod defaults_configuration;
|
||||||
|
pub mod email_configuration;
|
||||||
|
pub mod endpoint_configuration;
|
||||||
|
pub mod external_tokens_configuration;
|
||||||
|
pub mod general_configuration;
|
||||||
|
pub mod gif_configuration;
|
||||||
|
pub mod guild_configuration;
|
||||||
|
pub mod kafka_configuration;
|
||||||
|
pub mod limit_configuration;
|
||||||
|
pub mod login_configuration;
|
||||||
|
pub mod metrics_configuration;
|
||||||
|
pub mod password_reset_configuration;
|
||||||
|
pub mod rabbit_mq_configuration;
|
||||||
|
pub mod region_configuration;
|
||||||
|
pub mod register_configuration;
|
||||||
|
pub mod security_configuration;
|
||||||
|
pub mod sentry_configuration;
|
||||||
|
pub mod subconfigs;
|
||||||
|
pub mod template_configuration;
|
|
@ -0,0 +1,7 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct PasswordResetConfiguration {
|
||||||
|
pub require_captcha: bool,
|
||||||
|
}
|
|
@ -0,0 +1,7 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct RabbitMQConfiguration {
|
||||||
|
pub host: Option<String>,
|
||||||
|
}
|
|
@ -0,0 +1,29 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::config::types::subconfigs::region::Region;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct RegionConfiguration {
|
||||||
|
pub default: String,
|
||||||
|
pub use_default_as_optimal: bool,
|
||||||
|
pub available: Vec<Region>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for RegionConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
default: String::from("spacebar"),
|
||||||
|
use_default_as_optimal: true,
|
||||||
|
available: vec![Region {
|
||||||
|
id: String::from("spacebar"),
|
||||||
|
name: String::from("spacebar"),
|
||||||
|
endpoint: String::from("127.0.0.1:3004"),
|
||||||
|
location: None,
|
||||||
|
vip: false,
|
||||||
|
custom: false,
|
||||||
|
deprecated: false,
|
||||||
|
}],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,41 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::config::types::subconfigs::register::{
|
||||||
|
DateOfBirthConfiguration, PasswordConfiguration, RegistrationEmailConfiguration,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct RegisterConfiguration {
|
||||||
|
pub email: RegistrationEmailConfiguration,
|
||||||
|
pub date_of_birth: DateOfBirthConfiguration,
|
||||||
|
pub password: PasswordConfiguration,
|
||||||
|
pub disabled: bool,
|
||||||
|
pub require_captcha: bool,
|
||||||
|
pub require_invite: bool,
|
||||||
|
pub guests_require_invite: bool,
|
||||||
|
pub allow_new_registration: bool,
|
||||||
|
pub allow_multiple_accounts: bool,
|
||||||
|
pub block_proxies: bool,
|
||||||
|
pub incrementing_discriminators: bool,
|
||||||
|
pub default_rights: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for RegisterConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
email: RegistrationEmailConfiguration::default(),
|
||||||
|
date_of_birth: DateOfBirthConfiguration::default(),
|
||||||
|
password: PasswordConfiguration::default(),
|
||||||
|
disabled: false,
|
||||||
|
require_captcha: true,
|
||||||
|
require_invite: false,
|
||||||
|
guests_require_invite: true,
|
||||||
|
allow_new_registration: true,
|
||||||
|
allow_multiple_accounts: true,
|
||||||
|
block_proxies: true,
|
||||||
|
incrementing_discriminators: false,
|
||||||
|
default_rights: String::from("875069521787904"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,44 @@
|
||||||
|
use base64::Engine;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::config::types::subconfigs::security::{
|
||||||
|
CaptchaConfiguration, TwoFactorConfiguration,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct SecurityConfiguration {
|
||||||
|
pub captcha: CaptchaConfiguration,
|
||||||
|
pub two_factor: TwoFactorConfiguration,
|
||||||
|
pub auto_update: bool,
|
||||||
|
pub request_signature: String,
|
||||||
|
pub jwt_secret: String,
|
||||||
|
pub forwarded_for: Option<String>,
|
||||||
|
pub ipdata_api_key: Option<String>,
|
||||||
|
pub mfa_backup_code_count: u8,
|
||||||
|
pub stats_world_readable: bool,
|
||||||
|
pub default_registration_token_expiration: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for SecurityConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
let mut req_sig: [u8; 32] = [0; 32];
|
||||||
|
let _ = openssl::rand::rand_bytes(&mut req_sig);
|
||||||
|
let mut jwt_secret: [u8; 256] = [0; 256];
|
||||||
|
let _ = openssl::rand::rand_bytes(&mut jwt_secret);
|
||||||
|
Self {
|
||||||
|
captcha: Default::default(),
|
||||||
|
two_factor: Default::default(),
|
||||||
|
auto_update: true,
|
||||||
|
request_signature: base64::engine::general_purpose::STANDARD.encode(req_sig),
|
||||||
|
jwt_secret: base64::engine::general_purpose::STANDARD.encode(jwt_secret),
|
||||||
|
forwarded_for: None,
|
||||||
|
ipdata_api_key: Some(String::from(
|
||||||
|
"eca677b284b3bac29eb72f5e496aa9047f26543605efe99ff2ce35c9",
|
||||||
|
)),
|
||||||
|
mfa_backup_code_count: 10,
|
||||||
|
stats_world_readable: true,
|
||||||
|
default_registration_token_expiration: 1000 * 60 * 60 * 24 * 7,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,28 @@
|
||||||
|
use std::ffi::OsString;
|
||||||
|
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct SentryConfiguration {
|
||||||
|
pub enabled: bool,
|
||||||
|
pub endpoint: String,
|
||||||
|
pub trace_sample_rate: f64,
|
||||||
|
pub environment: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for SentryConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
enabled: false,
|
||||||
|
endpoint: String::from(
|
||||||
|
"https://241c6fb08adb469da1bb82522b25c99f@sentry.quartzinc.space/3",
|
||||||
|
),
|
||||||
|
trace_sample_rate: 1.0,
|
||||||
|
environment: hostname::get()
|
||||||
|
.unwrap_or_else(|_| OsString::new())
|
||||||
|
.to_string_lossy()
|
||||||
|
.to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,17 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ClientReleaseConfiguration {
|
||||||
|
pub use_local_release: bool,
|
||||||
|
pub upstream_version: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for ClientReleaseConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
use_local_release: true,
|
||||||
|
upstream_version: String::from("0.0.264"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,23 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct GuildDefaults {
|
||||||
|
pub max_presences: u64,
|
||||||
|
pub max_video_channel_users: u16,
|
||||||
|
pub afk_timeout: u16,
|
||||||
|
pub default_message_notifications: u8,
|
||||||
|
pub explicit_content_filter: u8,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for GuildDefaults {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
max_presences: 250_000,
|
||||||
|
max_video_channel_users: 200,
|
||||||
|
afk_timeout: 300,
|
||||||
|
default_message_notifications: 1,
|
||||||
|
explicit_content_filter: 0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,2 @@
|
||||||
|
pub mod guild;
|
||||||
|
pub mod user;
|
|
@ -0,0 +1,19 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct UserDefaults {
|
||||||
|
pub premium: bool,
|
||||||
|
pub premium_type: u8,
|
||||||
|
pub verified: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for UserDefaults {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
premium: true,
|
||||||
|
premium_type: 2,
|
||||||
|
verified: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,8 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct MailGunConfiguration {
|
||||||
|
pub api_key: Option<String>,
|
||||||
|
pub domain: Option<String>,
|
||||||
|
}
|
|
@ -0,0 +1,8 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct MailJetConfiguration {
|
||||||
|
pub api_key: Option<String>,
|
||||||
|
pub api_secret: Option<String>,
|
||||||
|
}
|
|
@ -0,0 +1,4 @@
|
||||||
|
pub mod mailgun;
|
||||||
|
pub mod mailjet;
|
||||||
|
pub mod sendgrid;
|
||||||
|
pub mod smtp;
|
|
@ -0,0 +1,7 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct SendGridConfiguration {
|
||||||
|
pub api_key: Option<String>,
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct SMTPConfiguration {
|
||||||
|
pub host: Option<String>,
|
||||||
|
pub port: Option<u16>,
|
||||||
|
pub secure: bool,
|
||||||
|
pub username: Option<String>,
|
||||||
|
pub password: Option<String>,
|
||||||
|
}
|
|
@ -0,0 +1,22 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::utils::Snowflake;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct AutoJoinConfiguration {
|
||||||
|
pub enabled: bool,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub guilds: Option<Vec<Snowflake>>,
|
||||||
|
pub can_leave: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for AutoJoinConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
enabled: true,
|
||||||
|
guilds: None,
|
||||||
|
can_leave: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,21 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct DiscoverConfiguration {
|
||||||
|
pub show_all_guilds: bool,
|
||||||
|
pub use_recommendation: bool,
|
||||||
|
pub offset: u16,
|
||||||
|
pub limit: u16,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for DiscoverConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
show_all_guilds: false,
|
||||||
|
use_recommendation: false,
|
||||||
|
offset: 0,
|
||||||
|
limit: 24,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,2 @@
|
||||||
|
pub mod autojoin;
|
||||||
|
pub mod discovery;
|
|
@ -0,0 +1,7 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct KafkaBroker {
|
||||||
|
pub ip: String,
|
||||||
|
pub port: u16,
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ChannelLimits {
|
||||||
|
pub max_pins: u16,
|
||||||
|
pub max_topic: u16,
|
||||||
|
pub max_webhooks: u16,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for ChannelLimits {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
max_pins: 500,
|
||||||
|
max_topic: 1024,
|
||||||
|
max_webhooks: 100,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,41 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct GlobalRateLimit {
|
||||||
|
pub limit: u16,
|
||||||
|
pub window: u64,
|
||||||
|
pub enabled: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for GlobalRateLimit {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
limit: 100,
|
||||||
|
window: 60 * 60 * 1000,
|
||||||
|
enabled: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct GlobalRateLimits {
|
||||||
|
pub register: GlobalRateLimit,
|
||||||
|
pub send_message: GlobalRateLimit,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for GlobalRateLimits {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
register: GlobalRateLimit {
|
||||||
|
limit: 25,
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
send_message: GlobalRateLimit {
|
||||||
|
limit: 200,
|
||||||
|
window: 60 * 1000,
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,23 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct GuildLimits {
|
||||||
|
pub max_roles: u16,
|
||||||
|
pub max_emojis: u16,
|
||||||
|
pub max_members: u64,
|
||||||
|
pub max_channels: u32,
|
||||||
|
pub max_channels_in_category: u32,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for GuildLimits {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
max_roles: 1000,
|
||||||
|
max_emojis: 20_000,
|
||||||
|
max_members: 25_000_000,
|
||||||
|
max_channels: 65_535,
|
||||||
|
max_channels_in_category: 65_535,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,26 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct MessageLimits {
|
||||||
|
pub max_characters: u32,
|
||||||
|
#[serde(default)]
|
||||||
|
pub max_tts_characters: u32,
|
||||||
|
pub max_reactions: u32,
|
||||||
|
pub max_attachment_size: u64,
|
||||||
|
pub max_bulk_delete: u32,
|
||||||
|
pub max_embed_download_size: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for MessageLimits {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
max_characters: 1048576,
|
||||||
|
max_tts_characters: 160,
|
||||||
|
max_reactions: 2048,
|
||||||
|
max_attachment_size: 1024 * 1024 * 1024,
|
||||||
|
max_bulk_delete: 1000,
|
||||||
|
max_embed_download_size: 1024 * 1024 * 5,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,7 @@
|
||||||
|
pub mod channel;
|
||||||
|
pub mod global;
|
||||||
|
pub mod guild;
|
||||||
|
pub mod message;
|
||||||
|
pub mod ratelimits;
|
||||||
|
pub mod rates;
|
||||||
|
pub mod user;
|
|
@ -0,0 +1,28 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::config::types::subconfigs::limits::ratelimits::RateLimitOptions;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct AuthRateLimit {
|
||||||
|
pub login: RateLimitOptions,
|
||||||
|
pub register: RateLimitOptions,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for AuthRateLimit {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
login: RateLimitOptions {
|
||||||
|
bot: None,
|
||||||
|
count: 5,
|
||||||
|
window: 60,
|
||||||
|
only_ip: false,
|
||||||
|
},
|
||||||
|
register: RateLimitOptions {
|
||||||
|
bot: None,
|
||||||
|
count: 2,
|
||||||
|
window: 60 * 60 * 12,
|
||||||
|
only_ip: false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,14 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
pub mod auth;
|
||||||
|
pub mod route;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct RateLimitOptions {
|
||||||
|
pub bot: Option<u64>,
|
||||||
|
pub count: u64,
|
||||||
|
pub window: u64,
|
||||||
|
#[serde(default)]
|
||||||
|
pub only_ip: bool,
|
||||||
|
}
|
|
@ -0,0 +1,39 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::config::types::subconfigs::limits::ratelimits::{
|
||||||
|
auth::AuthRateLimit, RateLimitOptions,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct RouteRateLimit {
|
||||||
|
pub guild: RateLimitOptions,
|
||||||
|
pub webhook: RateLimitOptions,
|
||||||
|
pub channel: RateLimitOptions,
|
||||||
|
pub auth: AuthRateLimit,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for RouteRateLimit {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
guild: RateLimitOptions {
|
||||||
|
bot: None,
|
||||||
|
count: 5,
|
||||||
|
window: 5,
|
||||||
|
only_ip: false,
|
||||||
|
},
|
||||||
|
webhook: RateLimitOptions {
|
||||||
|
bot: None,
|
||||||
|
count: 10,
|
||||||
|
window: 5,
|
||||||
|
only_ip: false,
|
||||||
|
},
|
||||||
|
channel: RateLimitOptions {
|
||||||
|
bot: None,
|
||||||
|
count: 10,
|
||||||
|
window: 5,
|
||||||
|
only_ip: false,
|
||||||
|
},
|
||||||
|
auth: AuthRateLimit::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,41 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::config::types::subconfigs::limits::ratelimits::{
|
||||||
|
route::RouteRateLimit, RateLimitOptions,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct RateLimits {
|
||||||
|
pub enabled: bool,
|
||||||
|
pub ip: RateLimitOptions,
|
||||||
|
pub global: RateLimitOptions,
|
||||||
|
pub error: RateLimitOptions,
|
||||||
|
pub routes: RouteRateLimit,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for RateLimits {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
enabled: false,
|
||||||
|
ip: RateLimitOptions {
|
||||||
|
bot: None,
|
||||||
|
count: 500,
|
||||||
|
window: 5,
|
||||||
|
only_ip: false,
|
||||||
|
},
|
||||||
|
global: RateLimitOptions {
|
||||||
|
bot: None,
|
||||||
|
count: 250,
|
||||||
|
window: 5,
|
||||||
|
only_ip: false,
|
||||||
|
},
|
||||||
|
error: RateLimitOptions {
|
||||||
|
bot: None,
|
||||||
|
count: 10,
|
||||||
|
window: 5,
|
||||||
|
only_ip: false,
|
||||||
|
},
|
||||||
|
routes: RouteRateLimit::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct UserLimits {
|
||||||
|
pub max_guilds: u64,
|
||||||
|
pub max_username: u16,
|
||||||
|
pub max_friends: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for UserLimits {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
max_guilds: 1048576,
|
||||||
|
max_username: 32,
|
||||||
|
max_friends: 5000,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,9 @@
|
||||||
|
pub mod client;
|
||||||
|
pub mod defaults;
|
||||||
|
pub mod email;
|
||||||
|
pub mod guild;
|
||||||
|
pub mod kafka;
|
||||||
|
pub mod limits;
|
||||||
|
pub mod region;
|
||||||
|
pub mod register;
|
||||||
|
pub mod security;
|
|
@ -0,0 +1,21 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub struct LatLong {
|
||||||
|
pub latitude: f64,
|
||||||
|
pub longitude: f64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub struct Region {
|
||||||
|
pub id: String,
|
||||||
|
pub name: String,
|
||||||
|
pub endpoint: String,
|
||||||
|
pub location: Option<LatLong>,
|
||||||
|
pub vip: bool,
|
||||||
|
pub custom: bool,
|
||||||
|
#[serde(default)]
|
||||||
|
pub deprecated: bool,
|
||||||
|
}
|
|
@ -0,0 +1,16 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct DateOfBirthConfiguration {
|
||||||
|
pub required: bool,
|
||||||
|
pub minimum: u8,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for DateOfBirthConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
required: true,
|
||||||
|
minimum: 13,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,21 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct RegistrationEmailConfiguration {
|
||||||
|
pub required: bool,
|
||||||
|
pub allowlist: bool,
|
||||||
|
#[serde(default)]
|
||||||
|
pub blacklist: bool,
|
||||||
|
#[serde(default)]
|
||||||
|
pub domains: Vec<String>,
|
||||||
|
}
|
||||||
|
impl Default for RegistrationEmailConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
required: false,
|
||||||
|
allowlist: false,
|
||||||
|
blacklist: true,
|
||||||
|
domains: Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,7 @@
|
||||||
|
mod date_of_birth;
|
||||||
|
mod email;
|
||||||
|
mod password;
|
||||||
|
|
||||||
|
pub use date_of_birth::DateOfBirthConfiguration;
|
||||||
|
pub use email::RegistrationEmailConfiguration;
|
||||||
|
pub use password::PasswordConfiguration;
|
|
@ -0,0 +1,23 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct PasswordConfiguration {
|
||||||
|
pub required: bool,
|
||||||
|
pub min_length: u8,
|
||||||
|
pub min_numbers: u8,
|
||||||
|
pub min_upper_case: u8,
|
||||||
|
pub min_symbols: u8,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for PasswordConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
required: false,
|
||||||
|
min_length: 8,
|
||||||
|
min_numbers: 2,
|
||||||
|
min_upper_case: 2,
|
||||||
|
min_symbols: 0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,27 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "lowercase")]
|
||||||
|
pub enum CaptchaService {
|
||||||
|
Recaptcha,
|
||||||
|
HCaptcha,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct CaptchaConfiguration {
|
||||||
|
pub enabled: bool,
|
||||||
|
pub service: CaptchaService,
|
||||||
|
pub sitekey: Option<String>,
|
||||||
|
pub secret: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for CaptchaConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
enabled: false,
|
||||||
|
service: CaptchaService::HCaptcha,
|
||||||
|
sitekey: None,
|
||||||
|
secret: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,5 @@
|
||||||
|
mod captcha;
|
||||||
|
mod twofactor;
|
||||||
|
|
||||||
|
pub use captcha::{CaptchaConfiguration, CaptchaService};
|
||||||
|
pub use twofactor::TwoFactorConfiguration;
|
|
@ -0,0 +1,15 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct TwoFactorConfiguration {
|
||||||
|
pub generate_backup_codes: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for TwoFactorConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
generate_backup_codes: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,21 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct TemplateConfiguration {
|
||||||
|
pub enabled: bool,
|
||||||
|
pub allow_template_creation: bool,
|
||||||
|
pub allow_discord_templates: bool,
|
||||||
|
pub allow_raws: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for TemplateConfiguration {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
enabled: true,
|
||||||
|
allow_template_creation: true,
|
||||||
|
allow_discord_templates: true,
|
||||||
|
allow_raws: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,138 @@
|
||||||
|
use crate::types::utils::Snowflake;
|
||||||
|
use bitflags::{bitflags, Flags};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use serde_json::Value;
|
||||||
|
#[cfg(feature = "sqlx")]
|
||||||
|
use sqlx::FromRow;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
#[cfg_attr(feature = "sqlx", derive(FromRow))]
|
||||||
|
pub struct Application {
|
||||||
|
pub id: Snowflake,
|
||||||
|
pub name: String,
|
||||||
|
pub icon: Option<String>,
|
||||||
|
pub description: Option<String>,
|
||||||
|
pub summary: Option<String>,
|
||||||
|
#[cfg(feature = "sqlx")]
|
||||||
|
pub r#type: Option<sqlx::types::Json<Value>>,
|
||||||
|
#[cfg(not(feature = "sqlx"))]
|
||||||
|
pub r#type: Option<Value>,
|
||||||
|
pub hook: bool,
|
||||||
|
pub bot_public: bool,
|
||||||
|
pub bot_require_code_grant: bool,
|
||||||
|
pub verify_key: String,
|
||||||
|
pub owner_id: Snowflake,
|
||||||
|
pub flags: u64,
|
||||||
|
#[cfg(feature = "sqlx")]
|
||||||
|
pub redirect_uris: Option<sqlx::types::Json<Vec<String>>>,
|
||||||
|
#[cfg(not(feature = "sqlx"))]
|
||||||
|
pub redirect_uris: Option<Vec<String>>,
|
||||||
|
pub rpc_application_state: i64,
|
||||||
|
pub store_application_state: i64,
|
||||||
|
pub verification_state: i64,
|
||||||
|
pub interactions_endpoint_url: Option<String>,
|
||||||
|
pub integration_public: bool,
|
||||||
|
pub integration_require_code_grant: bool,
|
||||||
|
pub discoverability_state: i64,
|
||||||
|
pub discovery_eligibility_flags: i64,
|
||||||
|
pub bot_user_id: Snowflake,
|
||||||
|
#[cfg(feature = "sqlx")]
|
||||||
|
pub tags: Option<sqlx::types::Json<Vec<String>>>,
|
||||||
|
#[cfg(not(feature = "sqlx"))]
|
||||||
|
pub tags: Option<Vec<String>>,
|
||||||
|
pub cover_image: Option<String>,
|
||||||
|
#[cfg(feature = "sqlx")]
|
||||||
|
pub install_params: Option<sqlx::types::Json<InstallParams>>,
|
||||||
|
#[cfg(not(feature = "sqlx"))]
|
||||||
|
pub install_params: Option<InstallParams>,
|
||||||
|
pub terms_of_service_url: Option<String>,
|
||||||
|
pub privacy_policy_url: Option<String>,
|
||||||
|
pub team_id: Option<Snowflake>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Application {
|
||||||
|
pub fn flags(&self) -> ApplicationFlags {
|
||||||
|
ApplicationFlags::from_bits(self.flags.to_owned()).unwrap()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct InstallParams {
|
||||||
|
pub scopes: Vec<String>,
|
||||||
|
pub permissions: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
bitflags! {
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub struct ApplicationFlags: u64 {
|
||||||
|
const APPLICATION_AUTO_MODERATION_RULE_CREATE_BADGE = 1 << 6;
|
||||||
|
const GATEWAY_PRESENCE = 1 << 12;
|
||||||
|
const GATEWAY_PRESENCE_LIMITED = 1 << 13;
|
||||||
|
const GATEWAY_GUILD_MEMBERS = 1 << 14;
|
||||||
|
const GATEWAY_GUILD_MEMBERS_LIMITED = 1 << 15;
|
||||||
|
const VERIFICATION_PENDING_GUILD_LIMIT = 1 << 16;
|
||||||
|
const EMBEDDED = 1 << 17;
|
||||||
|
const GATEWAY_MESSAGE_CONTENT = 1 << 18;
|
||||||
|
const GATEWAY_MESSAGE_CONTENT_LIMITED = 1 << 19;
|
||||||
|
const APPLICATION_COMMAND_BADGE = 1 << 23;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub struct ApplicationCommand {
|
||||||
|
pub id: Snowflake,
|
||||||
|
pub application_id: Snowflake,
|
||||||
|
pub name: String,
|
||||||
|
pub description: String,
|
||||||
|
pub options: Vec<ApplicationCommandOption>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub struct ApplicationCommandOption {
|
||||||
|
pub r#type: ApplicationCommandOptionType,
|
||||||
|
pub name: String,
|
||||||
|
pub description: String,
|
||||||
|
pub required: bool,
|
||||||
|
pub choices: Vec<ApplicationCommandOptionChoice>,
|
||||||
|
pub options: Vec<ApplicationCommandOption>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub struct ApplicationCommandOptionChoice {
|
||||||
|
pub name: String,
|
||||||
|
pub value: Value,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub enum ApplicationCommandOptionType {
|
||||||
|
#[serde(rename = "SUB_COMMAND")]
|
||||||
|
SubCommand = 1,
|
||||||
|
#[serde(rename = "SUB_COMMAND_GROUP")]
|
||||||
|
SubCommandGroup = 2,
|
||||||
|
#[serde(rename = "STRING")]
|
||||||
|
String = 3,
|
||||||
|
#[serde(rename = "INTEGER")]
|
||||||
|
Integer = 4,
|
||||||
|
#[serde(rename = "BOOLEAN")]
|
||||||
|
Boolean = 5,
|
||||||
|
#[serde(rename = "USER")]
|
||||||
|
User = 6,
|
||||||
|
#[serde(rename = "CHANNEL")]
|
||||||
|
Channel = 7,
|
||||||
|
#[serde(rename = "ROLE")]
|
||||||
|
Role = 8,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub struct ApplicationCommandInteractionData {
|
||||||
|
pub id: Snowflake,
|
||||||
|
pub name: String,
|
||||||
|
pub options: Vec<ApplicationCommandInteractionDataOption>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub struct ApplicationCommandInteractionDataOption {
|
||||||
|
pub name: String,
|
||||||
|
pub value: Value,
|
||||||
|
pub options: Vec<ApplicationCommandInteractionDataOption>,
|
||||||
|
}
|
|
@ -0,0 +1,113 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::utils::Snowflake;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub struct Attachment {
|
||||||
|
pub id: Snowflake,
|
||||||
|
pub filename: String,
|
||||||
|
pub description: Option<String>,
|
||||||
|
pub content_type: Option<String>,
|
||||||
|
pub size: u64,
|
||||||
|
pub url: String,
|
||||||
|
pub proxy_url: String,
|
||||||
|
pub height: Option<u64>,
|
||||||
|
pub width: Option<u64>,
|
||||||
|
pub message_id: Snowflake,
|
||||||
|
pub ephemeral: Option<bool>,
|
||||||
|
pub duration_secs: Option<f32>,
|
||||||
|
pub waveform: Option<String>,
|
||||||
|
#[serde(skip_serializing)]
|
||||||
|
pub content: Vec<u8>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||||
|
|
||||||
|
pub struct PartialDiscordFileAttachment {
|
||||||
|
pub id: Option<i16>,
|
||||||
|
pub filename: String,
|
||||||
|
pub description: Option<String>,
|
||||||
|
pub content_type: Option<String>,
|
||||||
|
pub size: Option<i64>,
|
||||||
|
pub url: Option<String>,
|
||||||
|
pub proxy_url: Option<String>,
|
||||||
|
pub height: Option<i32>,
|
||||||
|
pub width: Option<i32>,
|
||||||
|
pub ephemeral: Option<bool>,
|
||||||
|
pub duration_secs: Option<f32>,
|
||||||
|
pub waveform: Option<String>,
|
||||||
|
#[serde(skip_serializing)]
|
||||||
|
pub content: Vec<u8>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PartialDiscordFileAttachment {
|
||||||
|
/**
|
||||||
|
Moves `self.content` out of `self` and returns it.
|
||||||
|
# Returns
|
||||||
|
Vec<u8>
|
||||||
|
*/
|
||||||
|
pub fn move_content(self) -> (Vec<u8>, PartialDiscordFileAttachment) {
|
||||||
|
let content = self.content;
|
||||||
|
let updated_struct = PartialDiscordFileAttachment {
|
||||||
|
id: self.id,
|
||||||
|
filename: self.filename,
|
||||||
|
description: self.description,
|
||||||
|
content_type: self.content_type,
|
||||||
|
size: self.size,
|
||||||
|
url: self.url,
|
||||||
|
proxy_url: self.proxy_url,
|
||||||
|
height: self.height,
|
||||||
|
width: self.width,
|
||||||
|
ephemeral: self.ephemeral,
|
||||||
|
duration_secs: self.duration_secs,
|
||||||
|
waveform: self.waveform,
|
||||||
|
content: Vec::new(),
|
||||||
|
};
|
||||||
|
(content, updated_struct)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn move_filename(self) -> (String, PartialDiscordFileAttachment) {
|
||||||
|
let filename = self.filename;
|
||||||
|
let updated_struct = PartialDiscordFileAttachment {
|
||||||
|
id: self.id,
|
||||||
|
filename: String::new(),
|
||||||
|
description: self.description,
|
||||||
|
content_type: self.content_type,
|
||||||
|
size: self.size,
|
||||||
|
url: self.url,
|
||||||
|
proxy_url: self.proxy_url,
|
||||||
|
height: self.height,
|
||||||
|
width: self.width,
|
||||||
|
|
||||||
|
ephemeral: self.ephemeral,
|
||||||
|
duration_secs: self.duration_secs,
|
||||||
|
waveform: self.waveform,
|
||||||
|
content: self.content,
|
||||||
|
};
|
||||||
|
(filename, updated_struct)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn move_content_type(self) -> (Option<String>, PartialDiscordFileAttachment) {
|
||||||
|
let content_type = self.content_type;
|
||||||
|
let updated_struct = PartialDiscordFileAttachment {
|
||||||
|
id: self.id,
|
||||||
|
filename: self.filename,
|
||||||
|
description: self.description,
|
||||||
|
content_type: None,
|
||||||
|
size: self.size,
|
||||||
|
url: self.url,
|
||||||
|
proxy_url: self.proxy_url,
|
||||||
|
height: self.height,
|
||||||
|
width: self.width,
|
||||||
|
ephemeral: self.ephemeral,
|
||||||
|
duration_secs: self.duration_secs,
|
||||||
|
waveform: self.waveform,
|
||||||
|
content: self.content,
|
||||||
|
};
|
||||||
|
(content_type, updated_struct)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_id(&mut self, id: i16) {
|
||||||
|
self.id = Some(id);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,117 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use serde_repr::{Deserialize_repr, Serialize_repr};
|
||||||
|
|
||||||
|
use crate::types::{
|
||||||
|
entities::{GuildMember, User},
|
||||||
|
utils::Snowflake,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Default, Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
|
||||||
|
pub struct Channel {
|
||||||
|
pub id: Snowflake,
|
||||||
|
#[serde(rename = "type")]
|
||||||
|
pub channel_type: ChannelType,
|
||||||
|
pub guild_id: Option<Snowflake>,
|
||||||
|
pub position: Option<i32>,
|
||||||
|
pub permission_overwrites: Option<Vec<PermissionOverwrite>>,
|
||||||
|
pub name: Option<String>,
|
||||||
|
pub topic: Option<String>,
|
||||||
|
pub nsfw: Option<bool>,
|
||||||
|
pub last_message_id: Option<String>,
|
||||||
|
pub bitrate: Option<i32>,
|
||||||
|
pub user_limit: Option<i32>,
|
||||||
|
pub rate_limit_per_user: Option<i32>,
|
||||||
|
pub recipients: Option<Vec<User>>,
|
||||||
|
pub icon: Option<String>,
|
||||||
|
pub owner_id: Option<String>,
|
||||||
|
pub application_id: Option<String>,
|
||||||
|
pub parent_id: Option<String>,
|
||||||
|
pub last_pin_timestamp: Option<String>,
|
||||||
|
pub rtc_region: Option<String>,
|
||||||
|
pub video_quality_mode: Option<i32>,
|
||||||
|
pub message_count: Option<i32>,
|
||||||
|
pub member_count: Option<i32>,
|
||||||
|
pub thread_metadata: Option<ThreadMetadata>,
|
||||||
|
pub member: Option<ThreadMember>,
|
||||||
|
pub default_auto_archive_duration: Option<i32>,
|
||||||
|
pub permissions: Option<String>,
|
||||||
|
pub flags: Option<i32>,
|
||||||
|
pub total_message_sent: Option<i32>,
|
||||||
|
pub available_tags: Option<Vec<Tag>>,
|
||||||
|
pub applied_tags: Option<Vec<String>>,
|
||||||
|
pub default_reaction_emoji: Option<DefaultReaction>,
|
||||||
|
pub default_thread_rate_limit_per_user: Option<i32>,
|
||||||
|
pub default_sort_order: Option<i32>,
|
||||||
|
pub default_forum_layout: Option<i32>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
|
||||||
|
pub struct Tag {
|
||||||
|
pub id: u64,
|
||||||
|
pub name: String,
|
||||||
|
pub moderated: bool,
|
||||||
|
pub emoji_id: Option<u64>,
|
||||||
|
pub emoji_name: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
|
||||||
|
pub struct PermissionOverwrite {
|
||||||
|
pub id: String,
|
||||||
|
#[serde(rename = "type")]
|
||||||
|
pub overwrite_type: u8,
|
||||||
|
pub allow: String,
|
||||||
|
pub deny: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
|
||||||
|
pub struct ThreadMetadata {
|
||||||
|
pub archived: bool,
|
||||||
|
pub auto_archive_duration: i32,
|
||||||
|
pub archive_timestamp: String,
|
||||||
|
pub locked: bool,
|
||||||
|
pub invitable: Option<bool>,
|
||||||
|
pub create_timestamp: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Default, Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
|
||||||
|
pub struct ThreadMember {
|
||||||
|
pub id: Option<u64>,
|
||||||
|
pub user_id: Option<u64>,
|
||||||
|
pub join_timestamp: Option<String>,
|
||||||
|
pub flags: Option<u64>,
|
||||||
|
pub member: Option<GuildMember>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
|
||||||
|
pub struct DefaultReaction {
|
||||||
|
pub emoji_id: Option<String>,
|
||||||
|
pub emoji_name: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Default, Clone, Copy, Debug, Serialize_repr, Deserialize_repr, PartialEq, Eq)]
|
||||||
|
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
||||||
|
#[repr(i32)]
|
||||||
|
pub enum ChannelType {
|
||||||
|
#[default]
|
||||||
|
GuildText = 0,
|
||||||
|
Dm = 1,
|
||||||
|
GuildVoice = 2,
|
||||||
|
GroupDm = 3,
|
||||||
|
GuildCategory = 4,
|
||||||
|
GuildNews = 5,
|
||||||
|
GuildStore = 6,
|
||||||
|
Encrypted = 7,
|
||||||
|
EncryptedThreads = 8,
|
||||||
|
Transactional = 9,
|
||||||
|
GuildNewsThread = 10,
|
||||||
|
GuildPublicThread = 11,
|
||||||
|
GuildPrivateThread = 12,
|
||||||
|
GuildStageVoice = 13,
|
||||||
|
Directory = 14,
|
||||||
|
GuildForum = 15,
|
||||||
|
TicketTracker = 33,
|
||||||
|
Kanban = 34,
|
||||||
|
VoicelessWhiteboard = 35,
|
||||||
|
CustomStart = 64,
|
||||||
|
Unhandled = 255,
|
||||||
|
}
|
|
@ -0,0 +1,34 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use serde_json::Value;
|
||||||
|
#[cfg(feature = "sqlx")]
|
||||||
|
use sqlx::FromRow;
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
#[cfg_attr(feature = "sqlx", derive(FromRow))]
|
||||||
|
pub struct ConfigEntity {
|
||||||
|
pub key: String,
|
||||||
|
pub value: Option<Value>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ConfigEntity {
|
||||||
|
pub fn as_string(&self) -> Option<String> {
|
||||||
|
let Some(v) = self.value.as_ref() else {
|
||||||
|
return None;
|
||||||
|
};
|
||||||
|
Some(v.as_str().expect("value is not a string").to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn as_bool(&self) -> Option<bool> {
|
||||||
|
let Some(v) = self.value.as_ref() else {
|
||||||
|
return None;
|
||||||
|
};
|
||||||
|
Some(v.as_bool().expect("value is not a boolean"))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn as_int(&self) -> Option<i64> {
|
||||||
|
let Some(v) = self.value.as_ref() else {
|
||||||
|
return None;
|
||||||
|
};
|
||||||
|
Some(v.as_i64().expect("value is not a number"))
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,15 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::entities::User;
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Default, Clone)]
|
||||||
|
pub struct Emoji {
|
||||||
|
pub id: Option<u64>,
|
||||||
|
pub name: Option<String>,
|
||||||
|
pub roles: Option<Vec<u64>>,
|
||||||
|
pub user: Option<User>,
|
||||||
|
pub require_colons: Option<bool>,
|
||||||
|
pub managed: Option<bool>,
|
||||||
|
pub animated: Option<bool>,
|
||||||
|
pub available: Option<bool>,
|
||||||
|
}
|
|
@ -0,0 +1,117 @@
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::{
|
||||||
|
entities::{Channel, Emoji, GuildTemplate, RoleObject, Sticker, User, VoiceState, Webhook},
|
||||||
|
interfaces::WelcomeScreenObject,
|
||||||
|
utils::Snowflake,
|
||||||
|
};
|
||||||
|
|
||||||
|
/// See https://discord.com/developers/docs/resources/guild
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Default, Clone)]
|
||||||
|
pub struct Guild {
|
||||||
|
pub id: Snowflake,
|
||||||
|
pub name: String,
|
||||||
|
pub icon: Option<String>,
|
||||||
|
pub icon_hash: Option<String>,
|
||||||
|
pub splash: Option<String>,
|
||||||
|
pub discovery_splash: Option<String>,
|
||||||
|
pub owner: Option<User>,
|
||||||
|
pub owner_id: Option<Snowflake>,
|
||||||
|
pub permissions: Option<String>,
|
||||||
|
pub afk_channel_id: Option<Snowflake>,
|
||||||
|
pub afk_timeout: Option<u8>,
|
||||||
|
pub widget_enabled: Option<bool>,
|
||||||
|
pub widget_channel_id: Option<Snowflake>,
|
||||||
|
pub widget_channel: Option<Channel>,
|
||||||
|
pub verification_level: Option<u8>,
|
||||||
|
pub default_message_notifications: Option<u8>,
|
||||||
|
pub explicit_content_filter: Option<u8>,
|
||||||
|
pub roles: Vec<RoleObject>,
|
||||||
|
pub emojis: Vec<Emoji>,
|
||||||
|
pub features: Vec<String>,
|
||||||
|
pub application_id: Option<String>,
|
||||||
|
pub system_channel_id: Option<Snowflake>,
|
||||||
|
pub system_channel_flags: Option<u8>,
|
||||||
|
pub rules_channel_id: Option<String>,
|
||||||
|
pub rules_channel: Option<String>,
|
||||||
|
pub max_presences: Option<u64>,
|
||||||
|
pub max_members: Option<u64>,
|
||||||
|
pub vanity_url_code: Option<String>,
|
||||||
|
pub description: Option<String>,
|
||||||
|
pub banner: Option<String>,
|
||||||
|
pub premium_tier: Option<u8>,
|
||||||
|
pub premium_subscription_count: Option<u64>,
|
||||||
|
pub preferred_locale: Option<String>,
|
||||||
|
pub public_updates_channel_id: Option<Snowflake>,
|
||||||
|
pub public_updates_channel: Option<Channel>,
|
||||||
|
pub max_video_channel_users: Option<u8>,
|
||||||
|
pub max_stage_video_channel_users: Option<u8>,
|
||||||
|
pub approximate_member_count: Option<u64>,
|
||||||
|
pub approximate_presence_count: Option<u64>,
|
||||||
|
pub member_count: Option<u64>,
|
||||||
|
pub presence_count: Option<u64>,
|
||||||
|
pub welcome_screen: Option<WelcomeScreenObject>,
|
||||||
|
pub nsfw_level: u8,
|
||||||
|
pub nsfw: bool,
|
||||||
|
pub stickers: Option<Vec<Sticker>>,
|
||||||
|
pub premium_progress_bar_enabled: Option<bool>,
|
||||||
|
pub joined_at: String,
|
||||||
|
pub afk_channel: Option<Channel>,
|
||||||
|
pub bans: Option<Vec<GuildBan>>,
|
||||||
|
pub primary_category_id: Option<Snowflake>,
|
||||||
|
pub large: Option<bool>,
|
||||||
|
pub channels: Option<Vec<Channel>>,
|
||||||
|
pub template_id: Option<Snowflake>,
|
||||||
|
pub template: Option<GuildTemplate>,
|
||||||
|
pub invites: Option<Vec<GuildInvite>>,
|
||||||
|
pub voice_states: Option<Vec<VoiceState>>,
|
||||||
|
pub webhooks: Option<Vec<Webhook>>,
|
||||||
|
pub mfa_level: Option<u8>,
|
||||||
|
pub region: Option<String>,
|
||||||
|
pub unavailable: bool,
|
||||||
|
pub parent: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// See https://docs.spacebar.chat/routes/#get-/guilds/-guild_id-/bans/-user-
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Default, Clone)]
|
||||||
|
pub struct GuildBan {
|
||||||
|
pub id: Snowflake,
|
||||||
|
pub user_id: Snowflake,
|
||||||
|
pub guild_id: Snowflake,
|
||||||
|
pub executor_id: Snowflake,
|
||||||
|
pub reason: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// See https://docs.spacebar.chat/routes/#cmp--schemas-invite
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Default, Clone)]
|
||||||
|
pub struct GuildInvite {
|
||||||
|
pub code: String,
|
||||||
|
pub temporary: Option<bool>,
|
||||||
|
pub uses: Option<i32>,
|
||||||
|
pub max_uses: Option<i32>,
|
||||||
|
pub max_age: Option<i32>,
|
||||||
|
pub created_at: DateTime<Utc>,
|
||||||
|
pub expires_at: Option<DateTime<Utc>>,
|
||||||
|
pub guild_id: String,
|
||||||
|
pub guild: Option<Guild>,
|
||||||
|
pub channel_id: String,
|
||||||
|
pub channel: Option<Channel>,
|
||||||
|
pub inviter_id: Option<String>,
|
||||||
|
pub inviter: Option<User>,
|
||||||
|
pub target_user_id: Option<String>,
|
||||||
|
pub target_user: Option<String>,
|
||||||
|
pub target_user_type: Option<i32>,
|
||||||
|
pub vanity_url: Option<bool>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Default)]
|
||||||
|
pub struct UnavailableGuild {
|
||||||
|
id: String,
|
||||||
|
unavailable: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Default, Clone)]
|
||||||
|
pub struct GuildCreateResponse {
|
||||||
|
pub id: String,
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::entities::User;
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
|
||||||
|
pub struct GuildMember {
|
||||||
|
pub user: Option<User>,
|
||||||
|
pub nick: Option<String>,
|
||||||
|
pub avatar: Option<String>,
|
||||||
|
pub roles: Vec<String>,
|
||||||
|
pub joined_at: String,
|
||||||
|
pub premium_since: Option<String>,
|
||||||
|
pub deaf: bool,
|
||||||
|
pub mute: bool,
|
||||||
|
pub flags: i32,
|
||||||
|
pub pending: Option<bool>,
|
||||||
|
pub permissions: Option<String>,
|
||||||
|
pub communication_disabled_until: Option<String>,
|
||||||
|
}
|
|
@ -0,0 +1,36 @@
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::{
|
||||||
|
entities::{Application, User},
|
||||||
|
utils::Snowflake,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Default, Debug, Deserialize, Serialize, Clone)]
|
||||||
|
/// See https://discord.com/developers/docs/resources/guild#integration-object-integration-structure
|
||||||
|
pub struct Integration {
|
||||||
|
pub id: Snowflake,
|
||||||
|
pub name: String,
|
||||||
|
#[serde(rename = "type")]
|
||||||
|
pub integration_type: String,
|
||||||
|
pub enabled: bool,
|
||||||
|
pub syncing: Option<bool>,
|
||||||
|
pub role_id: Option<String>,
|
||||||
|
pub enabled_emoticons: Option<bool>,
|
||||||
|
pub expire_behaviour: Option<u8>,
|
||||||
|
pub expire_grace_period: Option<u16>,
|
||||||
|
pub user: Option<User>,
|
||||||
|
pub account: IntegrationAccount,
|
||||||
|
pub synced_at: Option<DateTime<Utc>>,
|
||||||
|
pub subscriber_count: Option<f64>,
|
||||||
|
pub revoked: Option<bool>,
|
||||||
|
pub application: Option<Application>,
|
||||||
|
pub scopes: Option<Vec<String>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Default, Debug, Deserialize, Serialize, Clone)]
|
||||||
|
/// See https://discord.com/developers/docs/resources/guild#integration-account-object-integration-account-structure
|
||||||
|
pub struct IntegrationAccount {
|
||||||
|
pub id: String,
|
||||||
|
pub name: String,
|
||||||
|
}
|
|
@ -0,0 +1,185 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::{
|
||||||
|
entities::{
|
||||||
|
Application, Attachment, Channel, Emoji, GuildMember, RoleSubscriptionData, Sticker,
|
||||||
|
StickerItem, User,
|
||||||
|
},
|
||||||
|
utils::Snowflake,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||||
|
pub struct Message {
|
||||||
|
id: Snowflake,
|
||||||
|
pub channel_id: Snowflake,
|
||||||
|
author: User,
|
||||||
|
content: String,
|
||||||
|
timestamp: String,
|
||||||
|
edited_timestamp: Option<String>,
|
||||||
|
tts: bool,
|
||||||
|
mention_everyone: bool,
|
||||||
|
mentions: Vec<User>,
|
||||||
|
mention_roles: Vec<String>,
|
||||||
|
mention_channels: Option<Vec<ChannelMention>>,
|
||||||
|
pub attachments: Vec<Attachment>,
|
||||||
|
embeds: Vec<Embed>,
|
||||||
|
reactions: Option<Vec<Reaction>>,
|
||||||
|
nonce: Option<serde_json::Value>,
|
||||||
|
pinned: bool,
|
||||||
|
webhook_id: Option<String>,
|
||||||
|
#[serde(rename = "type")]
|
||||||
|
message_type: i32,
|
||||||
|
activity: Option<MessageActivity>,
|
||||||
|
application: Option<Application>,
|
||||||
|
application_id: Option<String>,
|
||||||
|
message_reference: Option<MessageReference>,
|
||||||
|
flags: Option<i32>,
|
||||||
|
referenced_message: Option<Box<Message>>,
|
||||||
|
interaction: Option<MessageInteraction>,
|
||||||
|
thread: Option<Channel>,
|
||||||
|
components: Option<Vec<Component>>,
|
||||||
|
sticker_items: Option<Vec<StickerItem>>,
|
||||||
|
stickers: Option<Vec<Sticker>>,
|
||||||
|
position: Option<i32>,
|
||||||
|
role_subscription_data: Option<RoleSubscriptionData>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
pub struct MessageReference {
|
||||||
|
pub message_id: Snowflake,
|
||||||
|
pub channel_id: Snowflake,
|
||||||
|
pub guild_id: Option<Snowflake>,
|
||||||
|
pub fail_if_not_exists: Option<bool>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize)]
|
||||||
|
pub struct MessageInteraction {
|
||||||
|
pub id: Snowflake,
|
||||||
|
#[serde(rename = "type")]
|
||||||
|
pub interaction_type: u8,
|
||||||
|
pub name: String,
|
||||||
|
pub user: User,
|
||||||
|
pub member: Option<GuildMember>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
pub struct AllowedMention {
|
||||||
|
parse: Vec<AllowedMentionType>,
|
||||||
|
roles: Vec<Snowflake>,
|
||||||
|
users: Vec<Snowflake>,
|
||||||
|
replied_user: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "snake_case")]
|
||||||
|
pub enum AllowedMentionType {
|
||||||
|
Roles,
|
||||||
|
Users,
|
||||||
|
Everyone,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
struct ChannelMention {
|
||||||
|
id: Snowflake,
|
||||||
|
guild_id: Snowflake,
|
||||||
|
#[serde(rename = "type")]
|
||||||
|
channel_type: i32,
|
||||||
|
name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
pub struct Embed {
|
||||||
|
title: Option<String>,
|
||||||
|
#[serde(rename = "type")]
|
||||||
|
embed_type: Option<String>,
|
||||||
|
description: Option<String>,
|
||||||
|
url: Option<String>,
|
||||||
|
timestamp: Option<String>,
|
||||||
|
color: Option<i32>,
|
||||||
|
footer: Option<EmbedFooter>,
|
||||||
|
image: Option<EmbedImage>,
|
||||||
|
thumbnail: Option<EmbedThumbnail>,
|
||||||
|
video: Option<EmbedVideo>,
|
||||||
|
provider: Option<EmbedProvider>,
|
||||||
|
author: Option<EmbedAuthor>,
|
||||||
|
fields: Option<Vec<EmbedField>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
struct EmbedFooter {
|
||||||
|
text: String,
|
||||||
|
icon_url: Option<String>,
|
||||||
|
proxy_icon_url: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
struct EmbedImage {
|
||||||
|
url: String,
|
||||||
|
proxy_url: String,
|
||||||
|
height: Option<i32>,
|
||||||
|
width: Option<i32>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
struct EmbedThumbnail {
|
||||||
|
url: String,
|
||||||
|
proxy_url: Option<String>,
|
||||||
|
height: Option<i32>,
|
||||||
|
width: Option<i32>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
struct EmbedVideo {
|
||||||
|
url: Option<String>,
|
||||||
|
proxy_url: Option<String>,
|
||||||
|
height: Option<i32>,
|
||||||
|
width: Option<i32>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
struct EmbedProvider {
|
||||||
|
name: Option<String>,
|
||||||
|
url: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
struct EmbedAuthor {
|
||||||
|
name: String,
|
||||||
|
url: Option<String>,
|
||||||
|
icon_url: Option<String>,
|
||||||
|
proxy_icon_url: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
|
||||||
|
struct EmbedField {
|
||||||
|
name: String,
|
||||||
|
value: String,
|
||||||
|
inline: Option<bool>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
pub struct Reaction {
|
||||||
|
pub count: i32,
|
||||||
|
pub me: bool,
|
||||||
|
pub emoji: Emoji,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
pub enum Component {
|
||||||
|
ActionRow = 1,
|
||||||
|
Button = 2,
|
||||||
|
StringSelect = 3,
|
||||||
|
TextInput = 4,
|
||||||
|
UserSelect = 5,
|
||||||
|
RoleSelect = 6,
|
||||||
|
MentionableSelect = 7,
|
||||||
|
ChannelSelect = 8,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
pub struct MessageActivity {
|
||||||
|
#[serde(rename = "type")]
|
||||||
|
pub activity_type: i64,
|
||||||
|
pub party_id: Option<String>,
|
||||||
|
}
|
|
@ -0,0 +1,37 @@
|
||||||
|
mod application;
|
||||||
|
mod attachment;
|
||||||
|
mod channel;
|
||||||
|
mod config;
|
||||||
|
mod emoji;
|
||||||
|
mod guild;
|
||||||
|
mod guild_member;
|
||||||
|
mod integration;
|
||||||
|
mod message;
|
||||||
|
mod role;
|
||||||
|
mod security_key;
|
||||||
|
mod sticker;
|
||||||
|
mod team;
|
||||||
|
mod template;
|
||||||
|
mod user;
|
||||||
|
mod user_settings;
|
||||||
|
mod voice_state;
|
||||||
|
mod webhook;
|
||||||
|
|
||||||
|
pub use application::*;
|
||||||
|
pub use attachment::*;
|
||||||
|
pub use channel::*;
|
||||||
|
pub use config::*;
|
||||||
|
pub use emoji::*;
|
||||||
|
pub use guild::*;
|
||||||
|
pub use guild_member::*;
|
||||||
|
pub use integration::*;
|
||||||
|
pub use message::*;
|
||||||
|
pub use role::*;
|
||||||
|
pub use security_key::*;
|
||||||
|
pub use sticker::*;
|
||||||
|
pub use team::*;
|
||||||
|
pub use template::*;
|
||||||
|
pub use user::*;
|
||||||
|
pub use user_settings::*;
|
||||||
|
pub use voice_state::*;
|
||||||
|
pub use webhook::*;
|
|
@ -0,0 +1,28 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::utils::Snowflake;
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Default, Clone)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/permissions#role-object
|
||||||
|
pub struct RoleObject {
|
||||||
|
pub id: Snowflake,
|
||||||
|
pub name: String,
|
||||||
|
pub color: f64,
|
||||||
|
pub hoist: bool,
|
||||||
|
pub icon: Option<String>,
|
||||||
|
pub unicode_emoji: Option<String>,
|
||||||
|
pub position: u16,
|
||||||
|
pub permissions: String,
|
||||||
|
pub managed: bool,
|
||||||
|
pub mentionable: bool,
|
||||||
|
// to:do add role tags https://discord.com/developers/docs/topics/permissions#role-object-role-tags-structure
|
||||||
|
//pub tags: Option<RoleTags>
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
pub struct RoleSubscriptionData {
|
||||||
|
pub role_subscription_listing_id: Snowflake,
|
||||||
|
pub tier_name: String,
|
||||||
|
pub total_months_subscribed: u32,
|
||||||
|
pub is_renewal: bool,
|
||||||
|
}
|
|
@ -0,0 +1,26 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::utils::Snowflake;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct SecurityKey {
|
||||||
|
pub id: String,
|
||||||
|
pub user_id: String,
|
||||||
|
pub key_id: String,
|
||||||
|
pub public_key: String,
|
||||||
|
pub counter: u64,
|
||||||
|
pub name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for SecurityKey {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
id: Snowflake::generate().to_string(),
|
||||||
|
user_id: String::new(),
|
||||||
|
key_id: String::new(),
|
||||||
|
public_key: String::new(),
|
||||||
|
counter: 0,
|
||||||
|
name: String::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,27 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::{entities::User, utils::Snowflake};
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||||
|
pub struct Sticker {
|
||||||
|
pub id: Snowflake,
|
||||||
|
pub pack_id: Option<Snowflake>,
|
||||||
|
pub name: String,
|
||||||
|
pub description: Option<String>,
|
||||||
|
pub tags: String,
|
||||||
|
pub asset: Option<String>,
|
||||||
|
#[serde(rename = "type")]
|
||||||
|
pub sticker_type: u8,
|
||||||
|
pub format_type: u8,
|
||||||
|
pub available: Option<bool>,
|
||||||
|
pub guild_id: Option<u64>,
|
||||||
|
pub user: Option<User>,
|
||||||
|
pub sort_value: Option<u8>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
pub struct StickerItem {
|
||||||
|
pub id: Snowflake,
|
||||||
|
pub name: String,
|
||||||
|
pub format_type: u8,
|
||||||
|
}
|
|
@ -0,0 +1,20 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::entities::User;
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Clone)]
|
||||||
|
pub struct Team {
|
||||||
|
pub icon: Option<String>,
|
||||||
|
pub id: u64,
|
||||||
|
pub members: Vec<TeamMember>,
|
||||||
|
pub name: String,
|
||||||
|
pub owner_user_id: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Clone)]
|
||||||
|
pub struct TeamMember {
|
||||||
|
pub membership_state: u8,
|
||||||
|
pub permissions: Vec<String>,
|
||||||
|
pub team_id: u64,
|
||||||
|
pub user: User,
|
||||||
|
}
|
|
@ -0,0 +1,24 @@
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::{
|
||||||
|
entities::{Guild, User},
|
||||||
|
utils::Snowflake,
|
||||||
|
};
|
||||||
|
|
||||||
|
/// See https://docs.spacebar.chat/routes/#cmp--schemas-template
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Default, Clone)]
|
||||||
|
pub struct GuildTemplate {
|
||||||
|
pub code: String,
|
||||||
|
pub name: String,
|
||||||
|
pub description: Option<String>,
|
||||||
|
pub usage_count: Option<u64>,
|
||||||
|
pub creator_id: Snowflake,
|
||||||
|
pub creator: User,
|
||||||
|
pub created_at: DateTime<Utc>,
|
||||||
|
pub updated_at: DateTime<Utc>,
|
||||||
|
pub source_guild_id: String,
|
||||||
|
pub source_guild: Vec<Guild>, // Unsure how a {recursive: Guild} looks like, might be a Vec?
|
||||||
|
pub serialized_source_guild: Vec<Guild>,
|
||||||
|
id: Snowflake,
|
||||||
|
}
|
|
@ -0,0 +1,118 @@
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use serde_json::{Map, Value};
|
||||||
|
#[cfg(feature = "sqlx")]
|
||||||
|
use sqlx::{FromRow, Type};
|
||||||
|
|
||||||
|
use crate::types::{
|
||||||
|
errors::Error,
|
||||||
|
utils::Snowflake, //util::{email::adjust_email, entities::user_setting::UserSettings},
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
|
||||||
|
#[cfg_attr(feature = "sqlx", derive(Type))]
|
||||||
|
pub struct UserData {
|
||||||
|
pub valid_tokens_since: DateTime<Utc>,
|
||||||
|
pub hash: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl User {
|
||||||
|
pub fn to_public_user(self) -> PublicUser {
|
||||||
|
PublicUser::from(self)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq, Eq)]
|
||||||
|
pub struct User {
|
||||||
|
pub id: Snowflake,
|
||||||
|
username: String,
|
||||||
|
discriminator: String,
|
||||||
|
avatar: Option<String>,
|
||||||
|
bot: bool,
|
||||||
|
system: Option<bool>,
|
||||||
|
mfa_enabled: Option<bool>,
|
||||||
|
accent_color: Option<u8>,
|
||||||
|
locale: Option<String>,
|
||||||
|
verified: Option<bool>,
|
||||||
|
email: Option<String>,
|
||||||
|
flags: String,
|
||||||
|
premium_since: Option<DateTime<Utc>>,
|
||||||
|
premium_type: u8,
|
||||||
|
pronouns: Option<String>,
|
||||||
|
public_flags: Option<u16>,
|
||||||
|
banner: Option<String>,
|
||||||
|
bio: String,
|
||||||
|
theme_colors: Option<Vec<u8>>,
|
||||||
|
phone: Option<String>,
|
||||||
|
nsfw_allowed: bool,
|
||||||
|
premium: bool,
|
||||||
|
purchased_flags: i32,
|
||||||
|
premium_usage_flags: i32,
|
||||||
|
disabled: Option<bool>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub struct PublicUser {
|
||||||
|
pub id: Snowflake,
|
||||||
|
pub username: String,
|
||||||
|
pub discriminator: String,
|
||||||
|
pub avatar: Option<String>,
|
||||||
|
pub accent_color: Option<u8>,
|
||||||
|
pub banner: Option<String>,
|
||||||
|
pub theme_colors: Option<Vec<u8>>,
|
||||||
|
pub pronouns: Option<String>,
|
||||||
|
pub bot: bool,
|
||||||
|
pub bio: String,
|
||||||
|
pub premium_type: u8,
|
||||||
|
pub premium_since: Option<DateTime<Utc>>,
|
||||||
|
pub public_flags: Option<u16>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<User> for PublicUser {
|
||||||
|
fn from(value: User) -> Self {
|
||||||
|
Self {
|
||||||
|
id: value.id,
|
||||||
|
username: value.username,
|
||||||
|
discriminator: value.discriminator,
|
||||||
|
avatar: value.avatar,
|
||||||
|
accent_color: value.accent_color,
|
||||||
|
banner: value.banner,
|
||||||
|
theme_colors: value.theme_colors,
|
||||||
|
pronouns: value.pronouns,
|
||||||
|
bot: value.bot,
|
||||||
|
bio: value.bio,
|
||||||
|
premium_type: value.premium_type,
|
||||||
|
premium_since: value.premium_since,
|
||||||
|
public_flags: value.public_flags,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const CUSTOM_USER_FLAG_OFFSET: u64 = 1 << 32;
|
||||||
|
|
||||||
|
bitflags::bitflags! {
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
|
||||||
|
#[cfg_attr(feature = "sqlx", derive(Type))]
|
||||||
|
pub struct UserFlags: u64 {
|
||||||
|
const DISCORD_EMPLOYEE = 1 << 0;
|
||||||
|
const PARTNERED_SERVER_OWNER = 1 << 1;
|
||||||
|
const HYPESQUAD_EVENTS = 1 << 2;
|
||||||
|
const BUGHUNTER_LEVEL_1 =1 << 3;
|
||||||
|
const MFA_SMS = 1 << 4;
|
||||||
|
const PREMIUM_PROMO_DISMISSED = 1 << 5;
|
||||||
|
const HOUSE_BRAVERY = 1 << 6;
|
||||||
|
const HOUSE_BRILLIANCE = 1 << 7;
|
||||||
|
const HOUSE_BALANCE = 1 << 8;
|
||||||
|
const EARLY_SUPPORTER = 1 << 9;
|
||||||
|
const TEAM_USER = 1 << 10;
|
||||||
|
const TRUST_AND_SAFETY = 1 << 11;
|
||||||
|
const SYSTEM = 1 << 12;
|
||||||
|
const HAS_UNREAD_URGENT_MESSAGES = 1 << 13;
|
||||||
|
const BUGHUNTER_LEVEL_2 = 1 << 14;
|
||||||
|
const UNDERAGE_DELETED = 1 << 15;
|
||||||
|
const VERIFIED_BOT = 1 << 16;
|
||||||
|
const EARLY_VERIFIED_BOT_DEVELOPER = 1 << 17;
|
||||||
|
const CERTIFIED_MODERATOR = 1 << 18;
|
||||||
|
const BOT_HTTP_INTERACTIONS = 1 << 19;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,130 @@
|
||||||
|
use chrono::{serde::ts_milliseconds_option, Utc};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::utils::Snowflake;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
|
||||||
|
#[serde(rename_all = "lowercase")]
|
||||||
|
pub enum UserStatus {
|
||||||
|
#[default]
|
||||||
|
Online,
|
||||||
|
Offline,
|
||||||
|
Dnd,
|
||||||
|
Idle,
|
||||||
|
Invisible,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
|
||||||
|
#[serde(rename_all = "lowercase")]
|
||||||
|
pub enum UserTheme {
|
||||||
|
#[default]
|
||||||
|
Dark,
|
||||||
|
Light,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct UserSettings {
|
||||||
|
pub afk_timeout: u16,
|
||||||
|
pub allow_accessibility_detection: bool,
|
||||||
|
pub animate_emoji: bool,
|
||||||
|
pub animate_stickers: u8,
|
||||||
|
pub contact_sync_enabled: bool,
|
||||||
|
pub convert_emoticons: bool,
|
||||||
|
pub custom_status: Option<CustomStatus>,
|
||||||
|
pub default_guilds_restricted: bool,
|
||||||
|
pub detect_platform_accounts: bool,
|
||||||
|
pub developer_mode: bool,
|
||||||
|
pub disable_games_tab: bool,
|
||||||
|
pub enable_tts_command: bool,
|
||||||
|
pub explicit_content_filter: u8,
|
||||||
|
pub friend_source_flags: FriendSourceFlags,
|
||||||
|
pub gateway_connected: bool,
|
||||||
|
pub gif_auto_play: bool,
|
||||||
|
pub guild_folders: Vec<GuildFolder>,
|
||||||
|
pub guild_positions: Vec<String>,
|
||||||
|
pub inline_attachment_media: bool,
|
||||||
|
pub inline_embed_media: bool,
|
||||||
|
pub locale: String,
|
||||||
|
pub message_display_compact: bool,
|
||||||
|
pub native_phone_integration_enabled: bool,
|
||||||
|
pub render_embeds: bool,
|
||||||
|
pub render_reactions: bool,
|
||||||
|
pub restricted_guilds: Vec<String>,
|
||||||
|
pub show_current_game: bool,
|
||||||
|
pub status: UserStatus,
|
||||||
|
pub stream_notifications_enabled: bool,
|
||||||
|
pub theme: UserTheme,
|
||||||
|
pub timezone_offset: i16,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for UserSettings {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
afk_timeout: 3600,
|
||||||
|
allow_accessibility_detection: true,
|
||||||
|
animate_emoji: true,
|
||||||
|
animate_stickers: 0,
|
||||||
|
contact_sync_enabled: false,
|
||||||
|
convert_emoticons: false,
|
||||||
|
custom_status: None,
|
||||||
|
default_guilds_restricted: false,
|
||||||
|
detect_platform_accounts: false,
|
||||||
|
developer_mode: true,
|
||||||
|
disable_games_tab: true,
|
||||||
|
enable_tts_command: false,
|
||||||
|
explicit_content_filter: 0,
|
||||||
|
friend_source_flags: FriendSourceFlags::default(),
|
||||||
|
gateway_connected: false,
|
||||||
|
gif_auto_play: false,
|
||||||
|
guild_folders: Vec::new(),
|
||||||
|
guild_positions: Vec::new(),
|
||||||
|
inline_attachment_media: true,
|
||||||
|
inline_embed_media: true,
|
||||||
|
locale: "en-US".to_string(),
|
||||||
|
message_display_compact: false,
|
||||||
|
native_phone_integration_enabled: true,
|
||||||
|
render_embeds: true,
|
||||||
|
render_reactions: true,
|
||||||
|
restricted_guilds: Vec::new(),
|
||||||
|
show_current_game: true,
|
||||||
|
status: UserStatus::Online,
|
||||||
|
stream_notifications_enabled: false,
|
||||||
|
theme: UserTheme::Dark,
|
||||||
|
timezone_offset: 0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct CustomStatus {
|
||||||
|
pub emoji_id: Option<String>,
|
||||||
|
pub emoji_name: Option<String>,
|
||||||
|
#[serde(with = "ts_milliseconds_option")]
|
||||||
|
pub expires_at: Option<chrono::DateTime<Utc>>,
|
||||||
|
pub text: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct FriendSourceFlags {
|
||||||
|
pub all: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for FriendSourceFlags {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self { all: true }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct GuildFolder {
|
||||||
|
pub color: u32,
|
||||||
|
pub guild_ids: Vec<String>,
|
||||||
|
pub id: u16,
|
||||||
|
pub name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
pub struct LoginResult {
|
||||||
|
pub token: String,
|
||||||
|
pub settings: UserSettings,
|
||||||
|
}
|
|
@ -0,0 +1,30 @@
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::{
|
||||||
|
entities::{Channel, Guild, GuildMember, User},
|
||||||
|
utils::Snowflake,
|
||||||
|
};
|
||||||
|
|
||||||
|
/// See https://docs.spacebar.chat/routes/#cmp--schemas-voicestate
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Default, Clone)]
|
||||||
|
pub struct VoiceState {
|
||||||
|
pub guild_id: Snowflake,
|
||||||
|
pub guild: Option<Guild>,
|
||||||
|
pub channel_id: Snowflake,
|
||||||
|
pub channel: Option<Channel>,
|
||||||
|
pub user_id: Snowflake,
|
||||||
|
pub user: Option<User>,
|
||||||
|
pub member: Option<GuildMember>,
|
||||||
|
pub session_id: Snowflake,
|
||||||
|
pub token: String,
|
||||||
|
pub deaf: bool,
|
||||||
|
pub mute: bool,
|
||||||
|
pub self_deaf: bool,
|
||||||
|
pub self_mute: bool,
|
||||||
|
pub self_stream: Option<bool>,
|
||||||
|
pub self_video: bool,
|
||||||
|
pub suppress: bool,
|
||||||
|
pub request_to_speak_timestamp: Option<DateTime<Utc>>,
|
||||||
|
pub id: Snowflake,
|
||||||
|
}
|
|
@ -0,0 +1,32 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::{
|
||||||
|
entities::{Application, Channel, Guild, User},
|
||||||
|
utils::Snowflake,
|
||||||
|
};
|
||||||
|
|
||||||
|
/// See https://docs.spacebar.chat/routes/#cmp--schemas-webhook
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Default, Clone)]
|
||||||
|
pub struct Webhook {
|
||||||
|
#[serde(rename = "type")]
|
||||||
|
pub webhook_type: i32,
|
||||||
|
pub name: String,
|
||||||
|
pub avatar: String,
|
||||||
|
pub token: String,
|
||||||
|
pub guild_id: Snowflake,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub guild: Option<Guild>,
|
||||||
|
pub channel_id: Snowflake,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub channel: Option<Channel>,
|
||||||
|
pub application_id: Snowflake,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub application: Option<Application>,
|
||||||
|
pub user_id: Snowflake,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub user: Option<User>,
|
||||||
|
pub source_guild_id: Snowflake,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub source_guild: Option<Guild>,
|
||||||
|
pub id: Snowflake,
|
||||||
|
}
|
|
@ -0,0 +1,54 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, thiserror::Error)]
|
||||||
|
pub enum Error {
|
||||||
|
#[cfg(feature = "sqlx")]
|
||||||
|
#[error("SQLX error: {0}")]
|
||||||
|
SQLX(#[from] sqlx::Error),
|
||||||
|
|
||||||
|
#[error("serde: {0}")]
|
||||||
|
Serde(#[from] serde_json::Error),
|
||||||
|
|
||||||
|
#[error(transparent)]
|
||||||
|
IO(#[from] std::io::Error),
|
||||||
|
|
||||||
|
#[error(transparent)]
|
||||||
|
FieldFormat(#[from] FieldFormatError),
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq, Eq, thiserror::Error)]
|
||||||
|
pub enum FieldFormatError {
|
||||||
|
#[error("Password must be between 1 and 72 characters.")]
|
||||||
|
PasswordError,
|
||||||
|
#[error("Username must be between 2 and 32 characters.")]
|
||||||
|
UsernameError,
|
||||||
|
#[error("Consent must be 'true' to register.")]
|
||||||
|
ConsentError,
|
||||||
|
#[error("The provided email address is in an invalid format.")]
|
||||||
|
EmailError,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Debug)]
|
||||||
|
pub struct ErrorResponse {
|
||||||
|
pub code: i32,
|
||||||
|
pub message: String,
|
||||||
|
pub errors: IntermittentError,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Debug)]
|
||||||
|
pub struct IntermittentError {
|
||||||
|
#[serde(flatten)]
|
||||||
|
pub errors: std::collections::HashMap<String, ErrorField>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Default)]
|
||||||
|
pub struct ErrorField {
|
||||||
|
#[serde(default)]
|
||||||
|
pub _errors: Vec<APIError>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Debug)]
|
||||||
|
pub struct APIError {
|
||||||
|
pub message: String,
|
||||||
|
pub code: String,
|
||||||
|
}
|
|
@ -0,0 +1,41 @@
|
||||||
|
use crate::types::entities::Channel;
|
||||||
|
use crate::types::events::WebSocketEvent;
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#channel-pins-update
|
||||||
|
pub struct ChannelPinsUpdate {
|
||||||
|
pub guild_id: Option<String>,
|
||||||
|
pub channel_id: String,
|
||||||
|
pub last_pin_timestamp: Option<DateTime<Utc>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for ChannelPinsUpdate {}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#channel-create
|
||||||
|
/// Not directly serialized, as the inner payload is a channel object
|
||||||
|
pub struct ChannelCreate {
|
||||||
|
pub channel: Channel,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for ChannelCreate {}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#channel-update
|
||||||
|
/// Not directly serialized, as the inner payload is a channel object
|
||||||
|
pub struct ChannelUpdate {
|
||||||
|
pub channel: Channel,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for ChannelUpdate {}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#channel-delete
|
||||||
|
/// Not directly serialized, as the inner payload is a channel object
|
||||||
|
pub struct ChannelDelete {
|
||||||
|
pub channel: Channel,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for ChannelDelete {}
|
|
@ -0,0 +1,41 @@
|
||||||
|
use crate::types::entities::{Guild, UnavailableGuild, User};
|
||||||
|
use crate::types::events::WebSocketEvent;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Default)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#guild-create
|
||||||
|
/// This one is particularly painful, it can be a Guild object with extra field or an unavailbile guild object
|
||||||
|
pub struct GuildCreate {
|
||||||
|
pub d: GuildCreateDataOption,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize)]
|
||||||
|
pub enum GuildCreateDataOption {
|
||||||
|
UnavailableGuild(UnavailableGuild),
|
||||||
|
Guild(Guild),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for GuildCreateDataOption {
|
||||||
|
fn default() -> Self {
|
||||||
|
GuildCreateDataOption::UnavailableGuild(UnavailableGuild::default())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl WebSocketEvent for GuildCreate {}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#guild-ban-add-guild-ban-add-event-fields
|
||||||
|
pub struct GuildBanAdd {
|
||||||
|
pub guild_id: String,
|
||||||
|
pub user: User,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for GuildBanAdd {}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#guild-ban-remove
|
||||||
|
pub struct GuildBanRemove {
|
||||||
|
pub guild_id: String,
|
||||||
|
pub user: User,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for GuildBanRemove {}
|
|
@ -0,0 +1,17 @@
|
||||||
|
use crate::types::events::WebSocketEvent;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
pub struct GatewayHeartbeat {
|
||||||
|
pub op: u8,
|
||||||
|
pub d: Option<u64>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for GatewayHeartbeat {}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
pub struct GatewayHeartbeatAck {
|
||||||
|
pub op: i32,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for GatewayHeartbeatAck {}
|
|
@ -0,0 +1,17 @@
|
||||||
|
use crate::types::events::WebSocketEvent;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
pub struct GatewayHello {
|
||||||
|
pub op: i32,
|
||||||
|
pub d: HelloData,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for GatewayHello {}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
pub struct HelloData {
|
||||||
|
pub heartbeat_interval: u128,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for HelloData {}
|
|
@ -0,0 +1,22 @@
|
||||||
|
use crate::types::events::{PresenceUpdate, WebSocketEvent};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Default)]
|
||||||
|
pub struct GatewayIdentifyPayload {
|
||||||
|
pub token: String,
|
||||||
|
pub properties: GatewayIdentifyConnectionProps,
|
||||||
|
pub compress: Option<bool>,
|
||||||
|
pub large_threshold: Option<i16>, //default: 50
|
||||||
|
pub shard: Option<Vec<(i32, i32)>>,
|
||||||
|
pub presence: Option<PresenceUpdate>,
|
||||||
|
pub intents: i32,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for GatewayIdentifyPayload {}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Default)]
|
||||||
|
pub struct GatewayIdentifyConnectionProps {
|
||||||
|
pub os: String,
|
||||||
|
pub browser: String,
|
||||||
|
pub device: String,
|
||||||
|
}
|
|
@ -0,0 +1,101 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::types::{
|
||||||
|
entities::{Emoji, GuildMember, Message, User},
|
||||||
|
utils::Snowflake,
|
||||||
|
};
|
||||||
|
|
||||||
|
use super::WebSocketEvent;
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Default)]
|
||||||
|
pub struct TypingStartEvent {
|
||||||
|
pub channel_id: String,
|
||||||
|
pub guild_id: Option<String>,
|
||||||
|
pub user_id: String,
|
||||||
|
pub timestamp: i64,
|
||||||
|
pub member: Option<GuildMember>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for TypingStartEvent {}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||||
|
pub struct MessageCreate {
|
||||||
|
#[serde(flatten)]
|
||||||
|
message: Message,
|
||||||
|
guild_id: Option<Snowflake>,
|
||||||
|
member: Option<GuildMember>,
|
||||||
|
mentions: Vec<(User, GuildMember)>, // Not sure if this is correct: https://discord.com/developers/docs/topics/gateway-events#message-create
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for MessageCreate {}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||||
|
pub struct MessageUpdate {
|
||||||
|
#[serde(flatten)]
|
||||||
|
message: Message,
|
||||||
|
guild_id: Option<String>,
|
||||||
|
member: Option<GuildMember>,
|
||||||
|
mentions: Vec<(User, GuildMember)>, // Not sure if this is correct: https://discord.com/developers/docs/topics/gateway-events#message-create
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for MessageUpdate {}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||||
|
pub struct MessageDelete {
|
||||||
|
id: String,
|
||||||
|
channel_id: String,
|
||||||
|
guild_id: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for MessageDelete {}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||||
|
pub struct MessageDeleteBulk {
|
||||||
|
ids: Vec<String>,
|
||||||
|
channel_id: String,
|
||||||
|
guild_id: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for MessageDeleteBulk {}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||||
|
pub struct MessageReactionAdd {
|
||||||
|
user_id: String,
|
||||||
|
channel_id: String,
|
||||||
|
message_id: String,
|
||||||
|
guild_id: Option<String>,
|
||||||
|
member: Option<GuildMember>,
|
||||||
|
emoji: Emoji,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for MessageReactionAdd {}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||||
|
pub struct MessageReactionRemove {
|
||||||
|
user_id: String,
|
||||||
|
channel_id: String,
|
||||||
|
message_id: String,
|
||||||
|
guild_id: Option<String>,
|
||||||
|
emoji: Emoji,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for MessageReactionRemove {}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||||
|
pub struct MessageReactionRemoveAll {
|
||||||
|
channel_id: String,
|
||||||
|
message_id: String,
|
||||||
|
guild_id: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for MessageReactionRemoveAll {}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||||
|
pub struct MessageReactionRemoveEmoji {
|
||||||
|
channel_id: String,
|
||||||
|
message_id: String,
|
||||||
|
guild_id: Option<String>,
|
||||||
|
emoji: Emoji,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for MessageReactionRemoveEmoji {}
|
|
@ -0,0 +1,41 @@
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
mod channel;
|
||||||
|
mod guild;
|
||||||
|
mod heartbeat;
|
||||||
|
mod hello;
|
||||||
|
mod identify;
|
||||||
|
mod message;
|
||||||
|
mod presence;
|
||||||
|
mod ready;
|
||||||
|
mod request_members;
|
||||||
|
mod resume;
|
||||||
|
mod thread;
|
||||||
|
mod user;
|
||||||
|
mod voice_status;
|
||||||
|
|
||||||
|
pub use channel::*;
|
||||||
|
pub use guild::*;
|
||||||
|
pub use heartbeat::*;
|
||||||
|
pub use hello::*;
|
||||||
|
pub use identify::*;
|
||||||
|
pub use message::*;
|
||||||
|
pub use presence::*;
|
||||||
|
pub use ready::*;
|
||||||
|
pub use request_members::*;
|
||||||
|
pub use resume::*;
|
||||||
|
pub use thread::*;
|
||||||
|
pub use user::*;
|
||||||
|
pub use voice_status::*;
|
||||||
|
|
||||||
|
pub trait WebSocketEvent {}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
pub struct GatewayPayload {
|
||||||
|
pub op: u8,
|
||||||
|
pub d: Option<serde_json::Value>,
|
||||||
|
pub s: Option<u64>,
|
||||||
|
pub t: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for GatewayPayload {}
|
|
@ -0,0 +1,24 @@
|
||||||
|
use crate::types::entities::User;
|
||||||
|
use crate::types::events::WebSocketEvent;
|
||||||
|
use crate::types::interfaces::Activity;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Default, Clone)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#presence-update-presence-update-event-fields
|
||||||
|
pub struct PresenceUpdate {
|
||||||
|
pub user: User,
|
||||||
|
pub guild_id: String,
|
||||||
|
pub status: String,
|
||||||
|
pub activities: Vec<Activity>,
|
||||||
|
pub client_status: ClientStatusObject,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Default, Clone)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#client-status-object
|
||||||
|
pub struct ClientStatusObject {
|
||||||
|
pub desktop: Option<String>,
|
||||||
|
pub mobile: Option<String>,
|
||||||
|
pub web: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for PresenceUpdate {}
|
|
@ -0,0 +1,15 @@
|
||||||
|
use crate::types::entities::{UnavailableGuild, User};
|
||||||
|
use crate::types::events::WebSocketEvent;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Default)]
|
||||||
|
pub struct GatewayReady {
|
||||||
|
pub v: u8,
|
||||||
|
pub user: User,
|
||||||
|
pub guilds: Vec<UnavailableGuild>,
|
||||||
|
pub session_id: String,
|
||||||
|
pub resume_gateway_url: Option<String>,
|
||||||
|
pub shard: Option<(u64, u64)>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for GatewayReady {}
|
|
@ -0,0 +1,15 @@
|
||||||
|
use crate::types::events::WebSocketEvent;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Default)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#request-guild-members-request-guild-members-structure
|
||||||
|
pub struct GatewayRequestGuildMembers {
|
||||||
|
pub guild_id: String,
|
||||||
|
pub query: Option<String>,
|
||||||
|
pub limit: u64,
|
||||||
|
pub presence: Option<bool>,
|
||||||
|
pub user_ids: Option<String>,
|
||||||
|
pub nonce: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for GatewayRequestGuildMembers {}
|
|
@ -0,0 +1,11 @@
|
||||||
|
use crate::types::events::WebSocketEvent;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Default)]
|
||||||
|
pub struct GatewayResume {
|
||||||
|
pub token: String,
|
||||||
|
pub session_id: String,
|
||||||
|
pub seq: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for GatewayResume {}
|
|
@ -0,0 +1,82 @@
|
||||||
|
use crate::types::entities::{Channel, GuildMember, ThreadMember};
|
||||||
|
use crate::types::events::WebSocketEvent;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#thread-create
|
||||||
|
/// Not directly serialized, as the inner payload is a channel object
|
||||||
|
pub struct ThreadCreate {
|
||||||
|
pub thread: Channel,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for ThreadCreate {}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#thread-update
|
||||||
|
/// Not directly serialized, as the inner payload is a channel object
|
||||||
|
pub struct ThreadUpdate {
|
||||||
|
pub thread: Channel,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for ThreadUpdate {}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#thread-delete
|
||||||
|
/// Not directly serialized, as the inner payload is a channel object
|
||||||
|
pub struct ThreadDelete {
|
||||||
|
pub thread: Channel,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for ThreadDelete {}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#thread-list-sync
|
||||||
|
pub struct ThreadListSync {
|
||||||
|
pub guild_id: String,
|
||||||
|
pub channel_ids: Option<Vec<String>>,
|
||||||
|
pub threads: Vec<Channel>,
|
||||||
|
pub members: Vec<ThreadMember>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for ThreadListSync {}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#thread-member-update
|
||||||
|
/// The inner payload is a thread member object with an extra field.
|
||||||
|
/// The extra field is a bit painful, because we can't just serialize a thread member object
|
||||||
|
pub struct ThreadMemberUpdate {
|
||||||
|
pub id: Option<u64>,
|
||||||
|
pub user_id: Option<u64>,
|
||||||
|
pub join_timestamp: Option<String>,
|
||||||
|
pub flags: Option<u64>,
|
||||||
|
pub member: Option<GuildMember>,
|
||||||
|
pub guild_id: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ThreadMemberUpdate {
|
||||||
|
/// Convert self to a thread member, losing the added guild_id field
|
||||||
|
pub fn to_thread_member(self) -> ThreadMember {
|
||||||
|
ThreadMember {
|
||||||
|
id: self.id,
|
||||||
|
user_id: self.user_id,
|
||||||
|
join_timestamp: self.join_timestamp.clone(),
|
||||||
|
flags: self.flags,
|
||||||
|
member: self.member,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for ThreadMemberUpdate {}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Deserialize, Serialize)]
|
||||||
|
/// See https://discord.com/developers/docs/topics/gateway-events#thread-members-update
|
||||||
|
pub struct ThreadMembersUpdate {
|
||||||
|
pub id: String,
|
||||||
|
pub guild_id: String,
|
||||||
|
/// Capped at 50
|
||||||
|
pub member_count: u8,
|
||||||
|
pub added_members: Option<Vec<ThreadMember>>,
|
||||||
|
pub removed_members: Option<Vec<String>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebSocketEvent for ThreadMembersUpdate {}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue