diff options
| author | Travis Ralston <travpc@gmail.com> | 2021-02-02 07:26:36 -0700 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2021-02-02 07:26:36 -0700 |
| commit | 6ec034411cdad6f9f77f7dab7749d426ffd5744b (patch) | |
| tree | d7935121ad99051eddf5769993bef674e618379e /synapse/handlers/user_directory.py | |
| parent | Appease the linters (diff) | |
| parent | Update changelog (diff) | |
| download | synapse-github/travis/fosdem/admin-api-groups.tar.xz | |
Merge branch 'develop' into travis/fosdem/admin-api-groups github/travis/fosdem/admin-api-groups travis/fosdem/admin-api-groups
Diffstat (limited to 'synapse/handlers/user_directory.py')
| -rw-r--r-- | synapse/handlers/user_directory.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/synapse/handlers/user_directory.py b/synapse/handlers/user_directory.py index d4651c8348..8aedf5072e 100644 --- a/synapse/handlers/user_directory.py +++ b/synapse/handlers/user_directory.py @@ -145,10 +145,6 @@ class UserDirectoryHandler(StateDeltasHandler): if self.pos is None: self.pos = await self.store.get_user_directory_stream_pos() - # If still None then the initial background update hasn't happened yet - if self.pos is None: - return None - # Loop round handling deltas until we're up to date while True: with Measure(self.clock, "user_dir_delta"): @@ -233,6 +229,11 @@ class UserDirectoryHandler(StateDeltasHandler): if change: # The user joined event = await self.store.get_event(event_id, allow_none=True) + # It isn't expected for this event to not exist, but we + # don't want the entire background process to break. + if event is None: + continue + profile = ProfileInfo( avatar_url=event.content.get("avatar_url"), display_name=event.content.get("displayname"), |