]> Untitled Git - lemmy.git/blobdiff - crates/db_views_actor/src/community_follower_view.rs
Revert "Add pending, and change use specific API response for FollowCommunity…" ...
[lemmy.git] / crates / db_views_actor / src / community_follower_view.rs
index a4f2b20dcaa3277f5d1af41a13681078f39244dc..6d5d94a596cb30c338ad2a8dea0a4ce2cc840973 100644 (file)
@@ -1,42 +1,43 @@
+use crate::structs::CommunityFollowerView;
 use diesel::{result::Error, *};
-use lemmy_db_queries::{ToSafe, ViewToVec};
 use lemmy_db_schema::{
-  schema::{community, community_follower, user_},
+  newtypes::{CommunityId, PersonId},
+  schema::{community, community_follower, person},
   source::{
     community::{Community, CommunitySafe},
-    user::{UserSafe, User_},
+    person::{Person, PersonSafe},
   },
+  traits::{ToSafe, ViewToVec},
 };
-use serde::Serialize;
 
-#[derive(Debug, Serialize, Clone)]
-pub struct CommunityFollowerView {
-  pub community: CommunitySafe,
-  pub follower: UserSafe,
-}
-
-type CommunityFollowerViewTuple = (CommunitySafe, UserSafe);
+type CommunityFollowerViewTuple = (CommunitySafe, PersonSafe);
 
 impl CommunityFollowerView {
-  pub fn for_community(conn: &PgConnection, community_id: i32) -> Result<Vec<Self>, Error> {
+  pub fn for_community(conn: &PgConnection, community_id: CommunityId) -> Result<Vec<Self>, Error> {
     let res = community_follower::table
       .inner_join(community::table)
-      .inner_join(user_::table)
-      .select((Community::safe_columns_tuple(), User_::safe_columns_tuple()))
+      .inner_join(person::table)
+      .select((
+        Community::safe_columns_tuple(),
+        Person::safe_columns_tuple(),
+      ))
       .filter(community_follower::community_id.eq(community_id))
-      .order_by(community_follower::published)
+      .order_by(community::title)
       .load::<CommunityFollowerViewTuple>(conn)?;
 
     Ok(Self::from_tuple_to_vec(res))
   }
 
-  pub fn for_user(conn: &PgConnection, user_id: i32) -> Result<Vec<Self>, Error> {
+  pub fn for_person(conn: &PgConnection, person_id: PersonId) -> Result<Vec<Self>, Error> {
     let res = community_follower::table
       .inner_join(community::table)
-      .inner_join(user_::table)
-      .select((Community::safe_columns_tuple(), User_::safe_columns_tuple()))
-      .filter(community_follower::user_id.eq(user_id))
-      .order_by(community_follower::published)
+      .inner_join(person::table)
+      .select((
+        Community::safe_columns_tuple(),
+        Person::safe_columns_tuple(),
+      ))
+      .filter(community_follower::person_id.eq(person_id))
+      .order_by(community::title)
       .load::<CommunityFollowerViewTuple>(conn)?;
 
     Ok(Self::from_tuple_to_vec(res))