MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 15:33:54 +01:00
Code Issues Releases Wiki Activity

modules/client/pushrules: Insert rule_id to rule on upload rather than outputs.

Browse source
This commit is contained in:
Jason Volk 2020-03-27 10:40:43 -07:00
parent f20bdbceb8
commit 02430413ef
2 changed files with 5 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
modules/client/pushrules.cc
View file

@ -131,28 +131,9 @@ ircd::m::push::handle_get(client &client,
}; };
const auto append_rule{[] const auto append_rule{[]
(json::stack::array &_kind, const auto &path, const json::object &rule) (json::stack::array &array, const auto &path, const json::object &rule)
{ {
const auto &[scope, kind, ruleid] array.append(rule);
{
path
};
json::stack::object object
{
_kind
};
json::stack::member
{
object, "rule_id", ruleid
};
for(const auto &[key, val] : rule)
json::stack::member
{
object, key, val
};
}}; }};
if(ruleid) if(ruleid)
@ -343,6 +324,7 @@ ircd::m::push::handle_put(client &client,
{ {
{ "enabled", rule.get("enabled", true) }, { "enabled", rule.get("enabled", true) },
{ "default", false }, { "default", false },
{ "rule_id", ruleid },
}) })
}; };

20
modules/client/sync/account_data.cc
View file

@ -176,25 +176,9 @@ ircd::m::sync::push_rules(data &data)
}; };
pushrules.for_each(push::path{scope, kind, {}}, [&_kind] pushrules.for_each(push::path{scope, kind, {}}, [&_kind]
(const auto &event_idx, const auto &path, const auto &members) (const auto &event_idx, const auto &path, const json::object &rule)
{ {
const auto &[scope, kind, ruleid] {path}; _kind.append(rule);
json::stack::object object
{
_kind
};
json::stack::member
{
object, "rule_id", ruleid
};
for(const auto &[key, val] : members)
json::stack::member
{
object, key, val
};
return true; return true;
}); });
}}; }};