Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correctly register deactivation and profile update module callbacks (#12141)

Browse Source
This commit is contained in:
Brendan Abolivier 2022-03-03 11:39:58 +01:00 committed by GitHub
parent 6d282a9c89
commit ae8a616b49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/12141.bugfix Normal file
View File

@ -0,0 +1 @@
Fix a bug introduced in Synapse 1.54.0rc1 preventing the new module callbacks introduced in this release from being registered by modules.

10
synapse/events/third_party_rules.py
View File

@ -174,7 +174,9 @@ class ThirdPartyEventRules:
] = None, ] = None,
on_new_event: Optional[ON_NEW_EVENT_CALLBACK] = None, on_new_event: Optional[ON_NEW_EVENT_CALLBACK] = None,
on_profile_update: Optional[ON_PROFILE_UPDATE_CALLBACK] = None, on_profile_update: Optional[ON_PROFILE_UPDATE_CALLBACK] = None,
on_deactivation: Optional[ON_USER_DEACTIVATION_STATUS_CHANGED_CALLBACK] = None, on_user_deactivation_status_changed: Optional[
ON_USER_DEACTIVATION_STATUS_CHANGED_CALLBACK
] = None,
) -> None: ) -> None:
"""Register callbacks from modules for each hook.""" """Register callbacks from modules for each hook."""
if check_event_allowed is not None: if check_event_allowed is not None:
@ -199,8 +201,10 @@ class ThirdPartyEventRules:
if on_profile_update is not None: if on_profile_update is not None:
self._on_profile_update_callbacks.append(on_profile_update) self._on_profile_update_callbacks.append(on_profile_update)
if on_deactivation is not None: if on_user_deactivation_status_changed is not None:
self._on_user_deactivation_status_changed_callbacks.append(on_deactivation) self._on_user_deactivation_status_changed_callbacks.append(
on_user_deactivation_status_changed,
)
async def check_event_allowed( async def check_event_allowed(
self, event: EventBase, context: EventContext self, event: EventBase, context: EventContext

8
synapse/module_api/__init__.py
View File

@ -59,6 +59,8 @@ from synapse.events.third_party_rules import (
CHECK_VISIBILITY_CAN_BE_MODIFIED_CALLBACK, CHECK_VISIBILITY_CAN_BE_MODIFIED_CALLBACK,
ON_CREATE_ROOM_CALLBACK, ON_CREATE_ROOM_CALLBACK,
ON_NEW_EVENT_CALLBACK, ON_NEW_EVENT_CALLBACK,
ON_PROFILE_UPDATE_CALLBACK,
ON_USER_DEACTIVATION_STATUS_CHANGED_CALLBACK,
) )
from synapse.handlers.account_validity import ( from synapse.handlers.account_validity import (
IS_USER_EXPIRED_CALLBACK, IS_USER_EXPIRED_CALLBACK,
@ -281,6 +283,10 @@ class ModuleApi:
CHECK_VISIBILITY_CAN_BE_MODIFIED_CALLBACK CHECK_VISIBILITY_CAN_BE_MODIFIED_CALLBACK
] = None, ] = None,
on_new_event: Optional[ON_NEW_EVENT_CALLBACK] = None, on_new_event: Optional[ON_NEW_EVENT_CALLBACK] = None,
on_profile_update: Optional[ON_PROFILE_UPDATE_CALLBACK] = None,
on_user_deactivation_status_changed: Optional[
ON_USER_DEACTIVATION_STATUS_CHANGED_CALLBACK
] = None,
) -> None: ) -> None:
"""Registers callbacks for third party event rules capabilities. """Registers callbacks for third party event rules capabilities.
@ -292,6 +298,8 @@ class ModuleApi:
check_threepid_can_be_invited=check_threepid_can_be_invited, check_threepid_can_be_invited=check_threepid_can_be_invited,
check_visibility_can_be_modified=check_visibility_can_be_modified, check_visibility_can_be_modified=check_visibility_can_be_modified,
on_new_event=on_new_event, on_new_event=on_new_event,
on_profile_update=on_profile_update,
on_user_deactivation_status_changed=on_user_deactivation_status_changed,
) )
def register_presence_router_callbacks( def register_presence_router_callbacks(