Skip to content

Commit

Permalink
Include type information with webfinger responses (fixes #2037) (#2746)
Browse files Browse the repository at this point in the history
So that it is easier to parse for other software
  • Loading branch information
Nutomic authored and dessalines committed Feb 22, 2023
1 parent 382e588 commit 0db3fc0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
14 changes: 11 additions & 3 deletions crates/routes/src/webfinger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use lemmy_db_schema::{
};
use lemmy_utils::{error::LemmyError, location_info, WebfingerLink, WebfingerResponse};
use serde::Deserialize;
use std::collections::HashMap;
use url::Url;

#[derive(Deserialize)]
Expand Down Expand Up @@ -53,8 +54,8 @@ async fn get_webfinger_response(
// 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(user_id),
webfinger_link_for_actor(community_id),
webfinger_link_for_actor(user_id, "Person"),
webfinger_link_for_actor(community_id, "Group"),
]
.into_iter()
.flatten()
Expand All @@ -68,18 +69,25 @@ async fn get_webfinger_response(
Ok(HttpResponse::Ok().json(json))
}

fn webfinger_link_for_actor(url: Option<Url>) -> Vec<WebfingerLink> {
fn webfinger_link_for_actor(url: Option<Url>, kind: &str) -> Vec<WebfingerLink> {
if let Some(url) = url {
let mut properties = HashMap::new();
properties.insert(
"https://www.w3.org/ns/activitystreams#type".to_string(),
kind.to_string(),
);
vec![
WebfingerLink {
rel: Some("http://webfinger.net/rel/profile-page".to_string()),
kind: Some("text/html".to_string()),
href: Some(url.clone()),
properties: Default::default(),
},
WebfingerLink {
rel: Some("self".to_string()),
kind: Some("application/activity+json".to_string()),
href: Some(url),
properties,
},
]
} else {
Expand Down
3 changes: 2 additions & 1 deletion crates/utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub mod utils;
pub mod version;

use serde::{Deserialize, Serialize};
use std::{fmt, time::Duration};
use std::{collections::HashMap, fmt, time::Duration};
use url::Url;

pub type ConnectionId = usize;
Expand All @@ -39,6 +39,7 @@ pub struct WebfingerLink {
#[serde(rename = "type")]
pub kind: Option<String>,
pub href: Option<Url>,
pub properties: HashMap<String, String>,
}

#[derive(Serialize, Deserialize, Debug)]
Expand Down

0 comments on commit 0db3fc0

Please sign in to comment.