gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Put community last in webfinger response (fixes #2037)

webfinger-order
Felix Ableitner 2022-01-19 17:47:39 +01:00
parent f23fed70bc
commit cb0dbd8e98
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/routes/src/webfinger.rs
View File

@ -43,21 +43,24 @@ async fn get_webfinger_response(
.to_string();
let name_ = name.clone();
let community_id: Option<Url> = blocking(context.pool(), move |conn| {
Community::read_from_name(conn, &name_)
})
.await?
.ok()
.map(|c| c.actor_id.into());
let user_id: Option<Url> = blocking(context.pool(), move |conn| {
Person::find_by_name(conn, &name)
Person::find_by_name(conn, &name_)
})
.await?
.ok()
.map(|c| c.actor_id.into());
let community_id: Option<Url> = blocking(context.pool(), move |conn| {
Community::read_from_name(conn, &name)
})
.await?
.ok()
.map(|c| c.actor_id.into());
// Mastodon seems to prioritize the last webfinger item in case of duplicates. Put
// community last so that it gets prioritized. For Lemmy the order doesnt matter.
let links = vec![
webfinger_link_for_actor(community_id),
webfinger_link_for_actor(user_id),
webfinger_link_for_actor(community_id),
]
.into_iter()
.flatten()