diff options
Diffstat (limited to 'exes/cache/src')
| -rw-r--r-- | exes/cache/src/config.rs | 2 | ||||
| -rw-r--r-- | exes/cache/src/main.rs | 10 | ||||
| -rw-r--r-- | exes/cache/src/managers/channels.rs | 1 | ||||
| -rw-r--r-- | exes/cache/src/managers/guild_schedules.rs | 1 | ||||
| -rw-r--r-- | exes/cache/src/managers/guilds.rs | 21 | ||||
| -rw-r--r-- | exes/cache/src/managers/integrations.rs | 1 | ||||
| -rw-r--r-- | exes/cache/src/managers/invites.rs | 1 | ||||
| -rw-r--r-- | exes/cache/src/managers/members.rs | 11 | ||||
| -rw-r--r-- | exes/cache/src/managers/messages.rs | 9 | ||||
| -rw-r--r-- | exes/cache/src/managers/mod.rs | 16 | ||||
| -rw-r--r-- | exes/cache/src/managers/reactions.rs | 9 | ||||
| -rw-r--r-- | exes/cache/src/managers/roles.rs | 7 | ||||
| -rw-r--r-- | exes/cache/src/managers/stage_instances.rs | 7 | ||||
| -rw-r--r-- | exes/cache/src/managers/threads.rs | 12 |
14 files changed, 49 insertions, 59 deletions
diff --git a/exes/cache/src/config.rs b/exes/cache/src/config.rs index 3d9f5e2..3136c1a 100644 --- a/exes/cache/src/config.rs +++ b/exes/cache/src/config.rs @@ -1,5 +1,5 @@ use serde::Deserialize; #[derive(Debug, Deserialize, Clone, Default)] pub struct CacheConfiguration { - pub toggles: Vec<String> + pub toggles: Vec<String>, } diff --git a/exes/cache/src/main.rs b/exes/cache/src/main.rs index 5240a6a..bc13cd5 100644 --- a/exes/cache/src/main.rs +++ b/exes/cache/src/main.rs @@ -1,8 +1,6 @@ -use std::{error::Error, pin::Pin}; +use std::{error::Error, future::Future, pin::Pin}; use async_nats::{Client, Subscriber}; -use futures_util::{stream::StreamExt, Future}; -use log::info; use managers::{ automoderation::Automoderation, bans::Bans, channels::Channels, guild_schedules::GuildSchedules, guilds::Guilds, integrations::Integrations, invites::Invites, @@ -10,6 +8,8 @@ use managers::{ stage_instances::StageInstances, threads::Threads, CacheManager, }; use shared::{config::Settings, payloads::CachePayload}; +use tokio_stream::StreamExt; +use tracing::info; use twilight_model::gateway::event::DispatchEvent; use crate::config::CacheConfiguration; @@ -43,8 +43,8 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> { let settings: Settings<CacheConfiguration> = Settings::new("cache").unwrap(); info!("loaded configuration: {:?}", settings); let nats = - Into::<Pin<Box<dyn Future<Output = anyhow::Result<Client>> + Send>>>::into(settings.nats).await?; - // let redis: redis::Client = settings.redis.into(); + Into::<Pin<Box<dyn Future<Output = anyhow::Result<Client>> + Send>>>::into(settings.nats) + .await?; let mut cache = Cache::default(); diff --git a/exes/cache/src/managers/channels.rs b/exes/cache/src/managers/channels.rs index fe34acc..c645420 100644 --- a/exes/cache/src/managers/channels.rs +++ b/exes/cache/src/managers/channels.rs @@ -5,7 +5,6 @@ use crate::CacheSourcedEvents; use super::CacheManager; use std::future::Future; - #[derive(Default)] pub struct Channels {} impl CacheManager for Channels { diff --git a/exes/cache/src/managers/guild_schedules.rs b/exes/cache/src/managers/guild_schedules.rs index bcc79c5..0c565f1 100644 --- a/exes/cache/src/managers/guild_schedules.rs +++ b/exes/cache/src/managers/guild_schedules.rs @@ -5,7 +5,6 @@ use crate::CacheSourcedEvents; use super::CacheManager; use std::future::Future; - #[derive(Default)] pub struct GuildSchedules {} impl CacheManager for GuildSchedules { diff --git a/exes/cache/src/managers/guilds.rs b/exes/cache/src/managers/guilds.rs index 3f5f4c4..6e142c8 100644 --- a/exes/cache/src/managers/guilds.rs +++ b/exes/cache/src/managers/guilds.rs @@ -5,7 +5,6 @@ use crate::CacheSourcedEvents; use super::CacheManager; use std::future::Future; - #[derive(Default)] pub struct Guilds {} impl CacheManager for Guilds { @@ -15,16 +14,16 @@ impl CacheManager for Guilds { ) -> std::pin::Pin<Box<dyn Future<Output = crate::CacheSourcedEvents>>> { Box::pin(async move { match event { - DispatchEvent::GuildCreate(_) => {}, - DispatchEvent::GuildDelete(_) => {}, - DispatchEvent::UnavailableGuild(_) => {}, - DispatchEvent::GuildUpdate(_) => {}, - DispatchEvent::WebhooksUpdate(_) => {}, - DispatchEvent::GuildStickersUpdate(_) => {}, - DispatchEvent::GuildEmojisUpdate(_) => {}, - DispatchEvent::VoiceServerUpdate(_) => {}, - DispatchEvent::GuildIntegrationsUpdate(_) => {}, - DispatchEvent::CommandPermissionsUpdate(_) => {}, + DispatchEvent::GuildCreate(_) => {} + DispatchEvent::GuildDelete(_) => {} + DispatchEvent::UnavailableGuild(_) => {} + DispatchEvent::GuildUpdate(_) => {} + DispatchEvent::WebhooksUpdate(_) => {} + DispatchEvent::GuildStickersUpdate(_) => {} + DispatchEvent::GuildEmojisUpdate(_) => {} + DispatchEvent::VoiceServerUpdate(_) => {} + DispatchEvent::GuildIntegrationsUpdate(_) => {} + DispatchEvent::CommandPermissionsUpdate(_) => {} _ => unreachable!(), }; diff --git a/exes/cache/src/managers/integrations.rs b/exes/cache/src/managers/integrations.rs index 99d292e..8e71724 100644 --- a/exes/cache/src/managers/integrations.rs +++ b/exes/cache/src/managers/integrations.rs @@ -5,7 +5,6 @@ use crate::CacheSourcedEvents; use super::CacheManager; use std::future::Future; - #[derive(Default)] pub struct Integrations {} impl CacheManager for Integrations { diff --git a/exes/cache/src/managers/invites.rs b/exes/cache/src/managers/invites.rs index 21da64f..6168e82 100644 --- a/exes/cache/src/managers/invites.rs +++ b/exes/cache/src/managers/invites.rs @@ -5,7 +5,6 @@ use crate::CacheSourcedEvents; use super::CacheManager; use std::future::Future; - #[derive(Default)] pub struct Invites {} impl CacheManager for Invites { diff --git a/exes/cache/src/managers/members.rs b/exes/cache/src/managers/members.rs index 3a483f1..21e6cde 100644 --- a/exes/cache/src/managers/members.rs +++ b/exes/cache/src/managers/members.rs @@ -5,7 +5,6 @@ use crate::CacheSourcedEvents; use super::CacheManager; use std::future::Future; - #[derive(Default)] pub struct Members {} impl CacheManager for Members { @@ -15,11 +14,11 @@ impl CacheManager for Members { ) -> std::pin::Pin<Box<dyn Future<Output = crate::CacheSourcedEvents>>> { Box::pin(async move { match event { - DispatchEvent::MemberAdd(_) => {}, - DispatchEvent::MemberRemove(_) => {}, - DispatchEvent::MemberUpdate(_) => {}, - DispatchEvent::MemberChunk(_) => {}, - DispatchEvent::UserUpdate(_) => {}, + DispatchEvent::MemberAdd(_) => {} + DispatchEvent::MemberRemove(_) => {} + DispatchEvent::MemberUpdate(_) => {} + DispatchEvent::MemberChunk(_) => {} + DispatchEvent::UserUpdate(_) => {} _ => unreachable!(), }; diff --git a/exes/cache/src/managers/messages.rs b/exes/cache/src/managers/messages.rs index 7b06ae7..1725781 100644 --- a/exes/cache/src/managers/messages.rs +++ b/exes/cache/src/managers/messages.rs @@ -5,7 +5,6 @@ use crate::CacheSourcedEvents; use super::CacheManager; use std::future::Future; - #[derive(Default)] pub struct Messages {} impl CacheManager for Messages { @@ -15,10 +14,10 @@ impl CacheManager for Messages { ) -> std::pin::Pin<Box<dyn Future<Output = crate::CacheSourcedEvents>>> { Box::pin(async move { match event { - DispatchEvent::MessageCreate(_) => {}, - DispatchEvent::MessageDelete(_) => {}, - DispatchEvent::MessageDeleteBulk(_) => {}, - DispatchEvent::MessageUpdate(_) => {}, + DispatchEvent::MessageCreate(_) => {} + DispatchEvent::MessageDelete(_) => {} + DispatchEvent::MessageDeleteBulk(_) => {} + DispatchEvent::MessageUpdate(_) => {} _ => unreachable!(), }; diff --git a/exes/cache/src/managers/mod.rs b/exes/cache/src/managers/mod.rs index 370cda6..9768a86 100644 --- a/exes/cache/src/managers/mod.rs +++ b/exes/cache/src/managers/mod.rs @@ -1,22 +1,22 @@ +use std::future::Future; use std::pin::Pin; use twilight_model::gateway::event::DispatchEvent; -use std::future::Future; use crate::CacheSourcedEvents; +pub mod automoderation; +pub mod bans; pub mod channels; -pub mod guilds; pub mod guild_schedules; -pub mod stage_instances; +pub mod guilds; pub mod integrations; +pub mod invites; pub mod members; -pub mod bans; -pub mod reactions; pub mod messages; -pub mod threads; -pub mod invites; +pub mod reactions; pub mod roles; -pub mod automoderation; +pub mod stage_instances; +pub mod threads; pub trait CacheManager { fn handle(&self, event: DispatchEvent) -> Pin<Box<dyn Future<Output = CacheSourcedEvents>>>; diff --git a/exes/cache/src/managers/reactions.rs b/exes/cache/src/managers/reactions.rs index 5d21e0b..b154638 100644 --- a/exes/cache/src/managers/reactions.rs +++ b/exes/cache/src/managers/reactions.rs @@ -5,7 +5,6 @@ use crate::CacheSourcedEvents; use super::CacheManager; use std::future::Future; - #[derive(Default)] pub struct Reactions {} impl CacheManager for Reactions { @@ -15,10 +14,10 @@ impl CacheManager for Reactions { ) -> std::pin::Pin<Box<dyn Future<Output = crate::CacheSourcedEvents>>> { Box::pin(async move { match event { - DispatchEvent::ReactionAdd(_) => {}, - DispatchEvent::ReactionRemove(_) => {}, - DispatchEvent::ReactionRemoveAll(_) => {}, - DispatchEvent::ReactionRemoveEmoji(_) => {}, + DispatchEvent::ReactionAdd(_) => {} + DispatchEvent::ReactionRemove(_) => {} + DispatchEvent::ReactionRemoveAll(_) => {} + DispatchEvent::ReactionRemoveEmoji(_) => {} _ => unreachable!(), }; diff --git a/exes/cache/src/managers/roles.rs b/exes/cache/src/managers/roles.rs index 5fa0f22..c69526f 100644 --- a/exes/cache/src/managers/roles.rs +++ b/exes/cache/src/managers/roles.rs @@ -5,7 +5,6 @@ use crate::CacheSourcedEvents; use super::CacheManager; use std::future::Future; - #[derive(Default)] pub struct Roles {} impl CacheManager for Roles { @@ -15,9 +14,9 @@ impl CacheManager for Roles { ) -> std::pin::Pin<Box<dyn Future<Output = crate::CacheSourcedEvents>>> { Box::pin(async move { match event { - DispatchEvent::RoleCreate(_) => {}, - DispatchEvent::RoleDelete(_) => {}, - DispatchEvent::RoleUpdate(_) => {}, + DispatchEvent::RoleCreate(_) => {} + DispatchEvent::RoleDelete(_) => {} + DispatchEvent::RoleUpdate(_) => {} _ => unreachable!(), }; diff --git a/exes/cache/src/managers/stage_instances.rs b/exes/cache/src/managers/stage_instances.rs index 314d089..baeabc8 100644 --- a/exes/cache/src/managers/stage_instances.rs +++ b/exes/cache/src/managers/stage_instances.rs @@ -5,7 +5,6 @@ use crate::CacheSourcedEvents; use super::CacheManager; use std::future::Future; - #[derive(Default)] pub struct StageInstances {} impl CacheManager for StageInstances { @@ -15,9 +14,9 @@ impl CacheManager for StageInstances { ) -> std::pin::Pin<Box<dyn Future<Output = crate::CacheSourcedEvents>>> { Box::pin(async move { match event { - DispatchEvent::StageInstanceCreate(_) => {}, - DispatchEvent::StageInstanceDelete(_) => {}, - DispatchEvent::StageInstanceUpdate(_) => {}, + DispatchEvent::StageInstanceCreate(_) => {} + DispatchEvent::StageInstanceDelete(_) => {} + DispatchEvent::StageInstanceUpdate(_) => {} _ => unreachable!(), }; diff --git a/exes/cache/src/managers/threads.rs b/exes/cache/src/managers/threads.rs index d4efc2e..8956616 100644 --- a/exes/cache/src/managers/threads.rs +++ b/exes/cache/src/managers/threads.rs @@ -14,12 +14,12 @@ impl CacheManager for Threads { ) -> std::pin::Pin<Box<dyn Future<Output = crate::CacheSourcedEvents>>> { Box::pin(async move { match event { - DispatchEvent::ThreadCreate(_) => {}, - DispatchEvent::ThreadDelete(_) => {}, - DispatchEvent::ThreadListSync(_) => {}, - DispatchEvent::ThreadMemberUpdate(_) => {}, - DispatchEvent::ThreadMembersUpdate(_) => {}, - DispatchEvent::ThreadUpdate(_) => {}, + DispatchEvent::ThreadCreate(_) => {} + DispatchEvent::ThreadDelete(_) => {} + DispatchEvent::ThreadListSync(_) => {} + DispatchEvent::ThreadMemberUpdate(_) => {} + DispatchEvent::ThreadMembersUpdate(_) => {} + DispatchEvent::ThreadUpdate(_) => {} _ => unreachable!(), }; |
