MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-07 12:38:56 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:relates: Add sender checking; move option bits to class member.

Browse source
This commit is contained in:
Jason Volk 2022-08-16 19:49:16 -07:00
parent 47c6ae1c31
commit 2bf10c1234
2 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/ircd/m/relates.h
View file

@ -39,6 +39,9 @@ struct ircd::m::relates_to
struct ircd::m::relates
{
event::refs refs;
bool match_sender {false};
bool prefetch_depth {false};
bool prefetch_sender {false};
public:
using closure = util::closure_bool
@ -58,9 +61,5 @@ struct ircd::m::relates
bool has(const event::idx &) const;
size_t count(const string_view &type = {}) const;
bool prefetch(const string_view &type = {}, const bool depth = false) const;
relates(const event::refs &refs)
:refs{refs}
{}
bool prefetch(const string_view &type = {}) const;
};

24
matrix/relates.cc
View file

@ -9,8 +9,7 @@
// full license for this software is available in the LICENSE file.
bool
ircd::m::relates::prefetch(const string_view &type,
const bool depth)
ircd::m::relates::prefetch(const string_view &type)
const
{
// If the prefetch was launched, bail here without blocking below.
@ -19,12 +18,15 @@ const
// The iteration is cached so we can prefetch the content now
bool ret{false};
refs.for_each(dbs::ref::M_RELATES, [&ret, &depth]
refs.for_each(dbs::ref::M_RELATES, [this, &ret]
(const auto &event_idx, const auto &)
{
if(depth)
if(this->prefetch_depth)
ret |= m::prefetch(event_idx, "depth");
if(this->prefetch_sender || this->match_sender)
ret |= m::prefetch(event_idx, "sender");
ret |= m::prefetch(event_idx, "content");
return true;
});
@ -145,7 +147,7 @@ ircd::m::relates::for_each(const string_view &rel_type,
const closure &closure)
const
{
return refs.for_each(dbs::ref::M_RELATES, [&rel_type, &closure]
return refs.for_each(dbs::ref::M_RELATES, [this, &rel_type, &closure]
(const auto &event_idx, const auto &type)
{
thread_local char buf[event::MAX_SIZE];
@ -170,6 +172,18 @@ const
if(json::get<"rel_type"_>(relates) != rel_type)
return true;
if(this->match_sender)
{
const pair<event::idx> idx
{
refs.idx, event_idx
};
const std::equal_to<string_view> equal_to;
if(!m::query(std::nothrow, idx, "sender", equal_to))
return true;
}
return closure(event_idx, content, relates);
});
}