Drop activity_pub::activitypub and activity_pub::ActivityPub and only use the ActivityStream responder

This commit is contained in:
Bat
2018-06-21 18:09:18 +01:00
parent 6df4b70318
commit b2e8d54161
6 changed files with 29 additions and 57 deletions
+4 -4
View File
@@ -1,4 +1,4 @@
use activitypub::collection::OrderedCollection;
use activitypub::{actor::Group, collection::OrderedCollection};
use rocket::{
request::Form,
response::{Redirect, Flash}
@@ -6,7 +6,7 @@ use rocket::{
use rocket_contrib::Template;
use serde_json;
use activity_pub::{ActivityStream, ActivityPub, actor::Actor};
use activity_pub::ActivityStream;
use db_conn::DbConn;
use models::{
blog_authors::*,
@@ -32,9 +32,9 @@ fn details(name: String, conn: DbConn, user: Option<User>) -> Template {
}
#[get("/~/<name>", format = "application/activity+json", rank = 1)]
fn activity_details(name: String, conn: DbConn) -> ActivityPub {
fn activity_details(name: String, conn: DbConn) -> ActivityStream<Group> {
let blog = Blog::find_local(&*conn, name).unwrap();
blog.as_activity_pub(&*conn)
ActivityStream::new(blog.into_activity(&*conn))
}
#[get("/blogs/new")]