GKaszewski/thoughts
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(federation): include header_url as AP banner (image) in actor JSON
Some checks failed
lint / lint (push) Failing after 7m3s
Details
test / unit (push) Successful in 16m12s
Details
test / integration (push) Failing after 17m24s
Details

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-05-24 02:18:41 +02:00
parent 9c99f7a7a8
commit 379f31e27d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/adapters/postgres-federation/src/lib.rs
View File

@@ -510,15 +510,17 @@ impl PostgresApUserRepository {
username: String, username: String,
bio: Option<String>, bio: Option<String>,
avatar_url: Option<String>, avatar_url: Option<String>,
header_url: Option<String>,
) -> ApUser { ) -> ApUser {
let profile_url = url::Url::parse(&format!("{}/users/{}", self.base_url, username)).ok(); let profile_url = url::Url::parse(&format!("{}/users/{}", self.base_url, username)).ok();
let avatar_url = avatar_url.and_then(|u| url::Url::parse(&u).ok()); let avatar_url = avatar_url.and_then(|u| url::Url::parse(&u).ok());
let banner_url = header_url.and_then(|u| url::Url::parse(&u).ok());
ApUser { ApUser {
id, id,
username, username,
bio, bio,
avatar_url, avatar_url,
banner_url: None, banner_url,
also_known_as: None, also_known_as: None,
profile_url, profile_url,
attachment: vec![], attachment: vec![],
@@ -535,15 +537,16 @@ impl ApUserRepository for PostgresApUserRepository {
username: String, username: String,
bio: Option<String>, bio: Option<String>,
avatar_url: Option<String>, avatar_url: Option<String>,
header_url: Option<String>,
} }
let row = sqlx::query_as::<_, Row>( let row = sqlx::query_as::<_, Row>(
"SELECT id,username,bio,avatar_url FROM users WHERE id=$1 AND local=true", "SELECT id,username,bio,avatar_url,header_url FROM users WHERE id=$1 AND local=true",
) )
.bind(id) .bind(id)
.fetch_optional(&self.pool) .fetch_optional(&self.pool)
.await .await
.map_err(|e| anyhow!(e))?; .map_err(|e| anyhow!(e))?;
Ok(row.map(|r| self.row_to_ap_user(r.id, r.username, r.bio, r.avatar_url))) Ok(row.map(|r| self.row_to_ap_user(r.id, r.username, r.bio, r.avatar_url, r.header_url)))
} }
async fn find_by_username(&self, username: &str) -> Result<Option<ApUser>> { async fn find_by_username(&self, username: &str) -> Result<Option<ApUser>> {
@@ -553,15 +556,16 @@ impl ApUserRepository for PostgresApUserRepository {
username: String, username: String,
bio: Option<String>, bio: Option<String>,
avatar_url: Option<String>, avatar_url: Option<String>,
header_url: Option<String>,
} }
let row = sqlx::query_as::<_, Row>( let row = sqlx::query_as::<_, Row>(
"SELECT id,username,bio,avatar_url FROM users WHERE username=$1 AND local=true", "SELECT id,username,bio,avatar_url,header_url FROM users WHERE username=$1 AND local=true",
) )
.bind(username) .bind(username)
.fetch_optional(&self.pool) .fetch_optional(&self.pool)
.await .await
.map_err(|e| anyhow!(e))?; .map_err(|e| anyhow!(e))?;
Ok(row.map(|r| self.row_to_ap_user(r.id, r.username, r.bio, r.avatar_url))) Ok(row.map(|r| self.row_to_ap_user(r.id, r.username, r.bio, r.avatar_url, r.header_url)))
} }
async fn count_users(&self) -> Result<usize> { async fn count_users(&self) -> Result<usize> {