From 1b30b82ac694e62d6346d3510b3e31f3fe03071b Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 9 Mar 2023 10:18:42 +0000 Subject: Move callback-related code from the PresenceRouter to its own class --- tests/events/test_presence_router.py | 5 ++++- tests/server.py | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/events/test_presence_router.py b/tests/events/test_presence_router.py index 6fb1f1bd6e..bd6f87faba 100644 --- a/tests/events/test_presence_router.py +++ b/tests/events/test_presence_router.py @@ -19,10 +19,13 @@ import attr from twisted.test.proto_helpers import MemoryReactor from synapse.api.constants import EduTypes -from synapse.events.presence_router import PresenceRouter, load_legacy_presence_router +from synapse.events.presence_router import PresenceRouter from synapse.federation.units import Transaction from synapse.handlers.presence import UserPresenceState from synapse.module_api import ModuleApi +from synapse.module_api.callbacks.presence_router_callbacks import ( + load_legacy_presence_router, +) from synapse.rest import admin from synapse.rest.client import login, presence, room from synapse.server import HomeServer diff --git a/tests/server.py b/tests/server.py index 512dda55d7..787f558069 100644 --- a/tests/server.py +++ b/tests/server.py @@ -71,10 +71,12 @@ from twisted.web.server import Request, Site from synapse.config.database import DatabaseConnectionConfig from synapse.config.homeserver import HomeServerConfig -from synapse.events.presence_router import load_legacy_presence_router from synapse.handlers.auth import load_legacy_password_auth_providers from synapse.http.site import SynapseRequest from synapse.logging.context import ContextResourceUsage +from synapse.module_api.callbacks.presence_router_callbacks import ( + load_legacy_presence_router, +) from synapse.module_api.callbacks.spam_checker_callbacks import ( load_legacy_spam_checkers, ) -- cgit 1.5.1