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

ircd:Ⓜ️ Add room.root(); crush pattern.

Browse source
This commit is contained in:
Jason Volk 2018-02-09 13:08:41 -08:00
parent dd582bd21d
commit 6ff27aa45c
2 changed files with 39 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/ircd/m/room.h
View file

@ -86,6 +86,7 @@ struct ircd::m::room
operator const id &() const { return room_id; } operator const id &() const { return room_id; }
// observer // observer
string_view root(m::state::id_buffer &) const;
void for_each(const string_view &type, const event::closure &view) const; void for_each(const string_view &type, const event::closure &view) const;
bool test(const string_view &type, const event::closure_bool &view) const; bool test(const string_view &type, const event::closure_bool &view) const;
bool has(const string_view &type, const string_view &state_key) const; bool has(const string_view &type, const string_view &state_key) const;

129
ircd/m/room.cc
View file

@ -330,20 +330,10 @@ ircd::m::room::membership(const m::id::user &user_id,
const string_view &membership) const string_view &membership)
const const
{ {
const event::id::buf event_id_buf m::state::id_buffer root;
{
!event_id? head(room_id) : string_view{}
};
const event::id event_id
{
this->event_id? this->event_id : event_id_buf
};
m::state::id_buffer state_root_buf;
const auto state_root const auto state_root
{ {
dbs::state_root(state_root_buf, room_id, event_id) this->root(root)
}; };
bool ret{false}; bool ret{false};
@ -443,20 +433,10 @@ ircd::m::room::get(const string_view &type,
const event::closure &closure) const event::closure &closure)
const const
{ {
const event::id::buf event_id_buf m::state::id_buffer root;
{
!event_id? head(room_id) : string_view{}
};
const event::id event_id
{
this->event_id? this->event_id : event_id_buf
};
m::state::id_buffer state_root_buf;
const auto state_root const auto state_root
{ {
dbs::state_root(state_root_buf, room_id, event_id) this->root(root)
}; };
return m::state::get(std::nothrow, state_root, type, state_key, [&closure] return m::state::get(std::nothrow, state_root, type, state_key, [&closure]
@ -472,20 +452,10 @@ bool
ircd::m::room::has(const string_view &type) ircd::m::room::has(const string_view &type)
const const
{ {
const event::id::buf event_id_buf m::state::id_buffer root;
{
!event_id? head(room_id) : string_view{}
};
const event::id event_id
{
this->event_id? this->event_id : event_id_buf
};
m::state::id_buffer state_root_buf;
const auto state_root const auto state_root
{ {
dbs::state_root(state_root_buf, room_id, event_id) this->root(root)
}; };
bool ret{false}; bool ret{false};
@ -504,20 +474,10 @@ ircd::m::room::has(const string_view &type,
const string_view &state_key) const string_view &state_key)
const const
{ {
const event::id::buf event_id_buf m::state::id_buffer root;
{
!event_id? head(room_id) : string_view{}
};
const event::id event_id
{
this->event_id? this->event_id : event_id_buf
};
m::state::id_buffer state_root_buf;
const auto state_root const auto state_root
{ {
dbs::state_root(state_root_buf, room_id, event_id) this->root(root)
}; };
return m::state::get(std::nothrow, state_root, type, state_key, [] return m::state::get(std::nothrow, state_root, type, state_key, []
@ -526,25 +486,38 @@ const
}); });
} }
bool
ircd::m::room::test(const string_view &type,
const event::closure_bool &closure)
const
{
m::state::id_buffer root;
const auto state_root
{
this->root(root)
};
event::fetch event;
return !m::state::each(state_root, type, [&event, &closure]
(const json::array &key, const string_view &event_id)
{
if(!seek(event, unquote(event_id), std::nothrow))
return true;
// logical inversion for test vs. until protocol.
return !closure(event);
});
}
void void
ircd::m::room::for_each(const string_view &type, ircd::m::room::for_each(const string_view &type,
const event::closure &closure) const event::closure &closure)
const const
{ {
const event::id::buf event_id_buf m::state::id_buffer root;
{
!event_id? head(room_id) : string_view{}
};
const event::id event_id
{
this->event_id? this->event_id : event_id_buf
};
m::state::id_buffer state_root_buf;
const auto state_root const auto state_root
{ {
dbs::state_root(state_root_buf, room_id, event_id) this->root(root)
}; };
event::fetch event; event::fetch event;
@ -560,9 +533,8 @@ const
}); });
} }
bool ircd::string_view
ircd::m::room::test(const string_view &type, ircd::m::room::root(m::state::id_buffer &buf)
const event::closure_bool &closure)
const const
{ {
const event::id::buf event_id_buf const event::id::buf event_id_buf
@ -575,22 +547,7 @@ const
this->event_id? this->event_id : event_id_buf this->event_id? this->event_id : event_id_buf
}; };
m::state::id_buffer state_root_buf; return dbs::state_root(buf, room_id, event_id);
const auto state_root
{
dbs::state_root(state_root_buf, room_id, event_id)
};
event::fetch event;
return !m::state::each(state_root, type, [&event, &closure]
(const json::array &key, const string_view &event_id)
{
if(!seek(event, unquote(event_id), std::nothrow))
return true;
// logical inversion for test vs. until protocol.
return !closure(event);
});
} }
// //
@ -601,20 +558,10 @@ bool
ircd::m::room::members::until(const event::closure_bool &view) ircd::m::room::members::until(const event::closure_bool &view)
const const
{ {
const event::id::buf event_id_buf m::state::id_buffer root;
{
!room.event_id? head(room.room_id) : string_view{}
};
const event::id event_id
{
room.event_id? room.event_id : event_id_buf
};
m::state::id_buffer state_root_buf;
const auto state_root const auto state_root
{ {
dbs::state_root(state_root_buf, room.room_id, event_id) room.root(root)
}; };
event::fetch event; event::fetch event;