Simplify the activity_pub::inbox::Notify trait + Fix notifications

Also fix a bug with the list of mentions that was returned

src/routes/comments.rs

@@ -4,7 +4,7 @@ use rocket::{
 };
 use rocket_contrib::Template;
 
-use activity_pub::{broadcast, IntoId, inbox::Notify};
+use activity_pub::{broadcast, inbox::Notify};
 use db_conn::DbConn;
 use models::{
     blogs::Blog,
@@ -53,12 +53,12 @@ fn create(blog_name: String, slug: String, query: CommentQuery, data: Form<NewCo
         in_response_to_id: query.responding_to,
         post_id: post.id,
         author_id: user.id,
-        ap_url: None,
+        ap_url: None, // TODO: set it
         sensitive: false,
         spoiler_text: "".to_string()
     });
+    comment.notify(&*conn);
 
-    Comment::notify(&*conn, comment.into_activity(&*conn), user.clone().into_id());
     broadcast(&*conn, &user, comment.create_activity(&*conn), user.get_followers(&*conn));
 
     Redirect::to(format!("/~/{}/{}/#comment-{}", blog_name, slug, comment.id))

src/routes/likes.rs

@@ -1,6 +1,6 @@
 use rocket::response::{Redirect, Flash};
 
-use activity_pub::{broadcast, IntoId, inbox::Notify};
+use activity_pub::{broadcast, inbox::Notify};
 use db_conn::DbConn;
 use models::{
     blogs::Blog,
@@ -23,8 +23,8 @@ fn create(blog: String, slug: String, user: User, conn: DbConn) -> Redirect {
             ap_url: "".to_string()
         });
         like.update_ap_url(&*conn);
+        like.notify(&*conn);
 
-        likes::Like::notify(&*conn, like.into_activity(&*conn), user.clone().into_id());
         broadcast(&*conn, &user, like.into_activity(&*conn), user.get_followers(&*conn));
     } else {
         let like = likes::Like::find_by_user_on_post(&*conn, user.id, post.id).unwrap();

src/routes/reshares.rs

@@ -1,6 +1,6 @@
 use rocket::response::{Redirect, Flash};
 
-use activity_pub::{broadcast, IntoId, inbox::Notify};
+use activity_pub::{broadcast, inbox::Notify};
 use db_conn::DbConn;
 use models::{
     blogs::Blog,
@@ -23,8 +23,8 @@ fn create(blog: String, slug: String, user: User, conn: DbConn) -> Redirect {
             ap_url: "".to_string()
         });
         reshare.update_ap_url(&*conn);
+        reshare.notify(&*conn);
 
-        Reshare::notify(&*conn, reshare.into_activity(&*conn), user.clone().into_id());
         broadcast(&*conn, &user, reshare.into_activity(&*conn), user.get_followers(&*conn));
     } else {
         let reshare = Reshare::find_by_user_on_post(&*conn, user.id, post.id).unwrap();

src/routes/user.rs

@@ -71,16 +71,17 @@ fn dashboard_auth() -> Flash<Redirect> {
 #[get("/@/<name>/follow")]
 fn follow(name: String, conn: DbConn, user: User) -> Redirect {
     let target = User::find_by_fqn(&*conn, name.clone()).unwrap();
-    follows::Follow::insert(&*conn, follows::NewFollow {
+    let f = follows::Follow::insert(&*conn, follows::NewFollow {
         follower_id: user.id,
         following_id: target.id
     });
+    f.notify(&*conn);
+
     let mut act = Follow::default();
     act.follow_props.set_actor_link::<Id>(user.clone().into_id()).unwrap();
     act.follow_props.set_object_object(user.into_activity(&*conn)).unwrap();
     act.object_props.set_id_string(format!("{}/follow/{}", user.ap_url, target.ap_url)).unwrap();
 
-    follows::Follow::notify(&*conn, act.clone(), user.clone().into_id());
     broadcast(&*conn, &user, act, vec![target]);
     Redirect::to(uri!(details: name = name))
 }