diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-01-29 11:53:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-29 11:53:11 +0000 |
| commit | 281551f720d6829a1bd9345639a178963997040b (patch) | |
| tree | 4ae33e446ac998a6ee5d7580ea96f4b8a2aa59fd /synapse/handlers/directory.py | |
| parent | Fix race in federation sender that delayed device updates. (#6799) (diff) | |
| parent | changelog (diff) | |
| download | synapse-281551f720d6829a1bd9345639a178963997040b.tar.xz | |
Merge pull request #6790 from matrix-org/rav/msc2260.1
MSC2260: change the default power level for m.room.aliases events
Diffstat (limited to 'synapse/handlers/directory.py')
| -rw-r--r-- | synapse/handlers/directory.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py index a07d2f1a17..8c5980cb0c 100644 --- a/synapse/handlers/directory.py +++ b/synapse/handlers/directory.py @@ -151,7 +151,12 @@ class DirectoryHandler(BaseHandler): yield self._create_association(room_alias, room_id, servers, creator=user_id) if send_event: - yield self.send_room_alias_update_event(requester, room_id) + try: + yield self.send_room_alias_update_event(requester, room_id) + except AuthError as e: + # sending the aliases event may fail due to the user not having + # permission in the room; this is permitted. + logger.info("Skipping updating aliases event due to auth error %s", e) @defer.inlineCallbacks def delete_association(self, requester, room_alias, send_event=True): |