Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 11:16:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into rav/cleanup_metrics

Browse source
This commit is contained in:
Richard van der Hoff 2019-06-24 10:00:13 +01:00
commit 5097aee740
397 changed files with 9502 additions and 10426 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/storage/_base.py
View file

@ -311,9 +311,7 @@ class SQLBaseStore(object):
if res:
for user in res:
self.set_expiration_date_for_user_txn(
txn,
user["name"],
use_delta=True,
txn, user["name"], use_delta=True
)
yield self.runInteraction(
@ -1662,7 +1660,7 @@ def db_to_json(db_content):
# Decode it to a Unicode string before feeding it to json.loads, so we
# consistenty get a Unicode-containing object out.
if isinstance(db_content, (bytes, bytearray)):
db_content = db_content.decode('utf8')
db_content = db_content.decode("utf8")
try:
return json.loads(db_content)