Rename `get_handle` to `spawn`

This commit is contained in:
bitfl0wer 2023-11-18 19:07:56 +01:00
parent 964d879e8f
commit 862a846055
10 changed files with 13 additions and 18 deletions

View File

@ -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 {};

View File

@ -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

View File

@ -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(

View File

@ -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(

View File

@ -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(

View File

@ -34,9 +34,7 @@ impl
&self.heartbeat_handler
}
async fn get_handle<
G: GatewayHandleCapable<Message, WebSocketStream<MaybeTlsStream<TcpStream>>>,
>(
async fn spawn<G: GatewayHandleCapable<Message, WebSocketStream<MaybeTlsStream<TcpStream>>>>(
websocket_url: String,
) -> Result<G, GatewayError> {
let mut roots = rustls::RootCertStore::empty();

View File

@ -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<G: GatewayHandleCapable<T, S>>(
websocket_url: String,
) -> Result<G, GatewayError>;
async fn spawn<G: GatewayHandleCapable<T, S>>(websocket_url: String)
-> Result<G, GatewayError>;
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) {

View File

@ -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(),

View File

@ -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(),
}

View File

@ -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();