Remove special rl2dev code

This commit is contained in:
Joscha 2025-02-23 04:24:06 +01:00
parent e750f81b11
commit 2fa1bec421
2 changed files with 7 additions and 19 deletions

View file

@ -21,6 +21,10 @@ Procedure when bumping the version number:
- Documentation for `time_zone` config option - Documentation for `time_zone` config option
- When connecting to a room using `n` in the room list, the cursor now moves to that room - When connecting to a room using `n` in the room list, the cursor now moves to that room
### Removed
- Special handling of &rl2dev
## v0.8.3 - 2024-05-20 ## v0.8.3 - 2024-05-20
### Changed ### Changed

View file

@ -1,5 +1,3 @@
// TODO Remove rl2dev-specific code
use std::{convert::Infallible, time::Duration}; use std::{convert::Infallible, time::Duration};
use euphoxide::{ use euphoxide::{
@ -71,20 +69,13 @@ impl Room {
where where
F: Fn(Event) + std::marker::Send + Sync + 'static, F: Fn(Event) + std::marker::Send + Sync + 'static,
{ {
// &rl2dev's message history is broken and requesting old messages past
// a certain point results in errors. Cove should not keep retrying log
// requests when hitting that limit, so &rl2dev is always opened in
// ephemeral mode.
let is_rl2dev = vault.room().domain == "euphoria.io" && vault.room().name == "rl2dev";
let ephemeral = vault.vault().vault().ephemeral() || is_rl2dev;
Self { Self {
vault, ephemeral: vault.vault().vault().ephemeral(),
ephemeral,
instance: instance_config.build(on_event), instance: instance_config.build(on_event),
state: State::Disconnected, state: State::Disconnected,
last_msg_id: None, last_msg_id: None,
log_request_canary: None, log_request_canary: None,
vault,
} }
} }
@ -192,14 +183,7 @@ impl Room {
debug!("{:?}: requesting logs", vault.room()); debug!("{:?}: requesting logs", vault.room());
// &rl2dev's message history is broken and requesting old messages past let _ = conn_tx.send(Log { n: 1000, before }).await;
// 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
// is fairly low in activity, this should be fine.
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;
// The code handling incoming events and replies also handles // The code handling incoming events and replies also handles
// `LogReply`s, so we don't need to do anything special here. // `LogReply`s, so we don't need to do anything special here.
} }