Merge pull request #8467 from matrix-org/rav/fix_3pevent_rules

Fix third-party event modules for `check_visibility_can_be_modified` check
This commit is contained in:
Richard van der Hoff 2020-10-06 11:32:53 +01:00 committed by GitHub
commit 9c0b168cff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions

1
changelog.d/8467.feature Normal file
View File

@ -0,0 +1 @@
Allow `ThirdPartyEventRules` modules to query and manipulate whether a room is in the public rooms directory.

View File

@ -131,7 +131,9 @@ class ThirdPartyEventRules:
if self.third_party_rules is None:
return True
check_func = getattr(self.third_party_rules, "check_visibility_can_be_modified")
check_func = getattr(
self.third_party_rules, "check_visibility_can_be_modified", None
)
if not check_func or not isinstance(check_func, Callable):
return True

View File

@ -49,7 +49,7 @@ class ThirdPartyRulesTestCase(unittest.HomeserverTestCase):
def make_homeserver(self, reactor, clock):
config = self.default_config()
config["third_party_event_rules"] = {
"module": "tests.rest.client.third_party_rules.ThirdPartyRulesTestModule",
"module": __name__ + ".ThirdPartyRulesTestModule",
"config": {},
}