Compare commits
No commits in common. "a293bdaf1c05aac58a15263c9e8988d4e0b00386" and "5a7c65741b6667ef8f644cd2376720c10027b382" have entirely different histories.
a293bdaf1c
...
5a7c65741b
@ -8,7 +8,7 @@ extern crate serde;
|
||||
mod config;
|
||||
mod event;
|
||||
|
||||
use std::{env, net::IpAddr, ops::Deref, process::exit, sync::Arc, time::Duration};
|
||||
use std::{env, net::IpAddr, process::exit, sync::Arc, time::Duration};
|
||||
|
||||
use anyhow::Context;
|
||||
use constant_time_eq::constant_time_eq;
|
||||
@ -78,13 +78,13 @@ async fn ensure_matrix_room_joined(matrix_client: &Client, room_id: &OwnedRoomOr
|
||||
let mut room = matrix_client
|
||||
.joined_rooms()
|
||||
.iter()
|
||||
.find(|a_room| room_matches(Deref::deref(Deref::deref(*a_room)), room_id))
|
||||
.find(|a_room| room_matches(*a_room, room_id))
|
||||
.map(|room| room.clone());
|
||||
if room.is_none() {
|
||||
if let Some(invited) = matrix_client
|
||||
.invited_rooms()
|
||||
.iter()
|
||||
.find(|a_room| room_matches(Deref::deref(Deref::deref(*a_room)), room_id))
|
||||
.find(|a_room| room_matches(*a_room, room_id))
|
||||
{
|
||||
invited.accept_invitation().await?;
|
||||
} else {
|
||||
@ -95,7 +95,7 @@ async fn ensure_matrix_room_joined(matrix_client: &Client, room_id: &OwnedRoomOr
|
||||
room = matrix_client
|
||||
.joined_rooms()
|
||||
.iter()
|
||||
.find(|a_room| room_matches(Deref::deref(Deref::deref(*a_room)), room_id))
|
||||
.find(|a_room| room_matches(*a_room, room_id))
|
||||
.map(|room| room.clone());
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user