Garmelon/cove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify return type

Browse source
This commit is contained in:
Joscha 2023-01-20 21:45:08 +01:00
parent 23352e7027
commit 875f8be181
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/euph/room.rs
View file

@ -111,12 +111,11 @@ impl State {
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
loop { loop {
info!("e&{}: connecting", name); info!("e&{}: connecting", name);
let connected = if let Some((conn_tx, mut conn_rx)) = Self::connect(vault, name).await? let connected = if let Some(mut conn) = Self::connect(vault, name).await? {
{
info!("e&{}: connected", name); info!("e&{}: connected", name);
event_tx.send(Event::Connected(conn_tx))?; event_tx.send(Event::Connected(conn.tx().clone()))?;
while let Ok(packet) = conn_rx.recv().await { while let Ok(packet) = conn.recv().await {
event_tx.send(Event::Packet(Box::new(packet)))?; event_tx.send(Event::Packet(Box::new(packet)))?;
} }
@ -161,8 +160,7 @@ impl State {
vault.set_cookies(cookie_jar); vault.set_cookies(cookie_jar);
} }
// TODO Simplify return type, remove ConnTx async fn connect(vault: &EuphRoomVault, name: &str) -> anyhow::Result<Option<Conn>> {
async fn connect(vault: &EuphRoomVault, name: &str) -> anyhow::Result<Option<(ConnTx, Conn)>> {
// TODO Set user agent? // TODO Set user agent?
let cookies = Self::get_cookies(vault.vault()).await; let cookies = Self::get_cookies(vault.vault()).await;
@ -171,7 +169,7 @@ impl State {
match Conn::connect("euphoria.io", name, true, Some(cookies), TIMEOUT).await { match Conn::connect("euphoria.io", name, true, Some(cookies), TIMEOUT).await {
Ok((rx, set_cookies)) => { Ok((rx, set_cookies)) => {
Self::update_cookies(vault.vault(), &set_cookies); Self::update_cookies(vault.vault(), &set_cookies);
Ok(Some((rx.tx().clone(), rx))) Ok(Some(rx))
} }
Err(tungstenite::Error::Http(resp)) if resp.status().is_client_error() => { Err(tungstenite::Error::Http(resp)) if resp.status().is_client_error() => {
bail!("room {name} doesn't exist"); bail!("room {name} doesn't exist");