diff --git a/matrix/fed.cc b/matrix/fed.cc index 1e55b7270..d45b7aa27 100644 --- a/matrix/fed.cc +++ b/matrix/fed.cc @@ -1416,11 +1416,12 @@ ircd::m::fed::fetch_head(const id::room &room_id, { const unique_buffer buf { - 16_KiB + 32_KiB }; make_join::opts opts; opts.remote = remote; + opts.dynamic = false; make_join request { room_id, user_id, buf, std::move(opts) diff --git a/matrix/feds.cc b/matrix/feds.cc index b68c251a4..f67922371 100644 --- a/matrix/feds.cc +++ b/matrix/feds.cc @@ -225,7 +225,6 @@ ircd::m::feds::backfill(const opts &opts, (auto &request, const auto &origin) { m::fed::backfill::opts v1opts; - v1opts.dynamic = true; v1opts.event_id = opts.event_id; v1opts.limit = opts.argi[0]; v1opts.remote = string_view @@ -250,7 +249,6 @@ ircd::m::feds::state(const opts &opts, (auto &request, const auto &origin) { m::fed::state::opts v1opts; - v1opts.dynamic = true; v1opts.ids_only = opts.arg[0] == "ids"; v1opts.event_id = opts.event_id; v1opts.remote = string_view @@ -275,7 +273,6 @@ ircd::m::feds::event(const opts &opts, (auto &request, const auto &origin) { m::fed::event::opts v1opts; - v1opts.dynamic = true; v1opts.remote = string_view { strlcpy{request.origin, origin} @@ -298,7 +295,6 @@ ircd::m::feds::auth(const opts &opts, (auto &request, const auto &origin) { m::fed::event_auth::opts v1opts; - v1opts.dynamic = true; v1opts.remote = string_view { strlcpy{request.origin, origin} diff --git a/matrix/fetch.cc b/matrix/fetch.cc index 11400fdb7..74cc9f9ed 100644 --- a/matrix/fetch.cc +++ b/matrix/fetch.cc @@ -463,7 +463,6 @@ try { fed::event_auth::opts opts; opts.remote = remote; - opts.dynamic = true; request.future = std::make_unique ( request.opts.room_id, @@ -479,7 +478,6 @@ try { fed::event::opts opts; opts.remote = remote; - opts.dynamic = true; request.future = std::make_unique ( request.opts.event_id, @@ -494,7 +492,6 @@ try { fed::backfill::opts opts; opts.remote = remote; - opts.dynamic = true; opts.limit = request.opts.backfill_limit; opts.limit = opts.limit?: size_t(backfill_limit_default); opts.event_id = request.opts.event_id; diff --git a/matrix/keys.cc b/matrix/keys.cc index efb59eeee..bc716193e 100644 --- a/matrix/keys.cc +++ b/matrix/keys.cc @@ -220,10 +220,10 @@ try m::fed::key::opts opts; opts.remote = query_server; - opts.dynamic = true; + opts.dynamic = false; const unique_buffer buf { - 16_KiB + 32_KiB }; m::fed::key::query request @@ -332,7 +332,7 @@ try opts.dynamic = false; const unique_buffer buf { - 16_KiB + 32_KiB }; m::fed::key::keys request diff --git a/matrix/room_aliases.cc b/matrix/room_aliases.cc index aad6325b2..4db629881 100644 --- a/matrix/room_aliases.cc +++ b/matrix/room_aliases.cc @@ -368,7 +368,7 @@ try m::fed::query::opts opts; opts.remote = remote; - opts.dynamic = true; + opts.dynamic = false; m::fed::query::directory request { diff --git a/matrix/room_bootstrap.cc b/matrix/room_bootstrap.cc index 236e268b7..6ab8dd3ff 100644 --- a/matrix/room_bootstrap.cc +++ b/matrix/room_bootstrap.cc @@ -416,7 +416,6 @@ try }; m::fed::backfill::opts opts{host}; - opts.dynamic = true; opts.event_id = event_id; opts.limit = size_t(backfill_limit); m::fed::backfill request @@ -606,7 +605,6 @@ try }; m::fed::send_join::opts opts{host}; - opts.dynamic = true; m::fed::send_join send_join { room_id, event_id, event, buf, std::move(opts) diff --git a/matrix/rooms_summary.cc b/matrix/rooms_summary.cc index 22ec5c140..87a4eae16 100644 --- a/matrix/rooms_summary.cc +++ b/matrix/rooms_summary.cc @@ -74,7 +74,6 @@ ircd::m::rooms::summary::fetch::fetch(const string_view &origin, opts.limit = limit; opts.since = since; opts.include_all_networks = true; - opts.dynamic = true; const unique_buffer buf { // Buffer for headers and send content; received content is dynamic diff --git a/matrix/user_profile.cc b/matrix/user_profile.cc index 353d605b9..40595f261 100644 --- a/matrix/user_profile.cc +++ b/matrix/user_profile.cc @@ -128,12 +128,11 @@ ircd::m::user::profile::fetch(const m::user &user, { const unique_buffer buf { - 64_KiB + 16_KiB }; m::fed::query::opts opts; opts.remote = remote?: user.user_id.host(); - opts.dynamic = true; m::fed::query::profile federation_request { user.user_id, key, buf, std::move(opts) diff --git a/modules/client/keys/query.cc b/modules/client/keys/query.cc index 9119f8bdd..b871a0197 100644 --- a/modules/client/keys/query.cc +++ b/modules/client/keys/query.cc @@ -324,7 +324,6 @@ try { m::fed::user::keys::query::opts opts; opts.remote = remote; - opts.dynamic = true; const auto &buffer { buffers.emplace_back(16_KiB) diff --git a/modules/console.cc b/modules/console.cc index 55ea9e4ea..9c4481e5a 100644 --- a/modules/console.cc +++ b/modules/console.cc @@ -14052,7 +14052,6 @@ console_cmd__fed__key__query(opt &out, const string_view &line) }); m::fed::key::opts opts; - opts.dynamic = true; opts.remote = param.at("remote"); const unique_buffer buf{24_KiB}; @@ -14091,6 +14090,7 @@ console_cmd__fed__version(opt &out, const string_view &line) m::fed::version::opts opts; opts.remote = param.at("remote"); + opts.dynamic = false; const unique_mutable_buffer buf { 16_KiB