Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 09:06:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Incorporate review

Browse source
This commit is contained in:
Brendan Abolivier 2019-11-01 10:30:51 +00:00
parent dcc069a2e2
commit c6dbca2422
No known key found for this signature in database
GPG key ID: 1E015C145F1916CD
7 changed files with 34 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/api/constants.py
View file

@ -140,4 +140,7 @@ class LimitBlockingTypes(object):
HS_DISABLED = "hs_disabled"
LabelsField = "org.matrix.labels"
class EventContentFields(object):
"""Fields found in events' content, regardless of type."""
# Labels for the event, cf https://github.com/matrix-org/matrix-doc/pull/2326
Labels = "org.matrix.labels"

6
synapse/api/filtering.py
View file

@ -20,7 +20,7 @@ from jsonschema import FormatChecker
from twisted.internet import defer
from synapse.api.constants import LabelsField
from synapse.api.constants import EventContentFields
from synapse.api.errors import SynapseError
from synapse.storage.presence import UserPresenceState
from synapse.types import RoomID, UserID
@ -67,6 +67,8 @@ ROOM_EVENT_FILTER_SCHEMA = {
"contains_url": {"type": "boolean"},
"lazy_load_members": {"type": "boolean"},
"include_redundant_members": {"type": "boolean"},
# Include or exclude events with the provided labels.
# cf https://github.com/matrix-org/matrix-doc/pull/2326
"org.matrix.labels": {"type": "array", "items": {"type": "string"}},
"org.matrix.not_labels": {"type": "array", "items": {"type": "string"}},
},
@ -307,7 +309,7 @@ class Filter(object):
content = event.get("content", {})
# check if there is a string url field in the content for filtering purposes
contains_url = isinstance(content.get("url"), text_type)
labels = content.get(LabelsField, [])
labels = content.get(EventContentFields.Labels, [])
return self.check_fields(room_id, sender, ev_type, labels, contains_url)