summaryrefslogtreecommitdiff
path: root/synapse/api/filtering.py
diff options
context:
space:
mode:
Diffstat (limited to 'synapse/api/filtering.py')
-rw-r--r--synapse/api/filtering.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py
index 4a808e33..b0071475 100644
--- a/synapse/api/filtering.py
+++ b/synapse/api/filtering.py
@@ -19,6 +19,7 @@ from typing import (
TYPE_CHECKING,
Awaitable,
Callable,
+ Collection,
Dict,
Iterable,
List,
@@ -32,7 +33,7 @@ from typing import (
import jsonschema
from jsonschema import FormatChecker
-from synapse.api.constants import EventContentFields
+from synapse.api.constants import EduTypes, EventContentFields
from synapse.api.errors import SynapseError
from synapse.api.presence import UserPresenceState
from synapse.events import EventBase
@@ -346,7 +347,7 @@ class Filter:
user_id = event.user_id
field_matchers = {
"senders": lambda v: user_id == v,
- "types": lambda v: "m.presence" == v,
+ "types": lambda v: EduTypes.PRESENCE == v,
}
return self._check_fields(field_matchers)
else:
@@ -444,9 +445,9 @@ class Filter:
return room_ids
async def _check_event_relations(
- self, events: Iterable[FilterEvent]
+ self, events: Collection[FilterEvent]
) -> List[FilterEvent]:
- # The event IDs to check, mypy doesn't understand the ifinstance check.
+ # The event IDs to check, mypy doesn't understand the isinstance check.
event_ids = [event.event_id for event in events if isinstance(event, EventBase)] # type: ignore[attr-defined]
event_ids_to_keep = set(
await self._store.events_have_relations(