kozabrada123/chorus
kozabrada123
/
chorus
mirror of https://github.com/polyphony-chat/chorus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Slight code cleanup

This commit is contained in:
kozabrada123 2023-05-06 08:39:41 +02:00
parent a4fdf18106
commit 7dbdcf828d
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/gateway.rs
View File

@ -321,14 +321,7 @@ impl<'a> WebSocketConnection {
) = channel(32); ) = channel(32);
let shared_send_channel_write = Arc::new(Mutex::new(send_channel_write)); let shared_send_channel_write = Arc::new(Mutex::new(send_channel_write));
let shared_send_channel_read = Arc::new(Mutex::new(send_channel_read));
let clone_shared_send_channel_write = shared_send_channel_write.clone();
let shared_receive_channel_read = Arc::new(Mutex::new(receive_channel_read)); let shared_receive_channel_read = Arc::new(Mutex::new(receive_channel_read));
let shared_receive_channel_write = Arc::new(Mutex::new(receive_channel_write));
let clone_shared_receive_channel_read = shared_receive_channel_read.clone();
task::spawn(async move { task::spawn(async move {
let (mut ws_stream, _) = match connect_async_tls_with_config( let (mut ws_stream, _) = match connect_async_tls_with_config(
@ -348,14 +341,14 @@ impl<'a> WebSocketConnection {
let (mut ws_tx, mut ws_rx) = ws_stream.split(); let (mut ws_tx, mut ws_rx) = ws_stream.split();
while let Some(msg) = shared_send_channel_read.lock().await.recv().await { // Send messages from the send channel
while let Some(msg) = send_channel_read.recv().await {
ws_tx.send(msg).await.unwrap(); ws_tx.send(msg).await.unwrap();
} }
let event = while let Some(msg) = ws_rx.next().await { // Write received messages to the receive channel
shared_receive_channel_write while let Some(msg) = ws_rx.next().await {
.lock() receive_channel_write
.await
.send(msg.unwrap()) .send(msg.unwrap())
.await .await
.unwrap(); .unwrap();
@ -363,8 +356,8 @@ impl<'a> WebSocketConnection {
}); });
WebSocketConnection { WebSocketConnection {
tx: clone_shared_send_channel_write, tx: shared_send_channel_write,
rx: clone_shared_receive_channel_read, rx: shared_receive_channel_read,
} }
} }
} }
@ -526,5 +519,9 @@ mod example {
let mut gateway = Gateway::new("ws://localhost:3001/".to_string()) let mut gateway = Gateway::new("ws://localhost:3001/".to_string())
.await .await
.unwrap(); .unwrap();
gateway.send_identify(GatewayIdentifyPayload::default()).await;
loop {
gateway.update_events().await;
}
} }
} }