diff options
Diffstat (limited to 'server/src/main.rs')
-rw-r--r-- | server/src/main.rs | 55 |
1 files changed, 2 insertions, 53 deletions
diff --git a/server/src/main.rs b/server/src/main.rs index 392b0bbb..f930f2ed 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -5,13 +5,12 @@ extern crate diesel_migrations; use actix::prelude::*; use actix_files::NamedFile; use actix_web::*; -use actix_web::web::Json; use actix_web_actors::ws; use lemmy_server::db::establish_connection; use lemmy_server::websocket::server::*; use std::env; use std::time::{Duration, Instant}; -use serde::Serialize; +use lemmy_server::nodeinfo; embed_migrations!(); @@ -199,7 +198,7 @@ fn main() { .service(web::resource("/").to(index)) // static resources .service(actix_files::Files::new("/static", front_end_dir())) - .route("/nodeinfo/2.0.json", web::get().to(node_info)) + .route("/nodeinfo/2.0.json", web::get().to(nodeinfo::node_info)) }) .bind("0.0.0.0:8536") .unwrap() @@ -209,56 +208,6 @@ fn main() { let _ = sys.run(); } -#[derive(Serialize)] -struct Software { - name: String, - version: String, -} - -#[derive(Serialize)] -struct Usage { - users: Users, - localPosts: i32, - localComments: i32, -} - -#[derive(Serialize)] -struct Users { - total: i32, -} - -#[derive(Serialize)] -struct NodeInfo { - version: String, - software: Software, - protocols: [String; 0], - usage: Usage, - openRegistrations: bool, -} - -fn node_info() -> Result<Json<NodeInfo>> { - // TODO: get info from database - // TODO: need to get lemmy version from somewhere else - let conn = establish_connection(); - let userCount = User_::count(conn) - let json = Json(NodeInfo { - version: "2.0".to_string(), - software: Software { - name: "lemmy".to_string(), - version: "0.1".to_string() - }, - protocols: [], // TODO: activitypub once that is implemented - usage: Usage { - users: Users { - total: 123, - }, - localPosts: 123, - localComments: 123, - }, - openRegistrations: true }); - return Ok(json); -} - fn index() -> Result<NamedFile, actix_web::error::Error> { Ok(NamedFile::open(front_end_dir() + "/index.html")?) } |