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

Add configurable room list publishing rules #4647

Merged
merged 9 commits into from Feb 15, 2019

Conversation

Projects
None yet
3 participants
@erikjohnston
Copy link
Member

erikjohnston commented Feb 14, 2019

This allows specifying who and what is allowed to be published onto the
public room list.

erikjohnston added some commits Feb 14, 2019

Add configurable room list publishing rules
This allows specifying who and what is allowed to be published onto the
public room list

@erikjohnston erikjohnston requested a review from matrix-org/synapse-core Feb 14, 2019

@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Feb 14, 2019

Codecov Report

Merging #4647 into develop will increase coverage by <.01%.
The diff coverage is 81.13%.

@@             Coverage Diff             @@
##           develop    #4647      +/-   ##
===========================================
+ Coverage    75.27%   75.27%   +<.01%     
===========================================
  Files          338      338              
  Lines        34579    34620      +41     
  Branches      5655     5669      +14     
===========================================
+ Hits         26030    26061      +31     
- Misses        6959     6965       +6     
- Partials      1590     1594       +4
Show resolved Hide resolved synapse/config/room_directory.py Outdated
Show resolved Hide resolved synapse/config/room_directory.py Outdated
Show resolved Hide resolved synapse/config/room_directory.py Outdated
Show resolved Hide resolved synapse/config/room_directory.py Outdated
Show resolved Hide resolved synapse/config/room_directory.py Outdated
Show resolved Hide resolved synapse/handlers/directory.py Outdated
Show resolved Hide resolved synapse/config/room_directory.py Outdated
Show resolved Hide resolved synapse/config/room_directory.py
@erikjohnston

This comment has been minimized.

Copy link
Member Author

erikjohnston commented Feb 14, 2019

Hopefully the comments make more sense now?

@erikjohnston erikjohnston requested a review from matrix-org/synapse-core Feb 14, 2019

@erikjohnston

This comment has been minimized.

Copy link
Member Author

erikjohnston commented Feb 14, 2019

And err, woops, about how to handle multiple aliases. I think the behaviour makes the most sense.

@richvdh
Copy link
Member

richvdh left a comment

Generally looks sane, but I did a bunch of work recently in trying to make the default config a thing that people could understand, and I'm keen that we keep going in the right direction there.

Show resolved Hide resolved synapse/config/room_directory.py Outdated
# `alias_creation_rules`.
#
# If the room has one or more aliases associated with it, only one of
# the aliases needs to match the alias rule. If there are no aliases

This comment has been minimized.

Copy link
@richvdh

richvdh Feb 14, 2019

Member

what does it even mean to publish a room in the room directory when it doesn't have an alias, ooi?

This comment has been minimized.

Copy link
@erikjohnston

erikjohnston Feb 15, 2019

Author Member

It's a perfectly legit thing to do, while remote users wouldn't be able to join the room local users still would happily be able to.

Though I have a suspicion we might require an alias before we actually publish the room

Show resolved Hide resolved synapse/config/room_directory.py Outdated
Show resolved Hide resolved synapse/config/room_directory.py
Show resolved Hide resolved synapse/config/room_directory.py Outdated

@erikjohnston erikjohnston requested a review from matrix-org/synapse-core Feb 15, 2019

@richvdh
Copy link
Member

richvdh left a comment

lgtm

@erikjohnston erikjohnston merged commit bd4505f into develop Feb 15, 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 81.13% of diff hit (target 0%)
Details
codecov/project 75.27% (target 0%)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@erikjohnston erikjohnston deleted the erikj/add_room_publishing_rules branch Mar 5, 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.