Revert "Add pending, and change use specific API response for FollowCommunity…" ...

[lemmy.git] / crates / db_views_actor / src / community_follower_view.rs

diff --git a/crates/db_views_actor/src/community_follower_view.rs b/crates/db_views_actor/src/community_follower_view.rs
index 7bece59d353db42922a969ad1ae571c18ce5dfb9..6d5d94a596cb30c338ad2a8dea0a4ce2cc840973 100644 (file)
--- a/crates/db_views_actor/src/community_follower_view.rs
+++ b/crates/db_views_actor/src/community_follower_view.rs
@@ -10,7 +10,7 @@ use lemmy_db_schema::{
   traits::{ToSafe, ViewToVec},
 };
 
-type CommunityFollowerViewTuple = (CommunitySafe, PersonSafe, bool);
+type CommunityFollowerViewTuple = (CommunitySafe, PersonSafe);
 
 impl CommunityFollowerView {
   pub fn for_community(conn: &PgConnection, community_id: CommunityId) -> Result<Vec<Self>, Error> {
@@ -20,7 +20,6 @@ impl CommunityFollowerView {
       .select((
         Community::safe_columns_tuple(),
         Person::safe_columns_tuple(),
-        community_follower::pending,
       ))
       .filter(community_follower::community_id.eq(community_id))
       .order_by(community::title)
@@ -36,7 +35,6 @@ impl CommunityFollowerView {
       .select((
         Community::safe_columns_tuple(),
         Person::safe_columns_tuple(),
-        community_follower::pending,
       ))
       .filter(community_follower::person_id.eq(person_id))
       .order_by(community::title)
@@ -44,30 +42,6 @@ impl CommunityFollowerView {
 
     Ok(Self::from_tuple_to_vec(res))
   }
-
-  pub fn read(
-    conn: &PgConnection,
-    community_id: CommunityId,
-    person_id: PersonId,
-  ) -> Result<Self, Error> {
-    let (community, follower, pending) = community_follower::table
-      .inner_join(community::table)
-      .inner_join(person::table)
-      .select((
-        Community::safe_columns_tuple(),
-        Person::safe_columns_tuple(),
-        community_follower::pending,
-      ))
-      .filter(community_follower::person_id.eq(person_id))
-      .filter(community_follower::community_id.eq(community_id))
-      .first::<CommunityFollowerViewTuple>(conn)?;
-
-    Ok(Self {
-      community,
-      follower,
-      pending,
-    })
-  }
 }
 
 impl ViewToVec for CommunityFollowerView {
@@ -78,7 +52,6 @@ impl ViewToVec for CommunityFollowerView {
       .map(|a| Self {
         community: a.0.to_owned(),
         follower: a.1.to_owned(),
-        pending: a.2.to_owned(),
       })
       .collect::<Vec<Self>>()
   }