diff options
| author | Felix Ableitner <me@nutomic.com> | 2019-11-15 18:10:56 +0100 |
|---|---|---|
| committer | Felix Ableitner <me@nutomic.com> | 2019-11-16 01:31:41 +0100 |
| commit | 2666ba6adfa93aa1592f50fe7b074b7bf007ea33 (patch) | |
| tree | 3e0e9cf221ef6c403a114dde52279c62a6d7478e | |
| parent | 10976bd6564727a6f59b4587e451cc4afd057a76 (diff) | |
rewrite
| -rw-r--r-- | server/src/main.rs | 5 | ||||
| -rw-r--r-- | server/src/nodeinfo.rs | 93 |
2 files changed, 44 insertions, 54 deletions
diff --git a/server/src/main.rs b/server/src/main.rs index f930f2ed..9afc12b1 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -7,10 +7,11 @@ use actix_files::NamedFile; use actix_web::*; use actix_web_actors::ws; use lemmy_server::db::establish_connection; +use lemmy_server::nodeinfo; use lemmy_server::websocket::server::*; use std::env; use std::time::{Duration, Instant}; -use lemmy_server::nodeinfo; +use actix_web::http::header::ContentType; embed_migrations!(); @@ -190,6 +191,7 @@ fn main() { // Start chat server actor in separate thread let server = ChatServer::default().start(); // Create Http server with websocket support + HttpServer::new(move || { App::new() .data(server.clone()) @@ -199,6 +201,7 @@ fn main() { // static resources .service(actix_files::Files::new("/static", front_end_dir())) .route("/nodeinfo/2.0.json", web::get().to(nodeinfo::node_info)) + .route("/.well-known/nodeinfo", web::get().to(nodeinfo::node_info_well_known)) }) .bind("0.0.0.0:8536") .unwrap() diff --git a/server/src/nodeinfo.rs b/server/src/nodeinfo.rs index a406e536..7799d5e0 100644 --- a/server/src/nodeinfo.rs +++ b/server/src/nodeinfo.rs @@ -1,60 +1,47 @@ -use actix_web::web::Json; -use serde::Serialize; -use crate::db::establish_connection; use crate::db::community_view::SiteView; -use actix_web::*; -use failure::Error; +use crate::db::establish_connection; use crate::version; +use crate::Settings; +use actix_web::HttpResponse; +use actix_web::body::Body; +use serde_json::json; -#[derive(Serialize)] -pub struct Software { - name: String, - version: String, -} - -#[derive(Serialize)] -#[serde(rename_all = "camelCase")] -pub struct Usage { - users: Users, - local_posts: i64, - local_comments: i64, -} +pub fn node_info_well_known() -> HttpResponse<Body> { + let json = json!({ + "links": { + "rel": "http://nodeinfo.diaspora.software/ns/schema/2.0", + "href": format!("https://{}/nodeinfo/2.0.json", Settings::get().hostname), + } + }); -#[derive(Serialize)] -pub struct Users { - total: i64, + return HttpResponse::Ok() + .content_type("application/json") + .body(json.to_string()); } -#[derive(Serialize)] -#[serde(rename_all = "camelCase")] -pub struct NodeInfo { - version: String, - software: Software, - protocols: [String; 0], - usage: Usage, - open_registrations: bool, +pub fn node_info() -> HttpResponse<Body> { + let conn = establish_connection(); + let site_view = match SiteView::read(&conn) { + Ok(site_view) => site_view, + Err(_e) => return HttpResponse::InternalServerError().finish(), + }; + let json = json!({ + "version": "2.0", + "software": { + "name": "lemmy", + "version": version::VERSION, + }, + "protocols": [], + "usage": { + "users": { + "total": site_view.number_of_users + }, + "local_posts": site_view.number_of_posts, + "local_comments": site_view.number_of_comments, + "open_registrations": true, + } + }); + return HttpResponse::Ok() + .content_type("application/json") + .body(json.to_string()); } - -pub fn node_info() -> Result<Json<NodeInfo>, Error> { - let conn = establish_connection(); - let site_view = match SiteView::read(&conn) { - Ok(site_view) => site_view, - Err(_e) => return Err(_e)?, - }; - let json = Json(NodeInfo { - version: String::from("2.0"), - software: Software { - name: String::from("lemmy"), - version: String::from(version::VERSION), - }, - protocols: [], // TODO: put 'activitypub' once that is implemented - usage: Usage { - users: Users { - total: site_view.number_of_users, - }, - local_posts: site_view.number_of_posts, - local_comments: site_view.number_of_comments, - }, - open_registrations: true }); - return Ok(json); -}
\ No newline at end of file |