diff --git a/synapse/rest/client/v2_alpha/report_event.py b/synapse/rest/client/v2_alpha/report_event.py
index 9c1c9662c9..8903e12405 100644
--- a/synapse/rest/client/v2_alpha/report_event.py
+++ b/synapse/rest/client/v2_alpha/report_event.py
@@ -33,6 +33,7 @@ class ReportEventRestServlet(RestServlet):
super(ReportEventRestServlet, self).__init__()
self.hs = hs
self.auth = hs.get_auth()
+ self.clock = hs.get_clock()
self.store = hs.get_datastore()
@defer.inlineCallbacks
@@ -48,6 +49,7 @@ class ReportEventRestServlet(RestServlet):
user_id=user_id,
reason=body.get("reason"),
content=body,
+ received_ts=self.clock.time_msec(),
)
defer.returnValue((200, {}))
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 045ae6c03f..7122b0cbb1 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -114,6 +114,7 @@ class DataStore(RoomMemberStore, RoomStore,
self._state_groups_id_gen = StreamIdGenerator(db_conn, "state_groups", "id")
self._access_tokens_id_gen = IdGenerator(db_conn, "access_tokens", "id")
self._refresh_tokens_id_gen = IdGenerator(db_conn, "refresh_tokens", "id")
+ self._event_reports_id_gen = IdGenerator(db_conn, "event_reports", "id")
self._push_rule_id_gen = IdGenerator(db_conn, "push_rules", "id")
self._push_rules_enable_id_gen = IdGenerator(db_conn, "push_rules_enable", "id")
self._push_rules_stream_id_gen = ChainedIdGenerator(
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index ceced7d516..26933e593a 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -223,10 +223,14 @@ class RoomStore(SQLBaseStore):
defer.returnValue((name, aliases))
- def add_event_report(self, room_id, event_id, user_id, reason, content):
+ def add_event_report(self, room_id, event_id, user_id, reason, content,
+ received_ts):
+ next_id = self._event_reports_id_gen.get_next()
return self._simple_insert(
table="event_reports",
values={
+ "id": next_id,
+ "received_ts": received_ts,
"room_id": room_id,
"event_id": event_id,
"user_id": user_id,
diff --git a/synapse/storage/schema/delta/32/reports.sql b/synapse/storage/schema/delta/32/reports.sql
index 06bf0d9b5a..3f25027457 100644
--- a/synapse/storage/schema/delta/32/reports.sql
+++ b/synapse/storage/schema/delta/32/reports.sql
@@ -15,6 +15,8 @@
CREATE TABLE event_reports(
+ id BIGINT NOT NULL,
+ received_ts BIGINT NOT NULL,
room_id TEXT NOT NULL,
event_id TEXT NOT NULL,
user_id TEXT NOT NULL,
|
