From 8b928184e89b9ac5aee23eed4c9d084d5416c55d Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Tue, 8 Apr 2025 23:51:39 +0200
Subject: [PATCH] Fix autojoin key connecting to non-autojoin rooms

---
 CHANGELOG.md         | 4 ++++
 cove/src/ui/rooms.rs | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f06e21..3682c75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@ Procedure when bumping the version number:
 
 ## Unreleased
 
+### Fixed
+
+- `keys.rooms.action.connect_autojoin` connecting to non-autojoin rooms
+
 ## v0.9.2 - 2025-03-14
 
 ### Added
diff --git a/cove/src/ui/rooms.rs b/cove/src/ui/rooms.rs
index f901f30..c3d6a40 100644
--- a/cove/src/ui/rooms.rs
+++ b/cove/src/ui/rooms.rs
@@ -536,7 +536,10 @@ impl Rooms {
         }
         if event.matches(&keys.rooms.action.connect_autojoin) {
             for (domain, server) in &self.config.euph.servers {
-                for name in server.rooms.keys() {
+                for (name, room) in &server.rooms {
+                    if !room.autojoin {
+                        continue;
+                    }
                     let id = RoomIdentifier::new(domain.clone(), name.clone());
                     self.connect_to_room(id).await;
                 }