Merge branch 'develop' into storage_transactions

This commit is contained in:
Mark Haines 2014-08-27 11:19:37 +01:00
commit bf05218c4b
17 changed files with 189 additions and 171 deletions

View file

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