Merge branch 'develop' into storage_transactions

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,
         })