mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-22 16:06:30 +00:00
Use actual structs for nodeinfo
This commit is contained in:
parent
9e60e76a8c
commit
0a409bc9be
1 changed files with 63 additions and 24 deletions
|
@ -1,3 +1,4 @@
|
||||||
|
extern crate lazy_static;
|
||||||
use crate::db::site_view::SiteView;
|
use crate::db::site_view::SiteView;
|
||||||
use crate::version;
|
use crate::version;
|
||||||
use crate::Settings;
|
use crate::Settings;
|
||||||
|
@ -6,7 +7,7 @@ use actix_web::web;
|
||||||
use actix_web::HttpResponse;
|
use actix_web::HttpResponse;
|
||||||
use diesel::r2d2::{ConnectionManager, Pool};
|
use diesel::r2d2::{ConnectionManager, Pool};
|
||||||
use diesel::PgConnection;
|
use diesel::PgConnection;
|
||||||
use serde_json::json;
|
use serde::Serialize;
|
||||||
|
|
||||||
pub fn config(cfg: &mut web::ServiceConfig) {
|
pub fn config(cfg: &mut web::ServiceConfig) {
|
||||||
cfg
|
cfg
|
||||||
|
@ -15,14 +16,13 @@ pub fn config(cfg: &mut web::ServiceConfig) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn node_info_well_known() -> HttpResponse<Body> {
|
async fn node_info_well_known() -> HttpResponse<Body> {
|
||||||
let json = json!({
|
let node_info = NodeInfoWellKnown {
|
||||||
"links": {
|
links: NodeInfoWellKnownLinks {
|
||||||
"rel": "http://nodeinfo.diaspora.software/ns/schema/2.0",
|
rel: "http://nodeinfo.diaspora.software/ns/schema/2.0".to_string(),
|
||||||
"href": format!("https://{}/nodeinfo/2.0.json", Settings::get().hostname),
|
href: format!("https://{}/nodeinfo/2.0.json", Settings::get().hostname),
|
||||||
}
|
},
|
||||||
});
|
};
|
||||||
|
HttpResponse::Ok().json(node_info)
|
||||||
HttpResponse::Ok().json(json)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn node_info(
|
async fn node_info(
|
||||||
|
@ -35,29 +35,68 @@ async fn node_info(
|
||||||
Err(_) => return Err(format_err!("not_found")),
|
Err(_) => return Err(format_err!("not_found")),
|
||||||
};
|
};
|
||||||
let protocols = if Settings::get().federation_enabled {
|
let protocols = if Settings::get().federation_enabled {
|
||||||
vec!["activitypub"]
|
vec!["activitypub".to_string()]
|
||||||
} else {
|
} else {
|
||||||
vec![]
|
vec![]
|
||||||
};
|
};
|
||||||
Ok(json!({
|
Ok(NodeInfo {
|
||||||
"version": "2.0",
|
version: "2.0".to_string(),
|
||||||
"software": {
|
software: NodeInfoSoftware {
|
||||||
"name": "lemmy",
|
name: "lemmy".to_string(),
|
||||||
"version": version::VERSION,
|
version: version::VERSION.to_string(),
|
||||||
},
|
},
|
||||||
"protocols": protocols,
|
protocols,
|
||||||
"usage": {
|
usage: NodeInfoUsage {
|
||||||
"users": {
|
users: NodeInfoUsers {
|
||||||
"total": site_view.number_of_users
|
total: site_view.number_of_users,
|
||||||
},
|
},
|
||||||
"localPosts": site_view.number_of_posts,
|
local_posts: site_view.number_of_posts,
|
||||||
"localComments": site_view.number_of_comments,
|
local_comments: site_view.number_of_comments,
|
||||||
"openRegistrations": site_view.open_registration,
|
open_registrations: site_view.open_registration,
|
||||||
}
|
},
|
||||||
}))
|
})
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
.map(|json| HttpResponse::Ok().json(json))
|
.map(|json| HttpResponse::Ok().json(json))
|
||||||
.map_err(|_| HttpResponse::InternalServerError())?;
|
.map_err(|_| HttpResponse::InternalServerError())?;
|
||||||
Ok(res)
|
Ok(res)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct NodeInfoWellKnown {
|
||||||
|
links: NodeInfoWellKnownLinks,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct NodeInfoWellKnownLinks {
|
||||||
|
rel: String,
|
||||||
|
href: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct NodeInfo {
|
||||||
|
version: String,
|
||||||
|
software: NodeInfoSoftware,
|
||||||
|
protocols: Vec<String>,
|
||||||
|
usage: NodeInfoUsage,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct NodeInfoSoftware {
|
||||||
|
name: String,
|
||||||
|
version: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
struct NodeInfoUsage {
|
||||||
|
users: NodeInfoUsers,
|
||||||
|
local_posts: i64,
|
||||||
|
local_comments: i64,
|
||||||
|
open_registrations: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct NodeInfoUsers {
|
||||||
|
total: i64,
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue