Fix third-party event modules for `check_visibility_can_be_modified` check

PR #8292 tried to maintain backwards compat with modules which don't provide a
`check_visibility_can_be_modified` method, but the tests weren't being run,
and the check didn't work.
pull/8467/head
Richard van der Hoff 2020-10-05 20:27:14 +01:00
parent da11cc22be
commit 4cd1448d0e
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: if self.third_party_rules is None:
return True 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): if not check_func or not isinstance(check_func, Callable):
return True return True

View File

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