diff --git a/examples/gateway_observers.rs b/examples/gateway_observers.rs index 1ea1761..7d49a1f 100644 --- a/examples/gateway_observers.rs +++ b/examples/gateway_observers.rs @@ -33,7 +33,7 @@ async fn main() { let websocket_url_spacebar = "wss://gateway.old.server.spacebar.chat/".to_string(); // Initiate the gateway connection - let gateway: GatewayHandle = Gateway::get_handle(websocket_url_spacebar).await.unwrap(); + let gateway: GatewayHandle = Gateway::spawn(websocket_url_spacebar).await.unwrap(); // Create an instance of our observer let observer = ExampleObserver {}; diff --git a/examples/gateway_simple.rs b/examples/gateway_simple.rs index 331fc6c..56c557a 100644 --- a/examples/gateway_simple.rs +++ b/examples/gateway_simple.rs @@ -12,7 +12,7 @@ async fn main() { let websocket_url_spacebar = "wss://gateway.old.server.spacebar.chat/".to_string(); // Initiate the gateway connection, starting a listener in one thread and a heartbeat handler in another - let gateway: GatewayHandle = Gateway::get_handle(websocket_url_spacebar).await.unwrap(); + let gateway: GatewayHandle = Gateway::spawn(websocket_url_spacebar).await.unwrap(); // At this point, we are connected to the server and are sending heartbeats, however we still haven't authenticated diff --git a/src/api/auth/login.rs b/src/api/auth/login.rs index b1138c0..5eddfa3 100644 --- a/src/api/auth/login.rs +++ b/src/api/auth/login.rs @@ -37,8 +37,7 @@ impl Instance { self.limits_information.as_mut().unwrap().ratelimits = shell.limits.clone().unwrap(); } let mut identify = GatewayIdentifyPayload::common(); - let gateway: DefaultGatewayHandle = - Gateway::get_handle(self.urls.wss.clone()).await.unwrap(); + let gateway: DefaultGatewayHandle = Gateway::spawn(self.urls.wss.clone()).await.unwrap(); identify.token = login_result.token.clone(); gateway.send_identify(identify).await; let user = ChorusUser::new( diff --git a/src/api/auth/mod.rs b/src/api/auth/mod.rs index 7d03b95..a1490fc 100644 --- a/src/api/auth/mod.rs +++ b/src/api/auth/mod.rs @@ -26,9 +26,8 @@ impl Instance { .await .unwrap(); let mut identify = GatewayIdentifyPayload::common(); - let gateway: DefaultGatewayHandle = DefaultGateway::get_handle(self.urls.wss.clone()) - .await - .unwrap(); + let gateway: DefaultGatewayHandle = + DefaultGateway::spawn(self.urls.wss.clone()).await.unwrap(); identify.token = token.clone(); gateway.send_identify(identify).await; let user = ChorusUser::new( diff --git a/src/api/auth/register.rs b/src/api/auth/register.rs index f416124..2ea6e7d 100644 --- a/src/api/auth/register.rs +++ b/src/api/auth/register.rs @@ -46,7 +46,7 @@ impl Instance { let user_object = self.get_user(token.clone(), None).await.unwrap(); let settings = ChorusUser::get_settings(&token, &self.urls.api.clone(), &mut self).await?; let mut identify = GatewayIdentifyPayload::common(); - let gateway: GatewayHandle = Gateway::get_handle(self.urls.wss.clone()).await.unwrap(); + let gateway: GatewayHandle = Gateway::spawn(self.urls.wss.clone()).await.unwrap(); identify.token = token.clone(); gateway.send_identify(identify).await; let user = ChorusUser::new( diff --git a/src/gateway/default/gateway.rs b/src/gateway/default/gateway.rs index 918d9d9..5dd5db6 100644 --- a/src/gateway/default/gateway.rs +++ b/src/gateway/default/gateway.rs @@ -34,9 +34,7 @@ impl &self.heartbeat_handler } - async fn get_handle< - G: GatewayHandleCapable>>, - >( + async fn spawn>>>( websocket_url: String, ) -> Result { let mut roots = rustls::RootCertStore::empty(); diff --git a/src/gateway/mod.rs b/src/gateway/mod.rs index 3add6b1..96e2155 100644 --- a/src/gateway/mod.rs +++ b/src/gateway/mod.rs @@ -171,9 +171,8 @@ where /// Returns a Result with a matching impl of [`GatewayHandleCapable`], or a [`GatewayError`] /// /// DOCUMENTME: Explain what this method has to do to be a good get_handle() impl, or link to such documentation - async fn get_handle>( - websocket_url: String, - ) -> Result; + async fn spawn>(websocket_url: String) + -> Result; async fn close(&mut self); /// This handles a message as a websocket event and updates its events along with the events' observers async fn handle_message(&mut self, msg: GatewayMessage) { diff --git a/src/instance.rs b/src/instance.rs index 4acfd26..8c462a6 100644 --- a/src/instance.rs +++ b/src/instance.rs @@ -135,7 +135,7 @@ impl ChorusUser { let object = Arc::new(RwLock::new(User::default())); let wss_url = instance.read().unwrap().urls.wss.clone(); // Dummy gateway object - let gateway = Gateway::get_handle(wss_url).await.unwrap(); + let gateway = Gateway::spawn(wss_url).await.unwrap(); ChorusUser { token, belongs_to: instance.clone(), diff --git a/tests/common/mod.rs b/tests/common/mod.rs index 95c2de3..76f20c7 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -43,7 +43,7 @@ impl TestBundle { limits: self.user.limits.clone(), settings: self.user.settings.clone(), object: self.user.object.clone(), - gateway: DefaultGateway::get_handle(self.instance.urls.wss.clone()) + gateway: DefaultGateway::spawn(self.instance.urls.wss.clone()) .await .unwrap(), } diff --git a/tests/gateway.rs b/tests/gateway.rs index f71c1fc..2303707 100644 --- a/tests/gateway.rs +++ b/tests/gateway.rs @@ -10,7 +10,7 @@ use chorus::{gateway::*, GatewayHandle}; async fn test_gateway_establish() { let bundle = common::setup().await; - let _: GatewayHandle = DefaultGateway::get_handle(bundle.urls.wss.clone()) + let _: GatewayHandle = DefaultGateway::spawn(bundle.urls.wss.clone()) .await .unwrap(); common::teardown(bundle).await @@ -21,7 +21,7 @@ async fn test_gateway_establish() { async fn test_gateway_authenticate() { let bundle = common::setup().await; - let gateway: GatewayHandle = DefaultGateway::get_handle(bundle.urls.wss.clone()) + let gateway: GatewayHandle = DefaultGateway::spawn(bundle.urls.wss.clone()) .await .unwrap();