From 49dc7e77f2e773057d74afc091913080ff910369 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Sat, 7 Mar 2020 19:20:06 -0800
Subject: [PATCH] ircd::m::media: Use abstract federation request for media
 downloads.

---
 include/ircd/m/media.h |  6 +++---
 modules/media/media.cc | 49 +++++++++++++-----------------------------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/include/ircd/m/media.h b/include/ircd/m/media.h
index 601cf3436..fd22ddcf1 100644
--- a/include/ircd/m/media.h
+++ b/include/ircd/m/media.h
@@ -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);
 };
 
diff --git a/modules/media/media.cc b/modules/media/media.cc
index f15905d78..5f8d7428a 100644
--- a/modules/media/media.cc
+++ b/modules/media/media.cc
@@ -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
 		};