Merge pull request #1373 from matrix-org/hs/fix-membership-sync-never…

…-completing Do not attempt to sync membership from a room we can't access
matrix-org · Jun 8, 2021 · 6488006 · 6488006
2 parents 98cc5bc + c79dcc8
commit 6488006
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/changelog.d/1373.bugfix b/changelog.d/1373.bugfix
@@ -0,0 +1 @@
+Fix the bridge never syncing membership if it cannot get the joined users for a room on startup.
diff --git a/src/bridge/MemberListSyncer.ts b/src/bridge/MemberListSyncer.ts
@@ -185,6 +185,10 @@ export class MemberListSyncer {
                     }
                     catch (err) {
                         log.error(`Failed to getJoinedMembers in room ${roomId}: ${err}`);
+                        if (err.data?.errcode === "M_FORBIDDEN") {
+                            // If we're not allowed to, just give up.
+                            return;
+                        }
                         await Bluebird.delay(3000); // wait a bit before retrying
                     }
                 }