Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #308 from matrix-org/markjh/v2_filter_encoding 

Encode the filter JSON as UTF-8 before storing in the database.
This commit is contained in:
Mark Haines 2015-10-16 13:41:31 +01:00
parent a059760954 6296590bf7
commit 5df54de801
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/storage/filtering.py
View File

@ -34,10 +34,10 @@ class FilteringStore(SQLBaseStore):
desc="get_user_filter",
)
defer.returnValue(json.loads(def_json))
defer.returnValue(json.loads(def_json.decode("utf-8")))
def add_user_filter(self, user_localpart, user_filter):
def_json = json.dumps(user_filter)
def_json = json.dumps(user_filter).encode("utf-8")
# Need an atomic transaction to SELECT the maximal ID so far then
# INSERT a new one