mirror of
https://mau.dev/maunium/synapse.git
synced 2024-09-05 00:52:20 +00:00
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1
This commit is contained in:
commit
45fffe8cbe
@ -118,11 +118,14 @@ class PushRuleRestServlet(ClientV1RestServlet):
|
|||||||
user.to_string()
|
user.to_string()
|
||||||
)
|
)
|
||||||
|
|
||||||
for r in rawrules:
|
ruleslist = []
|
||||||
r["conditions"] = json.loads(r["conditions"])
|
for rawrule in rawrules:
|
||||||
r["actions"] = json.loads(r["actions"])
|
rule = dict(rawrule)
|
||||||
|
rule["conditions"] = json.loads(rawrule["conditions"])
|
||||||
|
rule["actions"] = json.loads(rawrule["actions"])
|
||||||
|
ruleslist.append(rule)
|
||||||
|
|
||||||
ruleslist = baserules.list_with_base_rules(rawrules, user)
|
ruleslist = baserules.list_with_base_rules(ruleslist, user)
|
||||||
|
|
||||||
rules = {'global': {}, 'device': {}}
|
rules = {'global': {}, 'device': {}}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user