Use activitystreams in the Inbox trait

src/models/blogs.rs

@@ -1,3 +1,4 @@
+use activitystreams_traits::{Actor, Object};
 use activitystreams_types::collection::OrderedCollection;
 use reqwest::Client;
 use reqwest::header::{Accept, qitem};
@@ -11,15 +12,16 @@ use openssl::pkey::{PKey, Private};
 use openssl::rsa::Rsa;
 use openssl::sign::Signer;
 
-use activity_pub::ActivityStream;
-use activity_pub::actor::{Actor, ActorType};
+use activity_pub::{ActivityStream, Id};
+use activity_pub::actor::{Actor as APActor, ActorType};
+use activity_pub::inbox::WithInbox;
 use activity_pub::sign;
 use activity_pub::webfinger::*;
 use models::instance::Instance;
 use schema::blogs;
 
 
-#[derive(Queryable, Identifiable, Serialize, Clone)]
+#[derive(Queryable, Identifiable, Serialize, Deserialize, Clone)]
 pub struct Blog {
     pub id: i32,
     pub actor_id: String,
@@ -173,7 +175,26 @@ impl Blog {
     }
 }
 
-impl Actor for Blog {
+impl Into<Id> for Blog {
+    fn into(self) -> Id {
+        Id::new(self.ap_url)
+    }
+}
+
+impl Object for Blog {}
+impl Actor for Blog {}
+
+impl WithInbox for Blog {
+    fn get_inbox_url(&self) -> String {
+        self.inbox_url.clone()
+    }
+
+    fn get_shared_inbox_url(&self) -> Option<String> {
+        None
+    }
+}
+
+impl APActor for Blog {
     fn get_box_prefix() -> &'static str {
         "~"
     }

src/models/users.rs

@@ -1,3 +1,4 @@
+use activitystreams_traits::{Actor, Object};
 use activitystreams_types::{
     activity::Create,
     collection::OrderedCollection
@@ -19,9 +20,9 @@ use serde_json;
 use url::Url;
 
 use BASE_URL;
-use activity_pub::{ap_url, ActivityStream};
-use activity_pub::actor::{ActorType, Actor};
-use activity_pub::inbox::Inbox;
+use activity_pub::{ap_url, ActivityStream, Id, IntoId};
+use activity_pub::actor::{ActorType, Actor as APActor};
+use activity_pub::inbox::{Inbox, WithInbox};
 use activity_pub::sign::{Signer, gen_keypair};
 use activity_pub::webfinger::{Webfinger, resolve};
 use db_conn::DbConn;
@@ -35,7 +36,7 @@ use schema::users;
 
 pub const AUTH_COOKIE: &'static str = "user_id";
 
-#[derive(Queryable, Identifiable, Serialize, Clone)]
+#[derive(Queryable, Identifiable, Serialize, Deserialize, Clone)]
 pub struct User {
     pub id: i32,
     pub username: String,
@@ -292,7 +293,7 @@ impl<'a, 'r> FromRequest<'a, 'r> for User {
     }
 }
 
-impl Actor for User {
+impl APActor for User {
     fn get_box_prefix() -> &'static str {
         "@"
     }
@@ -357,6 +358,25 @@ impl Actor for User {
     }
 }
 
+impl IntoId for User {
+    fn into(&self) -> Id {
+        Id::new(self.ap_url.clone())
+    }
+}
+
+impl Object for User {}
+impl Actor for User {}
+
+impl WithInbox for User {
+    fn get_inbox_url(&self) -> String {
+        self.inbox_url.clone()
+    }
+
+    fn get_shared_inbox_url(&self) -> Option<String> {
+       self.shared_inbox_url.clone()
+    }
+}
+
 impl Inbox for User {
     fn received(&self, conn: &PgConnection, act: serde_json::Value) {
         self.save(conn, act.clone()).unwrap();