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

Respect domain in euph room

Browse source
This commit is contained in:
Joscha 2023-12-31 20:17:12 +01:00
parent da1d23646a
commit 2bbfca7002
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cove/src/euph/room.rs
View file

@ -1,4 +1,5 @@
// TODO Stop if room does not exist (e.g. 404) // TODO Stop if room does not exist (e.g. 404)
// TODO Remove rl2dev-specific code
use std::convert::Infallible; use std::convert::Infallible;
use std::time::Duration; use std::time::Duration;
@ -19,6 +20,7 @@ use crate::vault::EuphRoomVault;
const LOG_INTERVAL: Duration = Duration::from_secs(10); const LOG_INTERVAL: Duration = Duration::from_secs(10);
#[allow(clippy::large_enum_variant)]
#[derive(Debug)] #[derive(Debug)]
pub enum State { pub enum State {
Disconnected, Disconnected,
@ -69,7 +71,8 @@ impl Room {
// a certain point results in errors. Cove should not keep retrying log // a certain point results in errors. Cove should not keep retrying log
// requests when hitting that limit, so &rl2dev is always opened in // requests when hitting that limit, so &rl2dev is always opened in
// ephemeral mode. // ephemeral mode.
let ephemeral = vault.vault().vault().ephemeral() || vault.room() == "rl2dev"; let is_rl2dev = vault.room().domain == "euphoria.io" && vault.room().name == "rl2dev";
let ephemeral = vault.vault().vault().ephemeral() || is_rl2dev;
Self { Self {
vault, vault,
@ -125,7 +128,8 @@ impl Room {
let cookies = &*self.instance.config().server.cookies; let cookies = &*self.instance.config().server.cookies;
let cookies = cookies.lock().unwrap().clone(); let cookies = cookies.lock().unwrap().clone();
logging_unwrap!(self.vault.vault().set_cookies(cookies).await); let domain = self.vault.room().domain.clone();
logging_unwrap!(self.vault.vault().set_cookies(domain, cookies).await);
} }
Event::Packet(_, packet, ConnSnapshot { conn_tx, state }) => { Event::Packet(_, packet, ConnSnapshot { conn_tx, state }) => {
self.state = State::Connected(conn_tx, state); self.state = State::Connected(conn_tx, state);
@ -189,7 +193,8 @@ impl Room {
// a certain point results in errors. By reducing the amount of messages // a certain point results in errors. By reducing the amount of messages
// in each log request, we can get closer to this point. Since &rl2dev // in each log request, we can get closer to this point. Since &rl2dev
// is fairly low in activity, this should be fine. // is fairly low in activity, this should be fine.
let n = if vault.room() == "rl2dev" { 50 } else { 1000 }; let is_rl2dev = vault.room().domain == "euphoria.io" && vault.room().name == "rl2dev";
let n = if is_rl2dev { 50 } else { 1000 };
let _ = conn_tx.send(Log { n, before }).await; let _ = conn_tx.send(Log { n, before }).await;
// The code handling incoming events and replies also handles // The code handling incoming events and replies also handles