mirror of
https://github.com/matrix-construct/construct
synced 2024-09-26 18:38:52 +02:00
ircd:Ⓜ️ Move MEMBERSHIP_MAX_SIZE into room.
ircd:Ⓜ️:room: Add a room version max size constant.
This commit is contained in:
parent
ddcce0ef2b
commit
b8adc69599
10 changed files with 14 additions and 16 deletions
|
@ -11,11 +11,6 @@
|
|||
#pragma once
|
||||
#define HAVE_IRCD_M_ROOM_MEMBERS_H
|
||||
|
||||
namespace ircd::m
|
||||
{
|
||||
constexpr size_t MEMBERSHIP_MAX_SIZE {16};
|
||||
}
|
||||
|
||||
/// Interface to the members of a room.
|
||||
///
|
||||
/// This interface focuses specifically on room membership and its routines
|
||||
|
|
|
@ -111,6 +111,9 @@ struct ircd::m::room
|
|||
using closure = std::function<void (const room &)>;
|
||||
using closure_bool = std::function<bool (const room &)>;
|
||||
|
||||
static constexpr const size_t &VERSION_MAX_SIZE {32};
|
||||
static constexpr const size_t &MEMBERSHIP_MAX_SIZE {16};
|
||||
|
||||
id room_id;
|
||||
event::id event_id;
|
||||
const vm::copts *copts {nullptr};
|
||||
|
|
|
@ -39,13 +39,13 @@ post__forget(client &client,
|
|||
string_view{room_id}
|
||||
};
|
||||
|
||||
char room_membuf[m::MEMBERSHIP_MAX_SIZE];
|
||||
char room_membuf[m::room::MEMBERSHIP_MAX_SIZE];
|
||||
const string_view &room_membership
|
||||
{
|
||||
room.membership(room_membuf, request.user_id)
|
||||
};
|
||||
|
||||
char user_membuf[m::MEMBERSHIP_MAX_SIZE];
|
||||
char user_membuf[m::room::MEMBERSHIP_MAX_SIZE];
|
||||
string_view user_membership;
|
||||
m::get(std::nothrow, event_idx, "content", [&user_membuf, &user_membership]
|
||||
(const json::object &content)
|
||||
|
|
|
@ -100,7 +100,7 @@ get__initialsync_local(client &client,
|
|||
m::depth(std::nothrow, room)
|
||||
};
|
||||
|
||||
char membership_buf[m::MEMBERSHIP_MAX_SIZE];
|
||||
char membership_buf[m::room::MEMBERSHIP_MAX_SIZE];
|
||||
json::stack::member
|
||||
{
|
||||
out, "membership", room.membership(membership_buf, request.user_id)
|
||||
|
|
|
@ -53,7 +53,7 @@ ircd::m::sync::rooms_linear(data &data)
|
|||
data.room, &room
|
||||
};
|
||||
|
||||
char membuf[MEMBERSHIP_MAX_SIZE];
|
||||
char membuf[room::MEMBERSHIP_MAX_SIZE];
|
||||
const string_view &membership
|
||||
{
|
||||
data.room?
|
||||
|
|
|
@ -88,7 +88,7 @@ ircd::m::sync::room_account_data_linear_events(data &data,
|
|||
lstrip(json::get<"type"_>(event), type.first)
|
||||
};
|
||||
|
||||
char membuf[MEMBERSHIP_MAX_SIZE];
|
||||
char membuf[room::MEMBERSHIP_MAX_SIZE];
|
||||
const auto membership
|
||||
{
|
||||
room.membership(membuf, data.user)
|
||||
|
@ -150,7 +150,7 @@ ircd::m::sync::room_account_data_linear_tags(data &data,
|
|||
lstrip(json::get<"type"_>(event), type.first)
|
||||
};
|
||||
|
||||
char membuf[MEMBERSHIP_MAX_SIZE];
|
||||
char membuf[room::MEMBERSHIP_MAX_SIZE];
|
||||
const auto membership
|
||||
{
|
||||
room.membership(membuf, data.user)
|
||||
|
|
|
@ -91,7 +91,7 @@ get__make_join(client &client,
|
|||
"You are not permitted to view the room at this event."
|
||||
};
|
||||
|
||||
char room_version_buf[32];
|
||||
char room_version_buf[m::room::VERSION_MAX_SIZE];
|
||||
const string_view &room_version
|
||||
{
|
||||
m::version(room_version_buf, room, std::nothrow)
|
||||
|
|
|
@ -78,7 +78,7 @@ get__make_leave(client &client,
|
|||
room_id
|
||||
};
|
||||
|
||||
char membuf[m::MEMBERSHIP_MAX_SIZE];
|
||||
char membuf[m::room::MEMBERSHIP_MAX_SIZE];
|
||||
const string_view membership
|
||||
{
|
||||
room.membership(membuf, user_id)
|
||||
|
|
|
@ -22,7 +22,7 @@ _visible_to_user(const m::event &event,
|
|||
const m::room &room,
|
||||
const string_view &history_visibility)
|
||||
{
|
||||
char membership_buf[m::MEMBERSHIP_MAX_SIZE];
|
||||
char membership_buf[m::room::MEMBERSHIP_MAX_SIZE];
|
||||
string_view membership
|
||||
{
|
||||
room.membership(membership_buf, user_id)
|
||||
|
|
|
@ -256,7 +256,7 @@ ircd::m::vm::inject(eval &eval,
|
|||
|
||||
// Attempt to resolve the room version at this point for interface
|
||||
// exposure at vm::eval::room_version.
|
||||
char room_version_buf[32];
|
||||
char room_version_buf[room::VERSION_MAX_SIZE];
|
||||
const scope_restore eval_room_version
|
||||
{
|
||||
eval.room_version,
|
||||
|
@ -679,7 +679,7 @@ try
|
|||
};
|
||||
|
||||
// Procure the room version.
|
||||
char room_version_buf[32];
|
||||
char room_version_buf[room::VERSION_MAX_SIZE];
|
||||
const scope_restore eval_room_version
|
||||
{
|
||||
eval.room_version,
|
||||
|
|
Loading…
Reference in a new issue