This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Fix exception thrown when attempting to add an appservice sender
to user_directory
#11026
Closed
MadLittleMods
wants to merge
15
commits into
release-v1.45
from
madlittlemods/11025-fix-user-directory-throwing-exception-when-interacting-with-appservice-sender
Closed
Commits on Oct 7, 2021
-
Fix exception thrown when attempting to notify appservice sender
Fix #11025 Before in [`user_directory_handler._handle_deltas`, we just checked for `is_support_user(user_id)`](https://github.com/matrix-org/synapse/pull/10960/files#diff-e02a9a371e03b8615b53c6b6552f76fc7d3ef58931ca64d28b3512caf305449fL232) which works just fine. Now with #10960, we [call `should_include_local_user_in_dir`](https://github.com/matrix-org/synapse/pull/10960/files#diff-e02a9a371e03b8615b53c6b6552f76fc7d3ef58931ca64d28b3512caf305449fR229) which does a [bunch of additional checks](https://github.com/matrix-org/synapse/blob/e79ee48313404abf8fbb7c88361e4ab1efa29a81/synapse/storage/databases/main/user_directory.py#L382-L398) which aren't all compatible with the main appservice sender (main bridge user/sender). More specifically, we can't check the `users` database table for whether the user is deactivated. In the `should_include_local_user_in_dir` checks, we should return early if we encounter a main appservice sender before the incompatible checks.
Configuration menu - View commit details
-
Copy full SHA for 2c7c5c2 - Browse repository at this point
Copy the full SHA 2c7c5c2View commit details -
Configuration menu - View commit details
-
Copy full SHA for ede2a70 - Browse repository at this point
Copy the full SHA ede2a70View commit details
Commits on Oct 8, 2021
-
Merge branch 'develop' into madlittlemods/11025-fix-user-directory-th…
…rowing-exception-when-interacting-with-appservice-sender
Configuration menu - View commit details
-
Copy full SHA for 1dea46b - Browse repository at this point
Copy the full SHA 1dea46bView commit details -
Configuration menu - View commit details
-
Copy full SHA for a92cad8 - Browse repository at this point
Copy the full SHA a92cad8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6523234 - Browse repository at this point
Copy the full SHA 6523234View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8d2025c - Browse repository at this point
Copy the full SHA 8d2025cView commit details
Commits on Oct 11, 2021
-
Add test covering appservice sender joining a room
I don't think this actually improves coverage as such, but I'll sleep better at night having this case checked!
David Robertson committedOct 11, 2021 Configuration menu - View commit details
-
Copy full SHA for ff6212a - Browse repository at this point
Copy the full SHA ff6212aView commit details -
On reflection, INCLUDE the appservice senders
That's the current behaviour (I didn't realise they typically don't match their own user regex).
David Robertson committedOct 11, 2021 Configuration menu - View commit details
-
Copy full SHA for 3c053fd - Browse repository at this point
Copy the full SHA 3c053fdView commit details -
David Robertson committed
Oct 11, 2021 Configuration menu - View commit details
-
Copy full SHA for 1b84f7d - Browse repository at this point
Copy the full SHA 1b84f7dView commit details -
David Robertson committed
Oct 11, 2021 Configuration menu - View commit details
-
Copy full SHA for 03db1e5 - Browse repository at this point
Copy the full SHA 03db1e5View commit details -
David Robertson committed
Oct 11, 2021 Configuration menu - View commit details
-
Copy full SHA for 4c5afd0 - Browse repository at this point
Copy the full SHA 4c5afd0View commit details -
Ensure dir rebuild includes appservice senders
David Robertson committedOct 11, 2021 Configuration menu - View commit details
-
Copy full SHA for 7648898 - Browse repository at this point
Copy the full SHA 7648898View commit details -
Desperate attempt to make test pass on CI. It's fine locally!
David Robertson committedOct 11, 2021 Configuration menu - View commit details
-
Copy full SHA for 8550c0a - Browse repository at this point
Copy the full SHA 8550c0aView commit details -
David Robertson committed
Oct 11, 2021 Configuration menu - View commit details
-
Copy full SHA for 04078ff - Browse repository at this point
Copy the full SHA 04078ffView commit details -
David Robertson committed
Oct 11, 2021 Configuration menu - View commit details
-
Copy full SHA for 9fec1cc - Browse repository at this point
Copy the full SHA 9fec1ccView commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.