Merge pull request #311 from matrix-org/markjh/postgres_fixes

Fix FilteringStore.get_user_filter to work with postgres
This commit is contained in:
Erik Johnston 2015-10-16 15:35:26 +01:00
commit 524b708f98

View File

@ -34,7 +34,7 @@ class FilteringStore(SQLBaseStore):
desc="get_user_filter",
)
defer.returnValue(json.loads(def_json.decode("utf-8")))
defer.returnValue(json.loads(str(def_json).decode("utf-8")))
def add_user_filter(self, user_localpart, user_filter):
def_json = json.dumps(user_filter).encode("utf-8")