zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

fix: sharkey wants trailing slash too

Browse source
This commit is contained in:
əlemi 2024-05-31 15:23:18 +02:00
parent c6628973ca
commit b0f47de278
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
upub/core/src/server/fetcher.rs
View file

@ -131,7 +131,7 @@ impl Fetcher for Context {
let document = Self::request( let document = Self::request(
Method::GET, id, None, Method::GET, id, None,
&format!("https://{}", self.domain()), self.pkey(), self.domain(), &format!("https://{}/", self.domain()), self.pkey(), self.domain(),
) )
.await? .await?
.json::<serde_json::Value>() .json::<serde_json::Value>()
@ -207,7 +207,8 @@ impl Fetcher for Context {
}; };
if let Ok(res) = Self::request( if let Ok(res) = Self::request(
Method::GET, &format!("https://{domain}"), None, &format!("https://{}", self.domain()), self.pkey(), self.domain(), Method::GET, &format!("https://{domain}"), None,
&format!("https://{}/", self.domain()), self.pkey(), self.domain(),
).await { ).await {
if let Ok(actor) = res.json::<serde_json::Value>().await { if let Ok(actor) = res.json::<serde_json::Value>().await {
if let Some(name) = actor.name() { if let Some(name) = actor.name() {
@ -243,7 +244,7 @@ impl Fetcher for Context {
if let Some(followers_url) = &document.followers().id() { if let Some(followers_url) = &document.followers().id() {
let req = Self::request( let req = Self::request(
Method::GET, followers_url, None, Method::GET, followers_url, None,
&format!("https://{}", self.domain()), self.pkey(), self.domain(), &format!("https://{}/", self.domain()), self.pkey(), self.domain(),
).await; ).await;
if let Ok(res) = req { if let Ok(res) = req {
if let Ok(user_followers) = res.json::<serde_json::Value>().await { if let Ok(user_followers) = res.json::<serde_json::Value>().await {
@ -255,9 +256,9 @@ impl Fetcher for Context {
} }
if let Some(following_url) = &document.following().id() { if let Some(following_url) = &document.following().id() {
let req = Self::request( let req = Self::request(
Method::GET, following_url, None, Method::GET, following_url, None,
&format!("https://{}", self.domain()), self.pkey(), self.domain(), &format!("https://{}/", self.domain()), self.pkey(), self.domain(),
).await; ).await;
if let Ok(res) = req { if let Ok(res) = req {
if let Ok(user_following) = res.json::<serde_json::Value>().await { if let Ok(user_following) = res.json::<serde_json::Value>().await {