MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-25 08:12:37 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:user::notifications: Add room_id to opts; prefix keying strategy.

Browse source 
modules/m_push: Add room_id to type generation.
This commit is contained in:
Jason Volk 2020-03-24 14:54:47 -07:00
parent 36b1fa6bde
commit 4c70d8ce08
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/ircd/m/user/notifications.h
View file

@ -35,6 +35,7 @@ struct ircd::m::user::notifications::opts
event::idx from {0}; // highest idx counting down event::idx from {0}; // highest idx counting down
event::idx to {0}; // lowest idx ending iteration event::idx to {0}; // lowest idx ending iteration
string_view only; // spec "only" filter string_view only; // spec "only" filter
room::id room_id; // room_id filter (optional)
}; };
inline inline

11
matrix/user_notifications.cc
View file

@ -14,16 +14,23 @@ ircd::m::user::notifications::type_prefix
"ircd.push.note" "ircd.push.note"
}; };
/// valid result examples:
///
/// ircd.push.note.highlight!AAAANTUiY1fBZ230:zemos.net
/// ircd.push.note.highlight
/// ircd.push.note!AAAANTUiY1fBZ230:zemos.net
/// ircd.push.note
ircd::string_view ircd::string_view
ircd::m::user::notifications::make_type(const mutable_buffer &buf, ircd::m::user::notifications::make_type(const mutable_buffer &buf,
const opts &opts) const opts &opts)
{ {
return fmt::sprintf return fmt::sprintf
{ {
buf, "%s%s%s", buf, "%s%s%s%s",
type_prefix, type_prefix,
opts.only? "."_sv : string_view{}, opts.only? "."_sv : string_view{},
opts.only, opts.only,
string_view{opts.room_id},
}; };
} }
@ -71,7 +78,7 @@ const
const room::type events const room::type events
{ {
user_room, type user_room, type, {-1UL, -1L}, true
}; };
return events.for_each([&opts, &closure] return events.for_each([&opts, &closure]

1
modules/m_push.cc
View file

@ -228,6 +228,7 @@ try
char type_buf[event::TYPE_MAX_SIZE]; char type_buf[event::TYPE_MAX_SIZE];
user::notifications::opts opts; user::notifications::opts opts;
opts.only = "highlight"; opts.only = "highlight";
opts.room_id = eval.room_id;
const auto &type const auto &type
{ {
user::notifications::make_type(type_buf, opts) user::notifications::make_type(type_buf, opts)