diff --git a/cove/src/euph/room.rs b/cove/src/euph/room.rs index 22bebb1..6ae3a17 100644 --- a/cove/src/euph/room.rs +++ b/cove/src/euph/room.rs @@ -187,7 +187,7 @@ impl Room { None => None, }; - debug!("{}: requesting logs", vault.room()); + debug!("{:?}: requesting logs", vault.room()); // &rl2dev's message history is broken and requesting old messages past // a certain point results in errors. By reducing the amount of messages diff --git a/cove/src/ui/euph/room.rs b/cove/src/ui/euph/room.rs index 30d40a8..e27e2b6 100644 --- a/cove/src/ui/euph/room.rs +++ b/cove/src/ui/euph/room.rs @@ -101,8 +101,8 @@ impl EuphRoom { let instance_config = self .server_config .clone() - .room(self.vault().room().to_string()) - .name(format!("{room}-{}", next_instance_id)) + .room(self.vault().room().name.clone()) + .name(format!("{room:?}-{}", next_instance_id)) .human(true) .username(self.room_config.username.clone()) .force_username(self.room_config.force_username) diff --git a/cove/src/vault/euph.rs b/cove/src/vault/euph.rs index 7a5ec3f..0e84ba1 100644 --- a/cove/src/vault/euph.rs +++ b/cove/src/vault/euph.rs @@ -46,13 +46,13 @@ impl FromSql for WTime { } } -#[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)] +#[derive(Clone, Hash, PartialEq, Eq, PartialOrd, Ord)] pub struct RoomIdentifier { pub domain: String, pub name: String, } -impl fmt::Display for RoomIdentifier { +impl fmt::Debug for RoomIdentifier { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "&{}@{}", self.name, self.domain) }