grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Put community last in webfinger response (fixes #2037) (#2047)

Browse source
This commit is contained in:
Nutomic 2022-01-21 21:00:17 +00:00 committed by GitHub
parent 16f98261f8
commit 2544341e47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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()