MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-26 05:48:20 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:media: Use abstract federation request for media downloads.

Browse source
This commit is contained in:
Jason Volk 2020-03-07 19:20:06 -08:00
parent 63aa71ce58
commit 49dc7e77f2
2 changed files with 18 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/ircd/m/media.h
View file

@ -29,18 +29,18 @@ namespace ircd::m::media::file
room::id::buf
download(const mxc &,
const m::user::id &,
const net::hostport & = {});
const string_view & = {});
std::pair<http::response::head, unique_buffer<mutable_buffer>>
download(const mutable_buffer &head_buf,
const mxc &mxc,
net::hostport remote = {},
string_view remote = {},
server::request::opts *const opts = nullptr);
m::room
download(const mxc &mxc,
const m::user::id &user_id,
const net::hostport &remote,
const string_view &remote,
const m::room::id &room_id);
};

49
modules/media/media.cc
View file

@ -214,7 +214,7 @@ ircd::m::room::id::buf
IRCD_MODULE_EXPORT
ircd::m::media::file::download(const mxc &mxc,
const m::user::id &user_id,
const net::hostport &remote)
const string_view &remote)
{
const m::room::id::buf room_id
{
@ -236,7 +236,7 @@ ircd::m::room
IRCD_MODULE_EXPORT
ircd::m::media::file::download(const mxc &mxc,
const m::user::id &user_id,
const net::hostport &remote,
const string_view &remote,
const m::room::id &room_id)
try
{
@ -348,46 +348,27 @@ std::pair
IRCD_MODULE_EXPORT
ircd::m::media::file::download(const mutable_buffer &head_buf,
const mxc &mxc,
net::hostport remote,
string_view remote,
server::request::opts *const opts)
{
thread_local char rembuf[256];
assert(remote || !my_host(mxc.server));
assert(!remote || !my_host(string(rembuf, remote)));
if(!remote)
remote = mxc.server;
window_buffer wb{head_buf};
thread_local char uri[4_KiB];
http::request
{
wb, host(remote), "GET", fmt::sprintf
{
uri, "/_matrix/media/r0/download/%s/%s",
mxc.server,
mxc.mediaid,
}
};
assert(remote || !my_host(mxc.server));
assert(!remote || !my_host(remote));
const const_buffer out_head
fed::request::opts fedopts;
fedopts.remote = remote?: mxc.server;
json::get<"method"_>(fedopts.request) = "GET";
json::get<"uri"_>(fedopts.request) = fmt::sprintf
{
wb.completed()
};
// Remaining space in buffer is used for received head
const mutable_buffer in_head
{
data(head_buf) + size(out_head), size(head_buf) - size(out_head)
uri, "/_matrix/media/r0/download/%s/%s",
mxc.server,
mxc.mediaid,
};
//TODO: --- This should use the progress callback to build blocks
server::request remote_request
fed::request remote_request
{
fed::matrix_service(remote),
{ out_head },
{ in_head, {} },
opts
head_buf, std::move(fedopts)
};
if(!remote_request.wait(seconds(download_timeout), std::nothrow))
@ -395,7 +376,7 @@ ircd::m::media::file::download(const mutable_buffer &head_buf,
{
http::GATEWAY_TIMEOUT, "M_MEDIA_DOWNLOAD_TIMEOUT",
"Server '%s' did not respond with media for '%s/%s' in time",
string(rembuf, remote),
remote,
mxc.server,
mxc.mediaid
};