Compare commits
No commits in common. "3cfc86a8fd60892da6dda03ac6b09bfa3f8c34ca" and "2aeed9773fe2737528366447c5db30883ed103b0" have entirely different histories.
3cfc86a8fd
...
2aeed9773f
2 changed files with 10 additions and 32 deletions
|
@ -82,12 +82,8 @@ impl HostMetaDocument {
|
|||
let mime_type = extract_mime_from_content_type(content_type)
|
||||
.ok_or(ContentTypeInvalid)?;
|
||||
|
||||
log::trace!("Ensuring MIME type is acceptable for JRD parsing...");
|
||||
if mime_type == "application/jrd+json" {
|
||||
log::warn!("MIME type `{mime_type}` would not be acceptable for JRD parsing, but is temporarily allowed anyways due to widespread use.")
|
||||
}
|
||||
else if mime_type != "application/json" {
|
||||
log::error!("MIME type `{mime_type}` is not acceptable for JRD parsing.");
|
||||
log::trace!("Ensuring MIME type of `{mime_type}` is acceptable for JRD parsing...");
|
||||
if mime_type != "application/json" {
|
||||
return Err(ContentTypeInvalid)
|
||||
}
|
||||
|
||||
|
|
|
@ -1,20 +1,8 @@
|
|||
const CARGO_PKG_NAME: &str = env!("CARGO_PKG_NAME");
|
||||
const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
|
||||
const CARGO_PKG_REPOSITORY: &str = env!("CARGO_PKG_REPOSITORY");
|
||||
|
||||
|
||||
fn init_log() {
|
||||
let mut builder = pretty_env_logger::formatted_builder();
|
||||
builder.filter_level(log::LevelFilter::max());
|
||||
builder.is_test(true);
|
||||
|
||||
if builder.try_init().is_ok() {
|
||||
log::debug!("Initialized logging!");
|
||||
}
|
||||
}
|
||||
|
||||
fn make_client() -> reqwest::Client {
|
||||
let user_agent = format!("{CARGO_PKG_NAME}/{CARGO_PKG_VERSION} ({CARGO_PKG_REPOSITORY})");
|
||||
let crate_name = env!("CARGO_PKG_NAME");
|
||||
let crate_version = env!("CARGO_PKG_VERSION");
|
||||
let crate_repository = env!("CARGO_PKG_REPOSITORY");
|
||||
let user_agent = format!("{crate_name}/{crate_version} ({crate_repository})");
|
||||
|
||||
reqwest::Client::builder()
|
||||
.user_agent(user_agent)
|
||||
|
@ -34,7 +22,6 @@ macro_rules! test {
|
|||
#[tokio::test]
|
||||
$(#[$tag])*
|
||||
async fn test_hostmeta() {
|
||||
init_log();
|
||||
let client = make_client();
|
||||
|
||||
let base: reqwest::Url = $url.parse()
|
||||
|
@ -44,13 +31,12 @@ macro_rules! test {
|
|||
.await
|
||||
.expect("host-meta discovery to succeed");
|
||||
|
||||
log::info!("Parsed host-meta document: {doc:#?}");
|
||||
println!("{doc:#?}");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
$(#[$tag])*
|
||||
async fn test_nodeinfo() {
|
||||
init_log();
|
||||
let client = make_client();
|
||||
|
||||
let base: reqwest::Url = $url.parse()
|
||||
|
@ -58,9 +44,9 @@ macro_rules! test {
|
|||
|
||||
let doc = HostMetaDocument::discover_nodeinfo(&client, base)
|
||||
.await
|
||||
.expect("nodeinfo discovery to succeed");
|
||||
.expect("host-meta discovery to succeed");
|
||||
|
||||
log::info!("Parsed nodeinfo document: {doc:#?}");
|
||||
println!("{doc:#?}");
|
||||
}
|
||||
}
|
||||
};
|
||||
|
@ -76,10 +62,6 @@ test!(iceshrimpnet, "https://ice.frieren.quest");
|
|||
|
||||
test!(gotosocial, "https://alpha.polymaths.social");
|
||||
|
||||
test!(bridgyfed, "https://fed.brid.gy");
|
||||
test!(bridgyfed, "https://fed.brid.gy", ignore = "Returns application/jrd+json");
|
||||
|
||||
test!(threads, "https://threads.net", ignore = "Not implemented on their end");
|
||||
|
||||
test!(snac, "https://ngoa.giao.loan", ignore = "Does not support host-meta");
|
||||
|
||||
test!(hollo, "https://hollo.social", ignore = "Does not support host-meta");
|
||||
|
|
Loading…
Reference in a new issue