feat: incoming invites over federation

2021-04-11 21:01:27 +02:00
parent b0ea692706
commit 8773e5013d
10 changed files with 307 additions and 146 deletions
--- a/src/client_server/account.rs
+++ b/src/client_server/account.rs
@@ -617,11 +617,11 @@ pub async fn deactivate_route(
    }

    // Leave all joined rooms and reject all invitations
-    for room_id in db
-        .rooms
-        .rooms_joined(&sender_user)
-        .chain(db.rooms.rooms_invited(&sender_user))
-    {
+    for room_id in db.rooms.rooms_joined(&sender_user).chain(
+        db.rooms
+            .rooms_invited(&sender_user)
+            .map(|t| t.map(|(r, _)| r)),
+    ) {
        let room_id = room_id?;
        let event = member::MemberEventContent {
            membership: member::MembershipState::Leave,