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

ircd:Ⓜ️ Rename room opts to copts for consistency.

Browse source
This commit is contained in:
Jason Volk 2018-05-20 20:14:12 -07:00
parent 52e4c8b0ff
commit 6e7d5aec3b
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,7 +113,7 @@ struct ircd::m::room
id room_id;
event::id event_id;
const vm::copts *opts {nullptr};
const vm::copts *copts {nullptr};
const event::fetch::opts *fopts {nullptr};
operator const id &() const;
@ -150,19 +150,19 @@ struct ircd::m::room
room(const id &room_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)
:room_id{room_id}
,event_id{event_id? event::id{event_id} : event::id{}}
,opts{opts}
,copts{copts}
,fopts{fopts}
{}
room(const id &room_id,
const vm::copts *const &opts = nullptr,
const vm::copts *const &copts = nullptr,
const event::fetch::opts *const &fopts = nullptr)
:room_id{room_id}
,opts{opts}
,copts{copts}
,fopts{fopts}
{}

6
ircd/m/m.cc
View file

@ -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
// commit opts the user supplied directly to this eval or with the room.
if(!copts)
copts = room.opts;
copts = room.copts;
if(!copts)
copts = &vm::default_copts;
@ -2652,7 +2652,9 @@ ircd::m::commit(const room &room,
{
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