MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 18:22:50 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:push: Add non-spec condition kind 'state_key_user_mxid'.

Browse source
This commit is contained in:
Jason Volk 2020-03-22 16:40:55 -07:00
parent f58cfed6e9
commit fc63e102fa
2 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/ircd/m/push.h
View file

@ -37,8 +37,8 @@ struct ircd::m::push::match
struct opts;
using cond_kind_func = bool (*)(const event &, const cond &, const opts &);
static string_view cond_kind_name[5];
static const cond_kind_func cond_kind[6];
static string_view cond_kind_name[6];
static const cond_kind_func cond_kind[7];
explicit match(const event &, const cond &, const opts &);
explicit match(const event &, const rule &, const opts &);

39
matrix/push.cc
View file

@ -35,6 +35,7 @@ namespace ircd::m::push
static bool unknown_condition_kind(const event &, const cond &, const match::opts &);
static bool sender_notification_permission(const event &, const cond &, const match::opts &);
static bool contains_display_name(const event &, const cond &, const match::opts &);
static bool state_key_user_mxid(const event &, const cond &, const match::opts &);
static bool contains_user_mxid(const event &, const cond &, const match::opts &);
static bool room_member_count(const event &, const cond &, const match::opts &);
static bool event_match(const event &, const cond &, const match::opts &);
@ -46,6 +47,7 @@ ircd::m::push::match::cond_kind
event_match,
room_member_count,
contains_user_mxid,
state_key_user_mxid,
contains_display_name,
sender_notification_permission,
unknown_condition_kind,
@ -57,6 +59,7 @@ ircd::m::push::match::cond_kind_name
"event_match",
"room_member_count",
"contains_user_mxid",
"state_key_user_mxid",
"contains_display_name",
"sender_notification_permission",
};
@ -213,6 +216,38 @@ catch(const std::exception &e)
return false;
}
bool
ircd::m::push::state_key_user_mxid(const event &event,
const cond &cond,
const match::opts &opts)
try
{
assert(json::get<"kind"_>(cond) == "state_key_user_mxid");
const auto &state_key
{
json::get<"state_key"_>(event)
};
assert(opts.user_id);
return state_key == opts.user_id;
}
catch(const ctx::interrupted &)
{
throw;
}
catch(const std::exception &e)
{
log::error
{
log, "Push condition 'state_key_user_mxid' %s :%s",
string_view{event.event_id},
e.what(),
};
return false;
}
bool
ircd::m::push::contains_display_name(const event &event,
const cond &cond,
@ -638,9 +673,7 @@ ircd::m::push::rules::defaults{R"(
"pattern": "invite"
},
{
"key": "state_key",
"kind": "event_match",
"pattern": "[the user's Matrix ID]"
"kind": "state_key_user_mxid"
}
],
"actions":