Reformat entire project, optimize imports
This commit is contained in:
parent
f641dbb14f
commit
c745861592
|
@ -3,4 +3,3 @@ pub use register::*;
|
||||||
|
|
||||||
pub mod login;
|
pub mod login;
|
||||||
pub mod register;
|
pub mod register;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
use http::header::CONTENT_DISPOSITION;
|
use http::header::CONTENT_DISPOSITION;
|
||||||
use http::HeaderMap;
|
use http::HeaderMap;
|
||||||
use reqwest::{Client, multipart};
|
use reqwest::{multipart, Client};
|
||||||
use serde_json::to_string;
|
use serde_json::to_string;
|
||||||
|
|
||||||
use crate::instance::UserMeta;
|
use crate::instance::UserMeta;
|
||||||
|
|
|
@ -7,4 +7,3 @@ pub mod channels;
|
||||||
pub mod messages;
|
pub mod messages;
|
||||||
pub mod permissions;
|
pub mod permissions;
|
||||||
pub mod reactions;
|
pub mod reactions;
|
||||||
|
|
||||||
|
|
|
@ -56,8 +56,8 @@ impl Guild {
|
||||||
&mut user.limits,
|
&mut user.limits,
|
||||||
&mut belongs_to.limits,
|
&mut belongs_to.limits,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
Ok(guild)
|
Ok(guild)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -134,7 +134,7 @@ impl Guild {
|
||||||
&mut user.limits,
|
&mut user.limits,
|
||||||
&mut belongs_to.limits,
|
&mut belongs_to.limits,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns a `Result` containing a vector of `Channel` structs if the request was successful, or an `ChorusLibError` if there was an error.
|
/// Returns a `Result` containing a vector of `Channel` structs if the request was successful, or an `ChorusLibError` if there was an error.
|
||||||
|
@ -205,7 +205,7 @@ impl Guild {
|
||||||
&mut user.limits,
|
&mut user.limits,
|
||||||
&mut belongs_to.limits,
|
&mut belongs_to.limits,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
/// For internal use. Does the same as the public get method, but does not require a second, mutable
|
/// For internal use. Does the same as the public get method, but does not require a second, mutable
|
||||||
|
@ -267,7 +267,7 @@ impl Channel {
|
||||||
&mut user.limits,
|
&mut user.limits,
|
||||||
&mut belongs_to.limits,
|
&mut belongs_to.limits,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn _create(
|
async fn _create(
|
||||||
|
|
|
@ -8,4 +8,3 @@ pub mod channels;
|
||||||
pub mod guilds;
|
pub mod guilds;
|
||||||
pub mod policies;
|
pub mod policies;
|
||||||
pub mod users;
|
pub mod users;
|
||||||
|
|
||||||
|
|
|
@ -3,4 +3,3 @@ pub use limits::*;
|
||||||
|
|
||||||
pub mod instance;
|
pub mod instance;
|
||||||
pub mod limits;
|
pub mod limits;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
pub use instance::limits::*;
|
pub use instance::limits::*;
|
||||||
|
|
||||||
pub mod instance;
|
pub mod instance;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
pub use users::*;
|
pub use users::*;
|
||||||
|
|
||||||
pub mod users;
|
pub mod users;
|
||||||
|
|
||||||
|
|
|
@ -115,7 +115,7 @@ impl User {
|
||||||
&mut belongs_to.limits,
|
&mut belongs_to.limits,
|
||||||
id,
|
id,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn _get(
|
async fn _get(
|
||||||
|
@ -197,6 +197,6 @@ impl Instance {
|
||||||
&mut self.limits,
|
&mut self.limits,
|
||||||
id,
|
id,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use futures_util::SinkExt;
|
|
||||||
use futures_util::stream::SplitSink;
|
use futures_util::stream::SplitSink;
|
||||||
|
use futures_util::SinkExt;
|
||||||
use futures_util::StreamExt;
|
use futures_util::StreamExt;
|
||||||
use native_tls::TlsConnector;
|
use native_tls::TlsConnector;
|
||||||
use tokio::net::TcpStream;
|
use tokio::net::TcpStream;
|
||||||
|
@ -13,8 +13,8 @@ use tokio::task;
|
||||||
use tokio::task::JoinHandle;
|
use tokio::task::JoinHandle;
|
||||||
use tokio::time;
|
use tokio::time;
|
||||||
use tokio::time::Instant;
|
use tokio::time::Instant;
|
||||||
use tokio_tungstenite::{connect_async_tls_with_config, Connector, WebSocketStream};
|
|
||||||
use tokio_tungstenite::MaybeTlsStream;
|
use tokio_tungstenite::MaybeTlsStream;
|
||||||
|
use tokio_tungstenite::{connect_async_tls_with_config, Connector, WebSocketStream};
|
||||||
|
|
||||||
use crate::errors::ObserverError;
|
use crate::errors::ObserverError;
|
||||||
use crate::gateway::events::Events;
|
use crate::gateway::events::Events;
|
||||||
|
@ -203,7 +203,7 @@ impl Gateway {
|
||||||
TlsConnector::builder().build().unwrap(),
|
TlsConnector::builder().build().unwrap(),
|
||||||
)),
|
)),
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
Ok(websocket_stream) => websocket_stream,
|
Ok(websocket_stream) => websocket_stream,
|
||||||
Err(e) => return Err(e),
|
Err(e) => return Err(e),
|
||||||
|
|
24
src/limit.rs
24
src/limit.rs
|
@ -3,7 +3,7 @@ use std::collections::VecDeque;
|
||||||
use reqwest::{Client, RequestBuilder, Response};
|
use reqwest::{Client, RequestBuilder, Response};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
api::limits::{Limit, Limits, LimitsMutRef, LimitType},
|
api::limits::{Limit, LimitType, Limits, LimitsMutRef},
|
||||||
errors::ChorusLibError,
|
errors::ChorusLibError,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -149,7 +149,7 @@ impl LimitedRequester {
|
||||||
&LimitType::Ip,
|
&LimitType::Ip,
|
||||||
&limit_type,
|
&limit_type,
|
||||||
]
|
]
|
||||||
.to_vec();
|
.to_vec();
|
||||||
for limit in constant_limits.iter() {
|
for limit in constant_limits.iter() {
|
||||||
match rate_limits.to_hash_map().get(limit) {
|
match rate_limits.to_hash_map().get(limit) {
|
||||||
Some(limit) => {
|
Some(limit) => {
|
||||||
|
@ -159,21 +159,21 @@ impl LimitedRequester {
|
||||||
// AbsoluteRegister and AuthRegister can cancel each other out.
|
// AbsoluteRegister and AuthRegister can cancel each other out.
|
||||||
if limit.bucket == LimitType::AbsoluteRegister
|
if limit.bucket == LimitType::AbsoluteRegister
|
||||||
&& rate_limits
|
&& rate_limits
|
||||||
.to_hash_map()
|
.to_hash_map()
|
||||||
.get(&LimitType::AuthRegister)
|
.get(&LimitType::AuthRegister)
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.remaining
|
.remaining
|
||||||
== 0
|
== 0
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if limit.bucket == LimitType::AuthRegister
|
if limit.bucket == LimitType::AuthRegister
|
||||||
&& rate_limits
|
&& rate_limits
|
||||||
.to_hash_map()
|
.to_hash_map()
|
||||||
.get(&LimitType::AbsoluteRegister)
|
.get(&LimitType::AbsoluteRegister)
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.remaining
|
.remaining
|
||||||
== 0
|
== 0
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -172,7 +172,7 @@ fn insert_into(value: &mut Value, path: &[&str], new_value: Value) {
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
use crate::types::config::{ConfigValue, generate_pairs, pairs_to_config};
|
use crate::types::config::{generate_pairs, pairs_to_config, ConfigValue};
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_pairs() {
|
fn test_pairs() {
|
||||||
|
|
|
@ -7,15 +7,15 @@ use serde::{Deserialize, Serialize};
|
||||||
#[cfg(feature = "sqlx")]
|
#[cfg(feature = "sqlx")]
|
||||||
use sqlx::{
|
use sqlx::{
|
||||||
database::{HasArguments, HasValueRef},
|
database::{HasArguments, HasValueRef},
|
||||||
Decode,
|
encode::IsNull,
|
||||||
Encode,
|
error::BoxDynError,
|
||||||
encode::IsNull, error::BoxDynError, MySql,
|
Decode, Encode, MySql,
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::types::{Error, GuildError};
|
|
||||||
use crate::types::config::types::subconfigs::guild::{
|
use crate::types::config::types::subconfigs::guild::{
|
||||||
autojoin::AutoJoinConfiguration, discovery::DiscoverConfiguration,
|
autojoin::AutoJoinConfiguration, discovery::DiscoverConfiguration,
|
||||||
};
|
};
|
||||||
|
use crate::types::{Error, GuildError};
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Eq, Clone, Copy, Serialize, Deserialize)]
|
#[derive(Debug, PartialEq, Eq, Clone, Copy, Serialize, Deserialize)]
|
||||||
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use crate::types::config::types::subconfigs::limits::ratelimits::{
|
use crate::types::config::types::subconfigs::limits::ratelimits::{
|
||||||
RateLimitOptions, route::RouteRateLimit,
|
route::RouteRateLimit, RateLimitOptions,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
|
|
@ -5,4 +5,3 @@ pub use password::PasswordConfiguration;
|
||||||
mod date_of_birth;
|
mod date_of_birth;
|
||||||
mod email;
|
mod email;
|
||||||
mod password;
|
mod password;
|
||||||
|
|
||||||
|
|
|
@ -3,4 +3,3 @@ pub use twofactor::TwoFactorConfiguration;
|
||||||
|
|
||||||
mod captcha;
|
mod captcha;
|
||||||
mod twofactor;
|
mod twofactor;
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,8 @@ use serde::{Deserialize, Serialize};
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
use serde_repr::{Deserialize_repr, Serialize_repr};
|
use serde_repr::{Deserialize_repr, Serialize_repr};
|
||||||
|
|
||||||
use crate::types::{Team, User};
|
|
||||||
use crate::types::utils::Snowflake;
|
use crate::types::utils::Snowflake;
|
||||||
|
use crate::types::{Team, User};
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
#[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))]
|
#[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))]
|
||||||
|
|
|
@ -2,12 +2,12 @@ use chrono::{DateTime, Utc};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_repr::{Deserialize_repr, Serialize_repr};
|
use serde_repr::{Deserialize_repr, Serialize_repr};
|
||||||
|
|
||||||
|
use crate::types::types::guild_configuration::GuildFeaturesList;
|
||||||
use crate::types::{
|
use crate::types::{
|
||||||
entities::{Channel, Emoji, RoleObject, Sticker, User, VoiceState, Webhook},
|
entities::{Channel, Emoji, RoleObject, Sticker, User, VoiceState, Webhook},
|
||||||
interfaces::WelcomeScreenObject,
|
interfaces::WelcomeScreenObject,
|
||||||
utils::Snowflake,
|
utils::Snowflake,
|
||||||
};
|
};
|
||||||
use crate::types::types::guild_configuration::GuildFeaturesList;
|
|
||||||
|
|
||||||
/// See https://discord.com/developers/docs/resources/guild
|
/// See https://discord.com/developers/docs/resources/guild
|
||||||
#[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
|
#[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
|
||||||
|
|
|
@ -43,4 +43,3 @@ mod user;
|
||||||
mod user_settings;
|
mod user_settings;
|
||||||
mod voice_state;
|
mod voice_state;
|
||||||
mod webhook;
|
mod webhook;
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
use chrono::{DateTime, Utc};
|
use chrono::{DateTime, Utc};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use crate::types::{AuditLogEntry, Emoji, GuildMember, GuildScheduledEvent, RoleObject, Sticker};
|
|
||||||
use crate::types::entities::{Guild, PublicUser, UnavailableGuild};
|
use crate::types::entities::{Guild, PublicUser, UnavailableGuild};
|
||||||
use crate::types::events::WebSocketEvent;
|
use crate::types::events::WebSocketEvent;
|
||||||
|
use crate::types::{AuditLogEntry, Emoji, GuildMember, GuildScheduledEvent, RoleObject, Sticker};
|
||||||
|
|
||||||
use super::PresenceUpdate;
|
use super::PresenceUpdate;
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use crate::types::{Activity, GuildMember, PresenceUpdate, VoiceState};
|
|
||||||
use crate::types::entities::{Guild, User};
|
use crate::types::entities::{Guild, User};
|
||||||
use crate::types::events::{Session, WebSocketEvent};
|
use crate::types::events::{Session, WebSocketEvent};
|
||||||
use crate::types::interfaces::ClientStatusObject;
|
use crate::types::interfaces::ClientStatusObject;
|
||||||
|
use crate::types::{Activity, GuildMember, PresenceUpdate, VoiceState};
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize, Default)]
|
#[derive(Debug, Deserialize, Serialize, Default)]
|
||||||
/// Sort of documented, though most fields are left out
|
/// Sort of documented, though most fields are left out
|
||||||
|
|
|
@ -9,4 +9,3 @@ mod connected_account;
|
||||||
mod guild_welcome_screen;
|
mod guild_welcome_screen;
|
||||||
mod interaction;
|
mod interaction;
|
||||||
mod status;
|
mod status;
|
||||||
|
|
||||||
|
|
|
@ -61,8 +61,8 @@ impl poem::error::ResponseError for APIError {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn as_response(&self) -> Response
|
fn as_response(&self) -> Response
|
||||||
where
|
where
|
||||||
Self: std::error::Error + Send + Sync + 'static,
|
Self: std::error::Error + Send + Sync + 'static,
|
||||||
{
|
{
|
||||||
Response::builder()
|
Response::builder()
|
||||||
.status(self.status())
|
.status(self.status())
|
||||||
|
|
|
@ -6,4 +6,3 @@ pub mod jwt;
|
||||||
mod regexes;
|
mod regexes;
|
||||||
mod rights;
|
mod rights;
|
||||||
mod snowflake;
|
mod snowflake;
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ async fn test_registration() {
|
||||||
None,
|
None,
|
||||||
None,
|
None,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
bundle.instance.register_account(®).await.unwrap();
|
bundle.instance.register_account(®).await.unwrap();
|
||||||
common::teardown(bundle).await;
|
common::teardown(bundle).await;
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,8 +52,8 @@ async fn modify_channel() {
|
||||||
&bundle.channel.id.to_string(),
|
&bundle.channel.id.to_string(),
|
||||||
&mut bundle.user,
|
&mut bundle.user,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
assert_eq!(result.name, Some("beepboop".to_string()));
|
assert_eq!(result.name, Some("beepboop".to_string()));
|
||||||
|
|
||||||
let permission_override = PermissionFlags::from_vec(Vec::from([
|
let permission_override = PermissionFlags::from_vec(Vec::from([
|
||||||
|
@ -72,14 +72,14 @@ async fn modify_channel() {
|
||||||
bundle.channel.id.to_string().as_str(),
|
bundle.channel.id.to_string().as_str(),
|
||||||
permission_override.clone(),
|
permission_override.clone(),
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
Channel::delete_permission(
|
Channel::delete_permission(
|
||||||
&mut bundle.user,
|
&mut bundle.user,
|
||||||
bundle.channel.id.to_string().as_str(),
|
bundle.channel.id.to_string().as_str(),
|
||||||
&permission_override.id,
|
&permission_override.id,
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
common::teardown(bundle).await
|
common::teardown(bundle).await
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,7 @@ pub async fn setup() -> TestBundle {
|
||||||
None,
|
None,
|
||||||
None,
|
None,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let guild_create_schema = GuildCreateSchema {
|
let guild_create_schema = GuildCreateSchema {
|
||||||
name: Some("Test-Guild!".to_string()),
|
name: Some("Test-Guild!".to_string()),
|
||||||
region: None,
|
region: None,
|
||||||
|
|
Loading…
Reference in New Issue