From b738f4d5433156cede7c45c1689d0090e7d55467 Mon Sep 17 00:00:00 2001 From: bitfl0wer Date: Wed, 15 Nov 2023 21:03:43 +0100 Subject: [PATCH] Refactor project to use chorus::Gateway[...] --- examples/gateway_observers.rs | 1 + examples/gateway_simple.rs | 2 +- src/api/auth/login.rs | 1 + src/api/auth/register.rs | 1 + src/types/entities/channel.rs | 2 +- src/types/entities/emoji.rs | 2 +- src/types/entities/guild.rs | 4 ++-- src/types/entities/mod.rs | 2 +- src/types/entities/role.rs | 2 +- src/types/entities/user.rs | 2 +- src/types/entities/voice_state.rs | 2 +- src/types/entities/webhook.rs | 2 +- 12 files changed, 13 insertions(+), 10 deletions(-) diff --git a/examples/gateway_observers.rs b/examples/gateway_observers.rs index acb8df9..511c568 100644 --- a/examples/gateway_observers.rs +++ b/examples/gateway_observers.rs @@ -4,6 +4,7 @@ use chorus::{ self, gateway::Observer, types::{GatewayIdentifyPayload, GatewayReady}, + Gateway, }; use std::{sync::Arc, time::Duration}; use tokio::{self, time::sleep}; diff --git a/examples/gateway_simple.rs b/examples/gateway_simple.rs index dbc26a4..e46d122 100644 --- a/examples/gateway_simple.rs +++ b/examples/gateway_simple.rs @@ -1,7 +1,7 @@ use std::time::Duration; use chorus::gateway::{GatewayCapable, GatewayHandleCapable}; -use chorus::{self, types::GatewayIdentifyPayload}; +use chorus::{self, types::GatewayIdentifyPayload, Gateway}; use tokio::time::sleep; /// This example creates a simple gateway connection and a session with an Identify event diff --git a/src/api/auth/login.rs b/src/api/auth/login.rs index 208e94d..71d594f 100644 --- a/src/api/auth/login.rs +++ b/src/api/auth/login.rs @@ -8,6 +8,7 @@ use crate::gateway::{GatewayCapable, GatewayHandleCapable}; use crate::instance::{ChorusUser, Instance}; use crate::ratelimiter::ChorusRequest; use crate::types::{GatewayIdentifyPayload, LimitType, LoginResult, LoginSchema}; +use crate::Gateway; impl Instance { /// Logs into an existing account on the spacebar server. diff --git a/src/api/auth/register.rs b/src/api/auth/register.rs index 79a5bcc..f416124 100644 --- a/src/api/auth/register.rs +++ b/src/api/auth/register.rs @@ -12,6 +12,7 @@ use crate::{ types::LimitType, types::RegisterSchema, }; +use crate::{Gateway, GatewayHandle}; impl Instance { /// Registers a new user on the server. diff --git a/src/types/entities/channel.rs b/src/types/entities/channel.rs index 66768bd..1d1c58c 100644 --- a/src/types/entities/channel.rs +++ b/src/types/entities/channel.rs @@ -12,7 +12,7 @@ use crate::types::{ }; #[cfg(feature = "client")] -use crate::types::Composite; +use crate::{types::Composite, GatewayHandle}; #[cfg(feature = "client")] use crate::gateway::Updateable; diff --git a/src/types/entities/emoji.rs b/src/types/entities/emoji.rs index 301b0be..8c0b8e6 100644 --- a/src/types/entities/emoji.rs +++ b/src/types/entities/emoji.rs @@ -7,7 +7,7 @@ use crate::types::entities::User; use crate::types::Snowflake; #[cfg(feature = "client")] -use crate::types::Composite; +use crate::{types::Composite, GatewayHandle}; #[cfg(feature = "client")] use crate::gateway::Updateable; diff --git a/src/types/entities/guild.rs b/src/types/entities/guild.rs index a3c2182..8638ff7 100644 --- a/src/types/entities/guild.rs +++ b/src/types/entities/guild.rs @@ -1,6 +1,7 @@ use std::fmt::Debug; use std::sync::{Arc, RwLock}; +use bitflags::bitflags; use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; use serde_repr::{Deserialize_repr, Serialize_repr}; @@ -11,12 +12,11 @@ use crate::types::{ interfaces::WelcomeScreenObject, utils::Snowflake, }; -use bitflags::bitflags; use super::PublicUser; #[cfg(feature = "client")] -use crate::gateway::Updateable; +use crate::{gateway::Updateable, GatewayHandle}; #[cfg(feature = "client")] use chorus_macros::{observe_option_vec, observe_vec, Composite, Updateable}; diff --git a/src/types/entities/mod.rs b/src/types/entities/mod.rs index 8d788c4..3371598 100644 --- a/src/types/entities/mod.rs +++ b/src/types/entities/mod.rs @@ -24,7 +24,7 @@ pub use voice_state::*; pub use webhook::*; #[cfg(feature = "client")] -use crate::gateway::Updateable; +use crate::{gateway::Updateable, GatewayHandle}; #[cfg(feature = "client")] use async_trait::async_trait; diff --git a/src/types/entities/role.rs b/src/types/entities/role.rs index 349af02..1166431 100644 --- a/src/types/entities/role.rs +++ b/src/types/entities/role.rs @@ -12,7 +12,7 @@ use chorus_macros::{Composite, Updateable}; use crate::gateway::Updateable; #[cfg(feature = "client")] -use crate::types::Composite; +use crate::{types::Composite, GatewayHandle}; #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)] #[cfg_attr(feature = "client", derive(Updateable, Composite))] diff --git a/src/types/entities/user.rs b/src/types/entities/user.rs index 016a617..e247240 100644 --- a/src/types/entities/user.rs +++ b/src/types/entities/user.rs @@ -8,7 +8,7 @@ use std::fmt::Debug; use crate::gateway::Updateable; #[cfg(feature = "client")] -use crate::types::Composite; +use crate::{types::Composite, GatewayHandle}; #[cfg(feature = "client")] use chorus_macros::{Composite, Updateable}; diff --git a/src/types/entities/voice_state.rs b/src/types/entities/voice_state.rs index 569bbc7..3f122d6 100644 --- a/src/types/entities/voice_state.rs +++ b/src/types/entities/voice_state.rs @@ -4,7 +4,7 @@ use std::sync::{Arc, RwLock}; use chorus_macros::Composite; #[cfg(feature = "client")] -use crate::types::Composite; +use crate::{types::Composite, GatewayHandle}; #[cfg(feature = "client")] use crate::gateway::Updateable; diff --git a/src/types/entities/webhook.rs b/src/types/entities/webhook.rs index 9560d89..3d8c687 100644 --- a/src/types/entities/webhook.rs +++ b/src/types/entities/webhook.rs @@ -10,7 +10,7 @@ use crate::gateway::Updateable; use chorus_macros::{Composite, Updateable}; #[cfg(feature = "client")] -use crate::types::Composite; +use crate::{types::Composite, GatewayHandle}; use crate::types::{ entities::{Guild, User},