Add ActivityPub endpoint for actors

src/routes/blogs.rs

@@ -1,6 +1,6 @@
 use rocket::request::Form;
 use rocket::response::Redirect;
-use rocket_contrib::Template;
+use rocket_contrib::{Json, Template};
 use std::collections::HashMap;
 
 use utils;
@@ -9,12 +9,19 @@ use models::blogs::*;
 use models::blog_authors::*;
 use models::instance::Instance;
 use models::user::User;
+use activity_pub::Actor;
 
-#[get("/~/<name>")]
+#[get("/~/<name>", rank = 2)]
 fn details(name: String) -> String {
     format!("Welcome on ~{}", name)
 }
 
+#[get("/~/<name>", format = "application/activity+json", rank = 1)]
+fn activity(name: String, conn: DbConn) -> Json {
+    let blog = Blog::find_by_actor_id(&*conn, name).unwrap();
+    Json(blog.as_activity_pub())
+}
+
 #[get("/blogs/new")]
 fn new(_user: User) -> Template {
     Template::render("blogs/new", HashMap::<String, i32>::new())

src/routes/user.rs

@@ -1,22 +1,29 @@
 use rocket::request::Form;
 use rocket::response::Redirect;
-use rocket_contrib::Template;
+use rocket_contrib::{Json, Template};
 use std::collections::HashMap;
 
 use db_conn::DbConn;
 use models::user::*;
 use models::instance::Instance;
+use activity_pub::Actor;
 
 #[get("/me")]
 fn me(user: User) -> String {
     format!("Logged in as {}", user.username.to_string())
 }
 
-#[get("/@/<name>")]
+#[get("/@/<name>", rank = 2)]
 fn details(name: String) -> String {
     format!("Hello, @{}", name)
 }
 
+#[get("/@/<name>", format = "application/activity+json", rank = 1)]
+fn activity(name: String, conn: DbConn) -> Json {
+    let user = User::find_by_name(&*conn, name).unwrap();
+    Json(user.as_activity_pub())
+}
+
 #[get("/users/new")]
 fn new() -> Template {
     Template::render("users/new", HashMap::<String, i32>::new())