OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Incorporate review

pull/6301/head
Brendan Abolivier 2019-11-01 16:22:44 +00:00
parent 5598445655
commit 988d8d6507
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
7 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/api/constants.py
View File

@ -144,4 +144,4 @@ 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"
LABELS = "org.matrix.labels"

2
synapse/api/filtering.py
View File

@ -309,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(EventContentFields.Labels, [])
labels = content.get(EventContentFields.LABELS, [])
return self.check_fields(room_id, sender, ev_type, labels, contains_url)

2
synapse/storage/data_stores/main/events.py
View File

@ -1491,7 +1491,7 @@ class EventsStore(
self._handle_event_relations(txn, event)
# Store the labels for this event.
labels = event.content.get(EventContentFields.Labels)
labels = event.content.get(EventContentFields.LABELS)
if labels:
self.insert_labels_for_event_txn(
txn, event.event_id, labels, event.room_id, event.depth

6
synapse/storage/data_stores/main/schema/delta/56/event_labels.sql
View File

@ -13,6 +13,8 @@
* limitations under the License.
*/
-- room_id and topoligical_ordering are denormalised from the events table in order to
-- make the index work.
CREATE TABLE IF NOT EXISTS event_labels (
event_id TEXT,
label TEXT,
@ -21,4 +23,8 @@ CREATE TABLE IF NOT EXISTS event_labels (
PRIMARY KEY(event_id, label)
);
-- This index enables an event pagination looking for a particular label to index the
-- event_labels table first, which is much quicker than scanning the events table and then
-- filtering by label, if the label is rarely used relative to the size of the room.
CREATE INDEX event_labels_room_id_label_idx ON event_labels(room_id, label, topological_ordering);

8
tests/api/test_filtering.py
View File

@ -329,7 +329,7 @@ class FilteringTestCase(unittest.TestCase):
sender="@foo:bar",
type="m.room.message",
room_id="!secretbase:unknown",
content={EventContentFields.Labels: ["#fun"]},
content={EventContentFields.LABELS: ["#fun"]},
)
self.assertTrue(Filter(definition).check(event))
@ -338,7 +338,7 @@ class FilteringTestCase(unittest.TestCase):
sender="@foo:bar",
type="m.room.message",
room_id="!secretbase:unknown",
content={EventContentFields.Labels: ["#notfun"]},
content={EventContentFields.LABELS: ["#notfun"]},
)
self.assertFalse(Filter(definition).check(event))
@ -349,7 +349,7 @@ class FilteringTestCase(unittest.TestCase):
sender="@foo:bar",
type="m.room.message",
room_id="!secretbase:unknown",
content={EventContentFields.Labels: ["#fun"]},
content={EventContentFields.LABELS: ["#fun"]},
)
self.assertFalse(Filter(definition).check(event))
@ -358,7 +358,7 @@ class FilteringTestCase(unittest.TestCase):
sender="@foo:bar",
type="m.room.message",
room_id="!secretbase:unknown",
content={EventContentFields.Labels: ["#notfun"]},
content={EventContentFields.LABELS: ["#notfun"]},
)
self.assertTrue(Filter(definition).check(event))

8
tests/rest/client/v1/test_rooms.py
View File

@ -860,7 +860,7 @@ class RoomMessageListTestCase(RoomBase):
content={
"msgtype": "m.text",
"body": "with right label",
EventContentFields.Labels: ["#fun"],
EventContentFields.LABELS: ["#fun"],
},
)
@ -876,7 +876,7 @@ class RoomMessageListTestCase(RoomBase):
content={
"msgtype": "m.text",
"body": "with wrong label",
EventContentFields.Labels: ["#work"],
EventContentFields.LABELS: ["#work"],
},
)
@ -886,7 +886,7 @@ class RoomMessageListTestCase(RoomBase):
content={
"msgtype": "m.text",
"body": "with two wrong labels",
EventContentFields.Labels: ["#work", "#notfun"],
EventContentFields.LABELS: ["#work", "#notfun"],
},
)
@ -896,7 +896,7 @@ class RoomMessageListTestCase(RoomBase):
content={
"msgtype": "m.text",
"body": "with right label",
EventContentFields.Labels: ["#fun"],
EventContentFields.LABELS: ["#fun"],
},
)

8
tests/rest/client/v2_alpha/test_sync.py
View File

@ -157,7 +157,7 @@ class SyncFilterTestCase(unittest.HomeserverTestCase):
content={
"msgtype": "m.text",
"body": "with right label",
EventContentFields.Labels: ["#fun"],
EventContentFields.LABELS: ["#fun"],
},
tok=tok,
)
@ -175,7 +175,7 @@ class SyncFilterTestCase(unittest.HomeserverTestCase):
content={
"msgtype": "m.text",
"body": "with wrong label",
EventContentFields.Labels: ["#work"],
EventContentFields.LABELS: ["#work"],
},
tok=tok,
)
@ -186,7 +186,7 @@ class SyncFilterTestCase(unittest.HomeserverTestCase):
content={
"msgtype": "m.text",
"body": "with two wrong labels",
EventContentFields.Labels: ["#work", "#notfun"],
EventContentFields.LABELS: ["#work", "#notfun"],
},
tok=tok,
)
@ -197,7 +197,7 @@ class SyncFilterTestCase(unittest.HomeserverTestCase):
content={
"msgtype": "m.text",
"body": "with right label",
EventContentFields.Labels: ["#fun"],
EventContentFields.LABELS: ["#fun"],
},
tok=tok,
)