diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 11:19:37 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 11:19:37 +0100 |
| commit | bf05218c4b1740cdc5477cadbc36f0575e2dcd51 (patch) | |
| tree | ced8ed09e18afb11e97734959150b8ef7f0db833 /synapse/storage | |
| parent | Fold federation/handler into handlers/federation (diff) | |
| parent | Added support for GET /events/$eventid with auth checks. (diff) | |
| download | synapse-bf05218c4b1740cdc5477cadbc36f0575e2dcd51.tar.xz | |
Merge branch 'develop' into storage_transactions
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/__init__.py | 1 | ||||
| -rw-r--r-- | synapse/storage/feedback.py | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 130387184f..08505f05ff 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -88,7 +88,6 @@ class DataStore(RoomMemberStore, RoomStore, [ "event_id", "type", - "sender", "room_id", "content", "unrecognized_keys" diff --git a/synapse/storage/feedback.py b/synapse/storage/feedback.py index 336192ad01..bac3dea955 100644 --- a/synapse/storage/feedback.py +++ b/synapse/storage/feedback.py @@ -23,9 +23,9 @@ class FeedbackStore(SQLBaseStore): def _store_feedback_txn(self, txn, event): self._simple_insert_txn(txn, "feedback", { "event_id": event.event_id, - "feedback_type": event.feedback_type, + "feedback_type": event.content["type"], "room_id": event.room_id, - "target_event_id": event.target_event, + "target_event_id": event.content["target_event_id"], "sender": event.user_id, }) |