alemi/upub
alemi/upub
1
0
Fork 1
Code Issues 4 Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: base app ap id without trailing /

Browse source
This commit is contained in:
əlemi 2024-07-15 01:14:31 +02:00
parent 35d19fbde0
commit 83b3db8e75
Signed by: alemi
GPG key ID: A4895B84D311642C
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
upub/core/src/traits/fetch.rs
View file

@ -164,7 +164,7 @@ impl Fetcher for crate::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(), self.base(), self.pkey(), self.domain(),
) )
.await? .await?
.json::<serde_json::Value>() .json::<serde_json::Value>()
@ -241,7 +241,7 @@ impl Fetcher for crate::Context {
if let Ok(res) = Self::request( if let Ok(res) = Self::request(
Method::GET, &format!("https://{domain}"), None, Method::GET, &format!("https://{domain}"), None,
&format!("https://{}/", self.domain()), self.pkey(), self.domain(), self.base(), 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 Ok(name) = actor.name() { if let Ok(name) = actor.name() {
@ -280,7 +280,7 @@ impl Fetcher for crate::Context {
if let Ok(followers_url) = document.followers().id() { if let Ok(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(), self.base(), 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 {
@ -294,7 +294,7 @@ impl Fetcher for crate::Context {
if let Ok(following_url) = document.following().id() { if let Ok(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(), self.base(), 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 {

2
upub/routes/src/activitypub/application.rs
View file

@ -33,7 +33,7 @@ pub async fn view(
.set_url(apb::Node::link(upub::url!(ctx, "/"))) .set_url(apb::Node::link(upub::url!(ctx, "/")))
.set_public_key(apb::Node::object( .set_public_key(apb::Node::object(
apb::new() apb::new()
.set_id(Some(&upub::url!(ctx, "/#main-key"))) .set_id(Some(&upub::url!(ctx, "#main-key")))
.set_owner(Some(&upub::url!(ctx, ""))) .set_owner(Some(&upub::url!(ctx, "")))
.set_public_key_pem(&ctx.actor().public_key) .set_public_key_pem(&ctx.actor().public_key)
)) ))