Delete likes

src/routes/blogs.rs

@@ -5,7 +5,6 @@ use serde_json;
 
 use activity_pub::ActivityPub;
 use activity_pub::actor::Actor;
-use activity_pub::object::Object;
 use activity_pub::outbox::Outbox;
 use db_conn::DbConn;
 use models::blog_authors::*;

src/routes/instance.rs

@@ -4,7 +4,6 @@ use rocket_contrib::Template;
 use serde_json;
 
 use BASE_URL;
-use activity_pub::object::Object;
 use db_conn::DbConn;
 use models::posts::Post;
 use models::users::User;

src/routes/likes.rs

@@ -10,12 +10,19 @@ use models::users::User;
 #[get("/~/<blog>/<slug>/like")]
 fn create(blog: String, slug: String, user: User, conn: DbConn) -> Redirect {
     let post = Post::find_by_slug(&*conn, slug.clone()).unwrap();
-    likes::Like::insert(&*conn, likes::NewLike {
-        post_id: post.id,
-        user_id: user.id
-    });
-    let act = Like::new(&user, &post, &*conn);
-    broadcast(&*conn, &user, act, user.get_followers(&*conn));
 
+    if !user.has_liked(&*conn, &post) {
+        likes::Like::insert(&*conn, likes::NewLike {
+                post_id: post.id,
+                user_id: user.id
+        });
+        let act = Like::new(&user, &post, &*conn);
+        broadcast(&*conn, &user, act, user.get_followers(&*conn));
+    } else {
+        let like = likes::Like::for_user_on_post(&*conn, &user, &post).unwrap();
+        like.delete(&*conn);
+        // TODO: send Delete to AP
+    }
+    
     Redirect::to(format!("/~/{}/{}/", blog, slug).as_ref())
 }

src/routes/posts.rs

@@ -32,6 +32,7 @@ fn details(blog: String, slug: String, conn: DbConn, user: Option<User>) -> Temp
             })
         }).collect::<Vec<serde_json::Value>>(),
         "n_likes": post.get_likes(&*conn).len(),
+        "has_liked": user.clone().map(|u| u.has_liked(&*conn, &post)).unwrap_or(false),
         "account": user
     }))
 }

src/routes/user.rs

@@ -6,7 +6,6 @@ use serde_json;
 use activity_pub::{activity, activity_pub, ActivityPub, context};
 use activity_pub::actor::Actor;
 use activity_pub::inbox::Inbox;
-use activity_pub::object::Object;
 use activity_pub::outbox::Outbox;
 use db_conn::DbConn;
 use models::follows::*;