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

Prevent showing non-fed rooms in fed /publicRooms v2 #4746

Merged
merged 4 commits into from Feb 26, 2019

Conversation

Projects
None yet
2 participants
@anoadragon453
Copy link
Member

commented Feb 26, 2019

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

@anoadragon453 anoadragon453 changed the title Anoa/public rooms federate develop Prevent showing non-fed rooms in fed /publicRooms v2 Feb 26, 2019

@codecov

This comment has been minimized.

Copy link

commented Feb 26, 2019

Codecov Report

Merging #4746 into develop will increase coverage by 0.01%.
The diff coverage is 28.57%.

@@             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
@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)

This comment has been minimized.

Copy link
@erikjohnston

erikjohnston Feb 26, 2019

Member

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?

This comment has been minimized.

Copy link
@anoadragon453

anoadragon453 Feb 26, 2019

Author Member

Yep, left over cruft from adding in an arg then taking it away again. Tis set back now.

@anoadragon453 anoadragon453 force-pushed the anoa/public_rooms_federate_develop branch from 4db145f to 802884d Feb 26, 2019

@anoadragon453 anoadragon453 merged commit 4dc945b into develop Feb 26, 2019

7 checks passed

ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
codecov/patch 28.57% of diff hit (target 0%)
Details
codecov/project 75.12% (target 0%)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@erikjohnston erikjohnston deleted the anoa/public_rooms_federate_develop branch Mar 6, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.