This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Prevent showing non-fed rooms in fed /publicRooms v2 #4746
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
anoadragon453
changed the title
Codecov Report
@@ Coverage Diff @@
## develop #4746 +/- ##
===========================================
+ Coverage 75.1% 75.12% +0.01%
===========================================
Files 340 340
Lines 34853 34860 +7
Branches 5709 5711 +2
===========================================
+ Hits 26177 26187 +10
+ Misses 7066 7058 -8
- Partials 1610 1615 +5 |
synapse/handlers/room_list.py
Outdated
| @cachedInlineCallbacks(num_args=1, cache_context=True) | ||
| def generate_room_entry(self, room_id, num_joined_users, cache_context, | ||
| with_alias=True, allow_private=False): | ||
| @cachedInlineCallbacks(num_args=2, cache_context=True) |
There was a problem hiding this comment.
This should be kept at num_args=1 if we're not adding a parameter.
In fact, why is there a change in the function def here (other than docstring, yay!) at all?
There was a problem hiding this comment.
Yep, left over cruft from adding in an arg then taking it away again. Tis set back now.
anoadragon453
force-pushed
the
anoa/public_rooms_federate_develop
branch
from
4db145f to
802884d
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This is another instance of #4736 but with rewritten commits in order to reduce merge conflicts on the dinsic branch.
New PR for the dinsic branch is at #4747