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

modules/media/preview_url: Quash TODO for rfc3986 uri parsing.

Browse source
This commit is contained in:
Jason Volk 2020-03-24 11:59:32 -07:00
parent 180963ca22
commit 70315e2459
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
modules/media/preview_url.cc
View file

@ -92,26 +92,21 @@ request_url(const string_view &urle)
url::decode(buf, urle)
};
const auto &host
const rfc3986::uri uri
{
between(url, "://", "/") //TODO: grammar / rfc3986.h
url
};
const string_view &service
const net::hostport remote
{
split(url, "://").first
uri
};
const string_view &path
{
end(host), end(url)
};
if(empty(host) || empty(path))
if(empty(host(remote)) || empty(uri.path))
throw m::error
{
http::BAD_REQUEST, "M_BAD_URL",
"Something was wrong with the supplied URL."
"Required elements are missing from the supplied URL."
};
window_buffer wb
@ -121,7 +116,7 @@ request_url(const string_view &urle)
http::request
{
wb, host, "GET", path, 0, {},
wb, host(remote), "GET", uri.path, 0, {},
{
{ "User-Agent", info::user_agent },
}
@ -137,11 +132,6 @@ request_url(const string_view &urle)
buf + size(url) + size(out_head)
};
const net::hostport remote
{
host, service
};
server::request::opts sopts;
sopts.http_exceptions = false;
server::request request