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

Add 'euph.rooms.<name>.username' config option

Browse source
This commit is contained in:
Joscha 2022-08-25 23:03:33 +02:00
parent 6e6fddc0b1
commit d0ba210855
4 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/euph/room.rs
View file

@ -58,6 +58,7 @@ enum Event {
#[derive(Debug)]
struct State {
name: String,
username: Option<String>,
password: Option<String>,
vault: EuphVault,
@ -285,6 +286,17 @@ impl State {
self.last_msg_id = Some(d.log.last().map(|m| m.id));
let own_user_id = self.own_user_id().await;
self.vault.add_messages(d.log.clone(), None, own_user_id);
if d.nick.is_none() {
// Avoid overwriting nicks that the euphoria backend already
// knows, e. g. because the user set it while logged in via
// the browser. This setting is mostly meant for ephemeral
// mode. Maybe I'll add a "force_nick" setting at some point
// in the future?
if let Some(username) = &self.username {
self.on_nick(username.clone());
}
}
}
Data::LogReply(d) => {
let own_user_id = self.own_user_id().await;
@ -421,6 +433,7 @@ pub struct Room {
impl Room {
pub fn new(
vault: EuphVault,
username: Option<String>,
password: Option<String>,
) -> (Self, mpsc::UnboundedReceiver<EuphRoomEvent>) {
let (canary_tx, canary_rx) = oneshot::channel();
@ -430,6 +443,7 @@ impl Room {
let state = State {
name: vault.room().to_string(),
username,
password,
vault,
conn_tx: None,