MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-05-15 17:33:46 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:event::append: Move static objects into class.

Browse source
This commit is contained in:
Jason Volk 2023-04-28 20:35:54 -07:00
parent d4ba215a3b
commit feb4ac1fd3
2 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/ircd/m/event/append.h
View file

@ -29,6 +29,14 @@ struct ircd::m::event::append
{ {
struct opts; struct opts;
private:
static const event::keys::exclude exclude_keys;
static const event::keys default_keys;
static conf::item<std::string> exclude_types;
static conf::item<bool> info;
static log::log log;
public:
append(json::stack::object &, const event &, const opts &); append(json::stack::object &, const event &, const opts &);
append(json::stack::object &, const event &); append(json::stack::object &, const event &);
append(json::stack::array &, const event &, const opts &); append(json::stack::array &, const event &, const opts &);

44
matrix/event_append.cc
View file

@ -8,31 +8,25 @@
// copyright notice and this permission notice is present in all copies. The // copyright notice and this permission notice is present in all copies. The
// full license for this software is available in the LICENSE file. // full license for this software is available in the LICENSE file.
namespace ircd::m [[gnu::visibility("hidden")]]
{ decltype(ircd::m::event::append::log)
extern const event::keys::exclude event_append_exclude_keys; ircd::m::event::append::log
extern const event::keys event_append_default_keys;
extern conf::item<std::string> event_append_exclude_types;
extern conf::item<bool> event_append_info;
extern log::log event_append_log;
}
decltype(ircd::m::event_append_log)
ircd::m::event_append_log
{ {
"m.event.append" "m.event.append"
}; };
decltype(ircd::m::event_append_info) [[gnu::visibility("hidden")]]
ircd::m::event_append_info decltype(ircd::m::event::append::info)
ircd::m::event::append::info
{ {
{ "name", "ircd.m.event.append.info" }, { "name", "ircd.m.event.append.info" },
{ "default", false }, { "default", false },
{ "persist", false }, { "persist", false },
}; };
decltype(ircd::m::event_append_exclude_types) [[gnu::visibility("hidden")]]
ircd::m::event_append_exclude_types decltype(ircd::m::event::append::exclude_types)
ircd::m::event::append::exclude_types
{ {
{ "name", "ircd.m.event.append.exclude.types" }, { "name", "ircd.m.event.append.exclude.types" },
{ "default", "org.matrix.dummy_event" }, { "default", "org.matrix.dummy_event" },
@ -42,8 +36,9 @@ ircd::m::event_append_exclude_types
/// to the client. This mask is applied only if the caller of event::append{} /// to the client. This mask is applied only if the caller of event::append{}
/// did not supply their mask to apply. It is also inferior to the user's /// did not supply their mask to apply. It is also inferior to the user's
/// filter if supplied. /// filter if supplied.
decltype(ircd::m::event_append_exclude_keys) [[gnu::visibility("hidden")]]
ircd::m::event_append_exclude_keys decltype(ircd::m::event::append::exclude_keys)
ircd::m::event::append::exclude_keys
{ {
"auth_events", "auth_events",
"hashes", "hashes",
@ -53,10 +48,11 @@ ircd::m::event_append_exclude_keys
"signatures", "signatures",
}; };
decltype(ircd::m::event_append_default_keys) [[gnu::visibility("hidden")]]
ircd::m::event_append_default_keys decltype(ircd::m::event::append::default_keys)
ircd::m::event::append::default_keys
{ {
event_append_exclude_keys event::append::exclude_keys
}; };
ircd::m::event::append::append(json::stack::array &array, ircd::m::event::append::append(json::stack::array &array,
@ -114,7 +110,7 @@ ircd::m::event::append::append(json::stack::object &object,
const auto &not_types const auto &not_types
{ {
event_append_exclude_types exclude_types
}; };
if(!opts.event_filter && token_exists(not_types, ' ', json::get<"type"_>(event))) if(!opts.event_filter && token_exists(not_types, ' ', json::get<"type"_>(event)))
@ -254,7 +250,7 @@ ircd::m::event::append::append(json::stack::object &object,
{ {
opts.keys? opts.keys?
*opts.keys: *opts.keys:
event_append_default_keys default_keys
}; };
// Append the event members // Append the event members
@ -357,10 +353,10 @@ ircd::m::event::append::append(json::stack::object &object,
}; };
} }
if(unlikely(event_append_info)) if(unlikely(info))
log::info log::info
{ {
event_append_log, "%s %s idx:%lu in %s depth:%ld txnid:%s idx:%lu age:%ld %s,%s", log, "%s %s idx:%lu in %s depth:%ld txnid:%s idx:%lu age:%ld %s,%s",
opts.user_id? string_view{*opts.user_id} : string_view{}, opts.user_id? string_view{*opts.user_id} : string_view{},
string_view{event.event_id}, string_view{event.event_id},
opts.event_idx? *opts.event_idx : 0UL, opts.event_idx? *opts.event_idx : 0UL,