Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix redacted events being returned in search results ordered by "recent" #6522

Merged
merged 2 commits into from Dec 12, 2019

Conversation

@anoadragon453
Copy link
Member

anoadragon453 commented Dec 11, 2019

An amendment to #6377 and an additional fix to #1454.

#6377 only removed redacted search events from search results ordered by "rank". This PR also removes them for searches ordered by "recent".

I've updated matrix-org/sytest#747 to test both cases appropriately.

@anoadragon453 anoadragon453 self-assigned this Dec 11, 2019
@anoadragon453 anoadragon453 changed the title Prevent redacted events from being returned during message search Fix redacted events being returned in search results ordered by "recent" Dec 11, 2019
@anoadragon453 anoadragon453 requested a review from matrix-org/synapse-core Dec 11, 2019
@anoadragon453 anoadragon453 merged commit 5bfd885 into develop Dec 12, 2019
22 checks passed
22 checks passed
buildkite/synapse Build #6090 passed (20 minutes, 46 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 30 seconds)
Details
buildkite/synapse/check-style Passed (2 minutes, 8 seconds)
Details
buildkite/synapse/isort Passed (17 seconds)
Details
buildkite/synapse/mypy Passed (26 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (16 seconds)
Details
buildkite/synapse/packaging Passed (27 seconds)
Details
buildkite/synapse/pipeline Passed (3 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (17 minutes, 52 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (7 minutes, 25 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite-slash-old-deps Passed (8 minutes, 39 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (6 minutes, 40 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (18 minutes, 22 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (18 minutes, 1 second)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (6 minutes, 51 seconds)
Details
buildkite/synapse/synapse-port-db-slash-python-3-dot-5-slash-postgres-9-dot-5 Passed (1 minute, 32 seconds)
Details
buildkite/synapse/synapse-port-db-slash-python-3-dot-7-slash-postgres-11 Passed (1 minute, 16 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-monolith Passed (10 minutes, 51 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-workers Passed (13 minutes, 28 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-sqlite-slash-monolith Passed (11 minutes, 15 seconds)
Details
buildkite/synapse/sytest-python-3-dot-7-slash-postgres-11-slash-monolith Passed (9 minutes, 31 seconds)
Details
buildkite/synapse/sytest-python-3-dot-7-slash-postgres-11-slash-workers Passed (11 minutes, 53 seconds)
Details
@anoadragon453 anoadragon453 deleted the anoa/prevent_redacted_search_results_recent branch Dec 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.