nutomic/lemmy
Archived
2
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Merge branch 'nodeinfo' of https://github.com/Nutomic/lemmy into Nutomic-nodeinfo

Browse source
This commit is contained in:
Dessalines 2019-11-20 18:31:24 -08:00
commit b09b1ad51b
10 changed files with 64 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,2 +1,4 @@
ansible/inventory ansible/inventory
ansible/passwords/ ansible/passwords/
build/
.idea/

9
docker/dev/deploy.sh vendored
View file

@ -6,10 +6,11 @@ new_tag="$1"
git tag $new_tag git tag $new_tag
# Setting the version on the front end # Setting the version on the front end
pushd ../../ui/ echo "export let version: string = '$(git describe --tags)';" > "ui/src/version.ts"
node set_version.js git add "ui/src/version.ts"
git add src/version.ts # Setting the version on the backend
popd echo "pub const VERSION: &'static str = \"$(git describe --tags)\";" > "server/src/version.rs"
git add "server/src/version.rs"
# Changing the docker-compose prod # Changing the docker-compose prod
sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml

1
server/Cargo.lock generated vendored
View file

@ -1833,6 +1833,7 @@ name = "serde_json"
version = "1.0.40" version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)",

2
server/Cargo.toml vendored
View file

@ -12,7 +12,7 @@ bcrypt = "0.5.0"
activitypub = "0.1.5" activitypub = "0.1.5"
chrono = { version = "0.4.7", features = ["serde"] } chrono = { version = "0.4.7", features = ["serde"] }
failure = "0.1.5" failure = "0.1.5"
serde_json = "1.0.40" serde_json = { version = "1.0.40", features = ["preserve_order"]}
serde = { version = "1.0.94", features = ["derive"] } serde = { version = "1.0.94", features = ["derive"] }
actix = "0.8.3" actix = "0.8.3"
actix-web = "1.0" actix-web = "1.0"

2
server/src/lib.rs
View file

@ -27,6 +27,8 @@ pub mod apub;
pub mod db; pub mod db;
pub mod schema; pub mod schema;
pub mod websocket; pub mod websocket;
pub mod nodeinfo;
pub mod version;
use chrono::{DateTime, NaiveDateTime, Utc}; use chrono::{DateTime, NaiveDateTime, Utc};
use dotenv::dotenv; use dotenv::dotenv;

4
server/src/main.rs
View file

@ -7,6 +7,7 @@ use actix_files::NamedFile;
use actix_web::*; use actix_web::*;
use actix_web_actors::ws; use actix_web_actors::ws;
use lemmy_server::db::establish_connection; use lemmy_server::db::establish_connection;
use lemmy_server::nodeinfo;
use lemmy_server::websocket::server::*; use lemmy_server::websocket::server::*;
use std::env; use std::env;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
@ -189,6 +190,7 @@ fn main() {
// Start chat server actor in separate thread // Start chat server actor in separate thread
let server = ChatServer::default().start(); let server = ChatServer::default().start();
// Create Http server with websocket support // Create Http server with websocket support
HttpServer::new(move || { HttpServer::new(move || {
App::new() App::new()
.data(server.clone()) .data(server.clone())
@ -197,6 +199,8 @@ fn main() {
.service(web::resource("/").to(index)) .service(web::resource("/").to(index))
// static resources // static resources
.service(actix_files::Files::new("/static", front_end_dir())) .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") .bind("0.0.0.0:8536")
.unwrap() .unwrap()

47
server/src/nodeinfo.rs Normal file
View file

@ -0,0 +1,47 @@
use crate::db::community_view::SiteView;
use crate::db::establish_connection;
use crate::version;
use crate::Settings;
use actix_web::HttpResponse;
use actix_web::body::Body;
use serde_json::json;
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),
}
});
return HttpResponse::Ok()
.content_type("application/json")
.body(json.to_string());
}
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());
}

1
server/src/version.rs Normal file
View file

@ -0,0 +1 @@
pub const VERSION: &'static str = "v0.4.0.2-7-g7c052f5";

11
ui/set_version.js vendored
View file

@ -1,11 +0,0 @@
const fs = require('fs');
exports.setVersion = function() {
let revision = require('child_process')
.execSync('git describe --tags --long')
.toString().trim();
let line = `export let version: string = "${revision}";`;
fs.writeFileSync("./src/version.ts", line);
}
this.setVersion()

2
ui/src/version.ts vendored
View file

@ -1 +1 @@
export let version: string = 'v0.4.0.2-0-g062d7f2'; export let version: string = 'v0.4.0.2-7-g7c052f5';