skip rooms we have not joined before for auto-join
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
parent
dda3b0e7e2
commit
9715b07b38
1 changed files with 7 additions and 2 deletions
|
@ -290,12 +290,17 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
|
||||||
|
|
||||||
if !services().globals.config.auto_join_rooms.is_empty() {
|
if !services().globals.config.auto_join_rooms.is_empty() {
|
||||||
for room in &services().globals.config.auto_join_rooms {
|
for room in &services().globals.config.auto_join_rooms {
|
||||||
|
if !services().rooms.state_cache.server_in_room(services().globals.server_name(), room)? {
|
||||||
|
warn!("Skipping room {room} to automatically join as we have never joined before.");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if let Some(room_id_server_name) = room.server_name() {
|
if let Some(room_id_server_name) = room.server_name() {
|
||||||
match join_room_by_id_helper(
|
match join_room_by_id_helper(
|
||||||
Some(&user_id),
|
Some(&user_id),
|
||||||
room,
|
room,
|
||||||
Some("Automatically joining this room".to_owned()),
|
Some("Automatically joining this room upon registration".to_owned()),
|
||||||
&[room_id_server_name.to_owned()],
|
&[room_id_server_name.to_owned(), services().globals.server_name().to_owned()],
|
||||||
None,
|
None,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue