grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Renaming ignore to unfollow in followable trait.

Browse source
This commit is contained in:
Dessalines 2020-05-04 14:26:16 -04:00
parent 4d82b89947
commit e4ee8090b9
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/src/api/community.rs
View file

@ -495,7 +495,7 @@ impl Perform for Oper<FollowCommunity> {
Err(_e) => return Err(APIError::err("community_follower_already_exists").into()), Err(_e) => return Err(APIError::err("community_follower_already_exists").into()),
}; };
} else { } else {
match CommunityFollower::ignore(&conn, &community_follower_form) { match CommunityFollower::unfollow(&conn, &community_follower_form) {
Ok(user) => user, Ok(user) => user,
Err(_e) => return Err(APIError::err("community_follower_already_exists").into()), Err(_e) => return Err(APIError::err("community_follower_already_exists").into()),
}; };
@ -509,7 +509,7 @@ impl Perform for Oper<FollowCommunity> {
user.send_follow(&community.actor_id, &conn)?; user.send_follow(&community.actor_id, &conn)?;
} else { } else {
user.send_unfollow(&community.actor_id, &conn)?; user.send_unfollow(&community.actor_id, &conn)?;
match CommunityFollower::ignore(&conn, &community_follower_form) { match CommunityFollower::unfollow(&conn, &community_follower_form) {
Ok(user) => user, Ok(user) => user,
Err(_e) => return Err(APIError::err("community_follower_already_exists").into()), Err(_e) => return Err(APIError::err("community_follower_already_exists").into()),
}; };

2
server/src/apub/community_inbox.rs
View file

@ -129,7 +129,7 @@ fn handle_undo_follow(
user_id: user.id, user_id: user.id,
}; };
CommunityFollower::ignore(&conn, &community_follower_form).ok(); CommunityFollower::unfollow(&conn, &community_follower_form).ok();
Ok(HttpResponse::Ok().finish()) Ok(HttpResponse::Ok().finish())
} }

4
server/src/db/community.rs
View file

@ -216,7 +216,7 @@ impl Followable<CommunityFollowerForm> for CommunityFollower {
.values(community_follower_form) .values(community_follower_form)
.get_result::<Self>(conn) .get_result::<Self>(conn)
} }
fn ignore( fn unfollow(
conn: &PgConnection, conn: &PgConnection,
community_follower_form: &CommunityFollowerForm, community_follower_form: &CommunityFollowerForm,
) -> Result<usize, Error> { ) -> Result<usize, Error> {
@ -351,7 +351,7 @@ mod tests {
let read_community = Community::read(&conn, inserted_community.id).unwrap(); let read_community = Community::read(&conn, inserted_community.id).unwrap();
let updated_community = let updated_community =
Community::update(&conn, inserted_community.id, &new_community).unwrap(); Community::update(&conn, inserted_community.id, &new_community).unwrap();
let ignored_community = CommunityFollower::ignore(&conn, &community_follower_form).unwrap(); let ignored_community = CommunityFollower::unfollow(&conn, &community_follower_form).unwrap();
let left_community = CommunityModerator::leave(&conn, &community_user_form).unwrap(); let left_community = CommunityModerator::leave(&conn, &community_user_form).unwrap();
let unban = CommunityUserBan::unban(&conn, &community_user_ban_form).unwrap(); let unban = CommunityUserBan::unban(&conn, &community_user_ban_form).unwrap();
let num_deleted = Community::delete(&conn, inserted_community.id).unwrap(); let num_deleted = Community::delete(&conn, inserted_community.id).unwrap();

2
server/src/db/mod.rs
View file

@ -44,7 +44,7 @@ pub trait Followable<T> {
fn follow(conn: &PgConnection, form: &T) -> Result<Self, Error> fn follow(conn: &PgConnection, form: &T) -> Result<Self, Error>
where where
Self: Sized; Self: Sized;
fn ignore(conn: &PgConnection, form: &T) -> Result<usize, Error> fn unfollow(conn: &PgConnection, form: &T) -> Result<usize, Error>
where where
Self: Sized; Self: Sized;
} }