Make it possible to unfollow someone

I was sure it was already implemented, but it looks like it wasn't
This commit is contained in:
Bat 2018-09-04 11:37:58 +01:00
parent e12d3fdc2f
commit dcebc4653a
5 changed files with 67 additions and 18 deletions

View File

@ -0,0 +1,2 @@
-- This file should undo anything in `up.sql`
ALTER TABLE follows DROP COLUMN ap_url;

View File

@ -0,0 +1,2 @@
-- Your SQL goes here
ALTER TABLE follows ADD COLUMN ap_url TEXT NOT NULL DEFAULT '';

View File

@ -1,7 +1,7 @@
use activitypub::{Actor, activity::{Accept, Follow as FollowAct}, actor::Person}; use activitypub::{Actor, activity::{Accept, Follow as FollowAct, Undo}, actor::Person};
use diesel::{self, PgConnection, ExpressionMethods, QueryDsl, RunQueryDsl}; use diesel::{self, PgConnection, ExpressionMethods, QueryDsl, RunQueryDsl};
use plume_common::activity_pub::{broadcast, Id, IntoId, inbox::{FromActivity, Notify, WithInbox}, sign::Signer}; use plume_common::activity_pub::{broadcast, Id, IntoId, inbox::{FromActivity, Notify, WithInbox, Deletable}, sign::Signer};
use blogs::Blog; use blogs::Blog;
use notifications::*; use notifications::*;
use users::User; use users::User;
@ -12,19 +12,42 @@ use schema::follows;
pub struct Follow { pub struct Follow {
pub id: i32, pub id: i32,
pub follower_id: i32, pub follower_id: i32,
pub following_id: i32 pub following_id: i32,
pub ap_url: String,
} }
#[derive(Insertable)] #[derive(Insertable)]
#[table_name = "follows"] #[table_name = "follows"]
pub struct NewFollow { pub struct NewFollow {
pub follower_id: i32, pub follower_id: i32,
pub following_id: i32 pub following_id: i32,
pub ap_url: String,
} }
impl Follow { impl Follow {
insert!(follows, NewFollow); insert!(follows, NewFollow);
get!(follows); get!(follows);
find_by!(follows, find_by_ap_url, ap_url as String);
pub fn find(conn: &PgConnection, from: i32, to: i32) -> Option<Follow> {
follows::table.filter(follows::follower_id.eq(from))
.filter(follows::following_id.eq(to))
.get_result(conn)
.ok()
}
pub fn into_activity(&self, conn: &PgConnection) -> FollowAct {
let user = User::get(conn, self.follower_id).unwrap();
let target = User::get(conn, self.following_id).unwrap();
let mut act = FollowAct::default();
act.follow_props.set_actor_link::<Id>(user.clone().into_id()).expect("Follow::into_activity: actor error");
act.follow_props.set_object_object(user.into_activity(&*conn)).unwrap();
act.object_props.set_id_string(self.ap_url.clone()).unwrap();
act.object_props.set_to_link(target.clone().into_id()).expect("New Follow error while setting 'to'");
act.object_props.set_cc_link_vec::<Id>(vec![]).expect("New Follow error while setting 'cc'");
act
}
/// from -> The one sending the follow request /// from -> The one sending the follow request
/// target -> The target of the request, responding with Accept /// target -> The target of the request, responding with Accept
@ -36,9 +59,12 @@ impl Follow {
from_id: i32, from_id: i32,
target_id: i32 target_id: i32
) -> Follow { ) -> Follow {
let from_url: String = from.clone().into_id().into();
let target_url: String = target.clone().into_id().into();
let res = Follow::insert(conn, NewFollow { let res = Follow::insert(conn, NewFollow {
follower_id: from_id, follower_id: from_id,
following_id: target_id following_id: target_id,
ap_url: format!("{}/follow/{}", from_url, target_url),
}); });
let mut accept = Accept::default(); let mut accept = Accept::default();
@ -77,3 +103,21 @@ impl Notify<PgConnection> for Follow {
}); });
} }
} }
impl Deletable<PgConnection, Undo> for Follow {
fn delete(&self, conn: &PgConnection) -> Undo {
diesel::delete(self).execute(conn).expect("Coudn't delete follow");
let mut undo = Undo::default();
undo.undo_props.set_actor_link(User::get(conn, self.follower_id).unwrap().into_id()).expect("Follow::delete: actor error");
undo.object_props.set_id_string(format!("{}/undo", self.ap_url)).expect("Follow::delete: id error");
undo.undo_props.set_object_object(self.into_activity(conn)).expect("Follow::delete: object error");
undo
}
fn delete_id(id: String, conn: &PgConnection) {
if let Some(follow) = Follow::find_by_ap_url(conn, id) {
follow.delete(conn);
}
}
}

View File

@ -42,6 +42,7 @@ table! {
id -> Int4, id -> Int4,
follower_id -> Int4, follower_id -> Int4,
following_id -> Int4, following_id -> Int4,
ap_url -> Text,
} }
} }

View File

@ -116,20 +116,20 @@ fn dashboard_auth() -> Flash<Redirect> {
#[get("/@/<name>/follow")] #[get("/@/<name>/follow")]
fn follow(name: String, conn: DbConn, user: User, worker: Worker) -> Redirect { fn follow(name: String, conn: DbConn, user: User, worker: Worker) -> Redirect {
let target = User::find_by_fqn(&*conn, name.clone()).unwrap(); let target = User::find_by_fqn(&*conn, name.clone()).unwrap();
let f = follows::Follow::insert(&*conn, follows::NewFollow { if let Some(follow) = follows::Follow::find(&*conn, user.id, target.id) {
follower_id: user.id, let delete_act = follow.delete(&*conn);
following_id: target.id worker.execute(Thunk::of(move || broadcast(&user, delete_act, vec![target])));
}); } else {
f.notify(&*conn); let f = follows::Follow::insert(&*conn, follows::NewFollow {
follower_id: user.id,
following_id: target.id,
ap_url: format!("{}/follow/{}", user.ap_url, target.ap_url),
});
f.notify(&*conn);
let mut act = Follow::default(); let act = f.into_activity(&*conn);
act.follow_props.set_actor_link::<Id>(user.clone().into_id()).unwrap(); worker.execute(Thunk::of(move || broadcast(&user, act, vec![target])));
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();
act.object_props.set_to_link(target.clone().into_id()).expect("New Follow error while setting 'to'");
act.object_props.set_cc_link_vec::<Id>(vec![]).expect("New Follow error while setting 'cc'");
worker.execute(Thunk::of(move || broadcast(&user, act, vec![target])));
Redirect::to(uri!(details: name = name)) Redirect::to(uri!(details: name = name))
} }