LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-22 12:21:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making community_follower.pending column not null.

Browse source
This commit is contained in:
Dessalines 2022-05-10 14:14:01 -04:00 committed by Nutomic
parent 763dc9668c
commit d4ee171b08
18 changed files with 37 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api_tests/package.json
View file

@ -16,7 +16,7 @@
"eslint": "^7.30.0", "eslint": "^7.30.0",
"eslint-plugin-jane": "^9.0.3", "eslint-plugin-jane": "^9.0.3",
"jest": "^27.0.6", "jest": "^27.0.6",
"lemmy-js-client": "0.17.0-rc.2", "lemmy-js-client": "0.17.0-rc.3",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"prettier": "^2.3.2", "prettier": "^2.3.2",
"ts-jest": "^27.0.3", "ts-jest": "^27.0.3",

8
api_tests/yarn.lock
View file

@ -3076,10 +3076,10 @@ language-tags@^1.0.5:
dependencies: dependencies:
language-subtag-registry "~0.3.2" language-subtag-registry "~0.3.2"
lemmy-js-client@0.17.0-rc.2: lemmy-js-client@0.17.0-rc.3:
version "0.17.0-rc.2" version "0.17.0-rc.3"
resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.17.0-rc.2.tgz#4e6ff9a8d83ac922cd36eeaa01c657b3b93309e6" resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.17.0-rc.3.tgz#3c9b3d5e3346eed8cb8096dad527e72096052223"
integrity sha512-2YkZiAkq2ZUHPSl/B7pvMMkI19XRtTKwLFJ1u4NT2BlFkNdlvkvkOddnJ6aRwKAp/WBohxoKLoDHhlwePS5gqA== integrity sha512-VwKSkjqZhsTrtlKTKs9DEVaj9rlmMEjzn/BxkizU9v03Km7OIs9Z7cOEfperOR9A6q5gh2hWfTDp5eV/0kYkVg==
leven@^3.1.0: leven@^3.1.0:
version "3.1.0" version "3.1.0"

2
crates/api/src/community/ban.rs
View file

@ -76,7 +76,7 @@ impl Perform for BanFromCommunity {
let community_follower_form = CommunityFollowerForm { let community_follower_form = CommunityFollowerForm {
community_id: data.community_id, community_id: data.community_id,
person_id: banned_person_id, person_id: banned_person_id,
pending: false, pending: Some(false),
}; };
blocking(context.pool(), move |conn: &'_ _| { blocking(context.pool(), move |conn: &'_ _| {
CommunityFollower::unfollow(conn, &community_follower_form) CommunityFollower::unfollow(conn, &community_follower_form)

2
crates/api/src/community/block.rs
View file

@ -47,7 +47,7 @@ impl Perform for BlockCommunity {
let community_follower_form = CommunityFollowerForm { let community_follower_form = CommunityFollowerForm {
community_id: data.community_id, community_id: data.community_id,
person_id, person_id,
pending: false, pending: Some(false),
}; };
blocking(context.pool(), move |conn: &'_ _| { blocking(context.pool(), move |conn: &'_ _| {
CommunityFollower::unfollow(conn, &community_follower_form) CommunityFollower::unfollow(conn, &community_follower_form)

2
crates/api/src/community/follow.rs
View file

@ -47,7 +47,7 @@ impl Perform for FollowCommunity {
let community_follower_form = CommunityFollowerForm { let community_follower_form = CommunityFollowerForm {
community_id: data.community_id, community_id: data.community_id,
person_id: local_user_view.person.id, person_id: local_user_view.person.id,
pending: false, // Don't worry, this form isn't used for remote follows pending: Some(false), // Don't worry, this form isn't used for remote follows
}; };
if community.local { if community.local {

2
crates/api_crud/src/community/create.rs
View file

@ -123,7 +123,7 @@ impl PerformCrud for CreateCommunity {
let community_follower_form = CommunityFollowerForm { let community_follower_form = CommunityFollowerForm {
community_id: inserted_community.id, community_id: inserted_community.id,
person_id: local_user_view.person.id, person_id: local_user_view.person.id,
pending: false, pending: Some(false),
}; };
let follow = move |conn: &'_ _| CommunityFollower::follow(conn, &community_follower_form); let follow = move |conn: &'_ _| CommunityFollower::follow(conn, &community_follower_form);

2
crates/api_crud/src/user/create.rs
View file

@ -232,7 +232,7 @@ impl PerformCrud for Register {
let community_follower_form = CommunityFollowerForm { let community_follower_form = CommunityFollowerForm {
community_id: main_community.id, community_id: main_community.id,
person_id: inserted_person.id, person_id: inserted_person.id,
pending: false, pending: Some(false),
}; };
let follow = move |conn: &'_ _| CommunityFollower::follow(conn, &community_follower_form); let follow = move |conn: &'_ _| CommunityFollower::follow(conn, &community_follower_form);

2
crates/apub/src/activities/block/block_user.rs
View file

@ -200,7 +200,7 @@ impl ActivityHandler for BlockUser {
let community_follower_form = CommunityFollowerForm { let community_follower_form = CommunityFollowerForm {
community_id: community.id, community_id: community.id,
person_id: blocked_person.id, person_id: blocked_person.id,
pending: false, pending: Some(false),
}; };
blocking(context.pool(), move |conn: &'_ _| { blocking(context.pool(), move |conn: &'_ _| {
CommunityFollower::unfollow(conn, &community_follower_form) CommunityFollower::unfollow(conn, &community_follower_form)

4
crates/apub/src/activities/following/follow.rs
View file

@ -50,7 +50,7 @@ impl FollowCommunity {
let community_follower_form = CommunityFollowerForm { let community_follower_form = CommunityFollowerForm {
community_id: community.id, community_id: community.id,
person_id: actor.id, person_id: actor.id,
pending: true, pending: Some(true),
}; };
blocking(context.pool(), move |conn| { blocking(context.pool(), move |conn| {
CommunityFollower::follow(conn, &community_follower_form).ok() CommunityFollower::follow(conn, &community_follower_form).ok()
@ -100,7 +100,7 @@ impl ActivityHandler for FollowCommunity {
let community_follower_form = CommunityFollowerForm { let community_follower_form = CommunityFollowerForm {
community_id: community.id, community_id: community.id,
person_id: person.id, person_id: person.id,
pending: false, pending: Some(false),
}; };
// This will fail if they're already a follower, but ignore the error. // This will fail if they're already a follower, but ignore the error.

2
crates/apub/src/activities/following/undo_follow.rs
View file

@ -77,7 +77,7 @@ impl ActivityHandler for UndoFollowCommunity {
let community_follower_form = CommunityFollowerForm { let community_follower_form = CommunityFollowerForm {
community_id: community.id, community_id: community.id,
person_id: person.id, person_id: person.id,
pending: false, pending: Some(false),
}; };
// This will fail if they aren't a follower, but ignore the error. // This will fail if they aren't a follower, but ignore the error.

6
crates/db_schema/src/aggregates/community_aggregates.rs
View file

@ -66,7 +66,7 @@ mod tests {
let first_person_follow = CommunityFollowerForm { let first_person_follow = CommunityFollowerForm {
community_id: inserted_community.id, community_id: inserted_community.id,
person_id: inserted_person.id, person_id: inserted_person.id,
pending: false, pending: Some(false),
}; };
CommunityFollower::follow(&conn, &first_person_follow).unwrap(); CommunityFollower::follow(&conn, &first_person_follow).unwrap();
@ -74,7 +74,7 @@ mod tests {
let second_person_follow = CommunityFollowerForm { let second_person_follow = CommunityFollowerForm {
community_id: inserted_community.id, community_id: inserted_community.id,
person_id: another_inserted_person.id, person_id: another_inserted_person.id,
pending: false, pending: Some(false),
}; };
CommunityFollower::follow(&conn, &second_person_follow).unwrap(); CommunityFollower::follow(&conn, &second_person_follow).unwrap();
@ -82,7 +82,7 @@ mod tests {
let another_community_follow = CommunityFollowerForm { let another_community_follow = CommunityFollowerForm {
community_id: another_inserted_community.id, community_id: another_inserted_community.id,
person_id: inserted_person.id, person_id: inserted_person.id,
pending: false, pending: Some(false),
}; };
CommunityFollower::follow(&conn, &another_community_follow).unwrap(); CommunityFollower::follow(&conn, &another_community_follow).unwrap();

4
crates/db_schema/src/impls/community.rs
View file

@ -380,7 +380,7 @@ mod tests {
let community_follower_form = CommunityFollowerForm { let community_follower_form = CommunityFollowerForm {
community_id: inserted_community.id, community_id: inserted_community.id,
person_id: inserted_person.id, person_id: inserted_person.id,
pending: false, pending: Some(false),
}; };
let inserted_community_follower = let inserted_community_follower =
@ -390,7 +390,7 @@ mod tests {
id: inserted_community_follower.id, id: inserted_community_follower.id,
community_id: inserted_community.id, community_id: inserted_community.id,
person_id: inserted_person.id, person_id: inserted_person.id,
pending: Some(false), pending: false,
published: inserted_community_follower.published, published: inserted_community_follower.published,
}; };

2
crates/db_schema/src/schema.rs
View file

@ -119,7 +119,7 @@ table! {
community_id -> Int4, community_id -> Int4,
person_id -> Int4, person_id -> Int4,
published -> Timestamp, published -> Timestamp,
pending -> Nullable<Bool>, pending -> Bool,
} }
} }

4
crates/db_schema/src/source/community.rs
View file

@ -128,7 +128,7 @@ pub struct CommunityFollower {
pub community_id: CommunityId, pub community_id: CommunityId,
pub person_id: PersonId, pub person_id: PersonId,
pub published: chrono::NaiveDateTime, pub published: chrono::NaiveDateTime,
pub pending: Option<bool>, pub pending: bool,
} }
#[derive(Clone)] #[derive(Clone)]
@ -137,5 +137,5 @@ pub struct CommunityFollower {
pub struct CommunityFollowerForm { pub struct CommunityFollowerForm {
pub community_id: CommunityId, pub community_id: CommunityId,
pub person_id: PersonId, pub person_id: PersonId,
pub pending: bool, pub pending: Option<bool>,
} }

2
crates/db_views_actor/src/community_follower_view.rs
View file

@ -10,7 +10,7 @@ use lemmy_db_schema::{
traits::{ToSafe, ViewToVec}, traits::{ToSafe, ViewToVec},
}; };
type CommunityFollowerViewTuple = (CommunitySafe, PersonSafe, Option<bool>); type CommunityFollowerViewTuple = (CommunitySafe, PersonSafe, bool);
impl CommunityFollowerView { impl CommunityFollowerView {
pub fn for_community(conn: &PgConnection, community_id: CommunityId) -> Result<Vec<Self>, Error> { pub fn for_community(conn: &PgConnection, community_id: CommunityId) -> Result<Vec<Self>, Error> {

2
crates/db_views_actor/src/structs.rs
View file

@ -20,7 +20,7 @@ pub struct CommunityBlockView {
pub struct CommunityFollowerView { pub struct CommunityFollowerView {
pub community: CommunitySafe, pub community: CommunitySafe,
pub follower: PersonSafe, pub follower: PersonSafe,
pub pending: Option<bool>, pub pending: bool,
} }
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]

5
migrations/2022-05-10-173801_change_pending_to_notnull/down.sql Normal file
View file

@ -0,0 +1,5 @@
-- This file should undo anything in `up.sql`
alter table community_follower
alter column pending drop not null,
alter column pending set default false;

8
migrations/2022-05-10-173801_change_pending_to_notnull/up.sql Normal file
View file

@ -0,0 +1,8 @@
-- Make the pending column not null
update community_follower set pending = true where pending is null;
alter table community_follower
alter column pending set not null,
alter column pending set default true;