mirror of
https://github.com/matrix-construct/construct
synced 2024-10-01 05:08:59 +02:00
ircd:Ⓜ️ Rename room opts to copts for consistency.
This commit is contained in:
parent
52e4c8b0ff
commit
6e7d5aec3b
2 changed files with 9 additions and 7 deletions
|
@ -113,7 +113,7 @@ struct ircd::m::room
|
||||||
|
|
||||||
id room_id;
|
id room_id;
|
||||||
event::id event_id;
|
event::id event_id;
|
||||||
const vm::copts *opts {nullptr};
|
const vm::copts *copts {nullptr};
|
||||||
const event::fetch::opts *fopts {nullptr};
|
const event::fetch::opts *fopts {nullptr};
|
||||||
|
|
||||||
operator const id &() const;
|
operator const id &() const;
|
||||||
|
@ -150,19 +150,19 @@ struct ircd::m::room
|
||||||
|
|
||||||
room(const id &room_id,
|
room(const id &room_id,
|
||||||
const string_view &event_id,
|
const string_view &event_id,
|
||||||
const vm::copts *const &opts = nullptr,
|
const vm::copts *const &copts = nullptr,
|
||||||
const event::fetch::opts *const &fopts = nullptr)
|
const event::fetch::opts *const &fopts = nullptr)
|
||||||
:room_id{room_id}
|
:room_id{room_id}
|
||||||
,event_id{event_id? event::id{event_id} : event::id{}}
|
,event_id{event_id? event::id{event_id} : event::id{}}
|
||||||
,opts{opts}
|
,copts{copts}
|
||||||
,fopts{fopts}
|
,fopts{fopts}
|
||||||
{}
|
{}
|
||||||
|
|
||||||
room(const id &room_id,
|
room(const id &room_id,
|
||||||
const vm::copts *const &opts = nullptr,
|
const vm::copts *const &copts = nullptr,
|
||||||
const event::fetch::opts *const &fopts = nullptr)
|
const event::fetch::opts *const &fopts = nullptr)
|
||||||
:room_id{room_id}
|
:room_id{room_id}
|
||||||
,opts{opts}
|
,copts{copts}
|
||||||
,fopts{fopts}
|
,fopts{fopts}
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
|
@ -483,7 +483,7 @@ ircd::m::vm::eval::operator()(const room &room,
|
||||||
// This eval entry point is only used for commits. We try to find the
|
// This eval entry point is only used for commits. We try to find the
|
||||||
// commit opts the user supplied directly to this eval or with the room.
|
// commit opts the user supplied directly to this eval or with the room.
|
||||||
if(!copts)
|
if(!copts)
|
||||||
copts = room.opts;
|
copts = room.copts;
|
||||||
|
|
||||||
if(!copts)
|
if(!copts)
|
||||||
copts = &vm::default_copts;
|
copts = &vm::default_copts;
|
||||||
|
@ -2652,7 +2652,9 @@ ircd::m::commit(const room &room,
|
||||||
{
|
{
|
||||||
vm::copts opts
|
vm::copts opts
|
||||||
{
|
{
|
||||||
room.opts? *room.opts : vm::default_copts
|
room.copts?
|
||||||
|
*room.copts:
|
||||||
|
vm::default_copts
|
||||||
};
|
};
|
||||||
|
|
||||||
// Some functionality on this server may create an event on behalf
|
// Some functionality on this server may create an event on behalf
|
||||||
|
|
Loading…
Reference in a new issue