diff options
| author | Erik Johnston <erik@matrix.org> | 2020-01-22 16:53:28 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-01-22 16:53:28 +0000 |
| commit | 57a60365da0c47f286ea4608d766abbca5762233 (patch) | |
| tree | aaef0948f26f3352092b787d32e1dda0743d697e /synapse/state/v1.py | |
| parent | Pull out more info about room key requests (diff) | |
| parent | Remove unnecessary abstractions in admin handler (#6751) (diff) | |
| download | synapse-github/erikj/debug_direct_message_checks.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/debug_direct_message_checks github/erikj/debug_direct_message_checks erikj/debug_direct_message_checks
Diffstat (limited to 'synapse/state/v1.py')
| -rw-r--r-- | synapse/state/v1.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/state/v1.py b/synapse/state/v1.py index b2f9865f39..d6c34ce3b7 100644 --- a/synapse/state/v1.py +++ b/synapse/state/v1.py @@ -15,7 +15,7 @@ import hashlib import logging -from typing import Callable, Dict, List, Optional, Tuple +from typing import Callable, Dict, List, Optional from six import iteritems, iterkeys, itervalues @@ -26,6 +26,7 @@ from synapse.api.constants import EventTypes from synapse.api.errors import AuthError from synapse.api.room_versions import RoomVersions from synapse.events import EventBase +from synapse.types import StateMap logger = logging.getLogger(__name__) @@ -36,7 +37,7 @@ POWER_KEY = (EventTypes.PowerLevels, "") @defer.inlineCallbacks def resolve_events_with_store( room_id: str, - state_sets: List[Dict[Tuple[str, str], str]], + state_sets: List[StateMap[str]], event_map: Optional[Dict[str, EventBase]], state_map_factory: Callable, ): |