MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-30 12:48:54 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:vm: Rename some commit opts.

Browse source
This commit is contained in:
Jason Volk 2018-05-11 21:21:15 -07:00
parent 6379c215bd
commit 08c3058fbc
4 changed files with 33 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -216,19 +216,19 @@ struct ircd::m::vm::copts
:opts :opts
{ {
/// Hash and include hashes object. /// Hash and include hashes object.
bool hash {true}; bool add_hash {true};
/// Sign and include signatures object /// Sign and include signatures object
bool sign {true}; bool add_sig {true};
/// Generate and include event_id /// Generate and include event_id
bool event_id {true}; bool add_event_id {true};
/// Include our origin /// Include our origin
bool origin {true}; bool add_origin {true};
/// Include origin_server_ts /// Include origin_server_ts
bool origin_server_ts {true}; bool add_origin_server_ts {true};
/// Whether to log a debug message before commit /// Whether to log a debug message before commit
bool debuglog_precommit {false}; bool debuglog_precommit {false};

10
modules/client/rooms/receipt.cc
View file

@ -113,11 +113,11 @@ commit__m_receipt_m_read(const m::room::id &room_id,
}; };
m::vm::copts opts; m::vm::copts opts;
opts.hash = false; opts.add_hash = false;
opts.sign = false; opts.add_sig = false;
opts.event_id = false; opts.add_event_id = false;
opts.origin = true; opts.add_origin = true;
opts.origin_server_ts = false; opts.add_origin_server_ts = false;
opts.conforming = false; opts.conforming = false;
return m::vm::eval return m::vm::eval
{ {

10
modules/client/rooms/typing.cc
View file

@ -160,11 +160,11 @@ commit__m_typing(const m::typing &edu)
}; };
m::vm::copts opts; m::vm::copts opts;
opts.hash = false; opts.add_hash = false;
opts.sign = false; opts.add_sig = false;
opts.event_id = false; opts.add_event_id = false;
opts.origin = true; opts.add_origin = true;
opts.origin_server_ts = false; opts.add_origin_server_ts = false;
opts.conforming = false; opts.conforming = false;
return m::vm::eval return m::vm::eval
{ {

27
modules/vm.cc
View file

@ -312,7 +312,7 @@ ircd::m::vm::eval__commit(eval &eval,
const json::iov::add_if _origin const json::iov::add_if _origin
{ {
event, opts.origin, event, opts.add_origin,
{ {
"origin", my_host() "origin", my_host()
} }
@ -320,7 +320,7 @@ ircd::m::vm::eval__commit(eval &eval,
const json::iov::add_if _origin_server_ts const json::iov::add_if _origin_server_ts
{ {
event, opts.origin_server_ts, event, opts.add_origin_server_ts,
{ {
"origin_server_ts", ircd::time<milliseconds>() "origin_server_ts", ircd::time<milliseconds>()
} }
@ -334,7 +334,7 @@ ircd::m::vm::eval__commit(eval &eval,
// event_id // event_id
sha256::buf event_id_hash; sha256::buf event_id_hash;
if(opts.event_id) if(opts.add_event_id)
{ {
const json::iov::push _content const json::iov::push _content
{ {
@ -350,14 +350,17 @@ ircd::m::vm::eval__commit(eval &eval,
const string_view event_id const string_view event_id
{ {
opts.event_id? opts.add_event_id?
make_id(event, eval.event_id, event_id_hash): make_id(event, eval.event_id, event_id_hash):
string_view{} string_view{}
}; };
const json::iov::add_if _event_id const json::iov::add_if _event_id
{ {
event, opts.event_id, { "event_id", event_id } event, opts.add_event_id,
{
"event_id", event_id
}
}; };
// hashes // hashes
@ -365,14 +368,17 @@ ircd::m::vm::eval__commit(eval &eval,
char hashes_buf[128]; char hashes_buf[128];
const string_view hashes const string_view hashes
{ {
opts.hash? opts.add_hash?
m::event::hashes(hashes_buf, event, content): m::event::hashes(hashes_buf, event, content):
string_view{} string_view{}
}; };
const json::iov::add_if _hashes const json::iov::add_if _hashes
{ {
event, opts.hash, { "hashes", hashes } event, opts.add_hash,
{
"hashes", hashes
}
}; };
// sigs // sigs
@ -380,14 +386,17 @@ ircd::m::vm::eval__commit(eval &eval,
char sigs_buf[384]; char sigs_buf[384];
const string_view sigs const string_view sigs
{ {
opts.sign? opts.add_sig?
m::event::signatures(sigs_buf, event, contents): m::event::signatures(sigs_buf, event, contents):
string_view{} string_view{}
}; };
const json::iov::add_if _sigs const json::iov::add_if _sigs
{ {
event, opts.sign, { "signatures", sigs } event, opts.add_sig,
{
"signatures", sigs
}
}; };
const json::iov::push _content const json::iov::push _content