Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-27 06:39:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

allow session_data to be any JSON instead of just a string

Browse Source
This commit is contained in:
Hubert Chathi 2018-08-21 14:51:34 -04:00
parent 8550a7e9c2
commit 42a394caa2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/storage/e2e_room_keys.py
View File

@ -58,6 +58,8 @@ class EndToEndRoomKeyStore(SQLBaseStore):
desc="get_e2e_room_key", desc="get_e2e_room_key",
) )
row["session_data"] = json.loads(row["session_data"]);
defer.returnValue(row) defer.returnValue(row)
@defer.inlineCallbacks @defer.inlineCallbacks
@ -87,7 +89,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
"first_message_index": room_key['first_message_index'], "first_message_index": room_key['first_message_index'],
"forwarded_count": room_key['forwarded_count'], "forwarded_count": room_key['forwarded_count'],
"is_verified": room_key['is_verified'], "is_verified": room_key['is_verified'],
"session_data": room_key['session_data'], "session_data": json.dumps(room_key['session_data']),
}, },
lock=False, lock=False,
) )
@ -145,7 +147,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
"first_message_index": row["first_message_index"], "first_message_index": row["first_message_index"],
"forwarded_count": row["forwarded_count"], "forwarded_count": row["forwarded_count"],
"is_verified": row["is_verified"], "is_verified": row["is_verified"],
"session_data": row["session_data"], "session_data": json.loads(row["session_data"]),
} }
defer.returnValue(sessions) defer.returnValue(sessions)