Make functions work with both connection and pool (#3420)

[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 ccc7ae706790f7df35a6ad19beb4d42905293b15..c30503878ebbba0ec3243ab4f19014d2101050d6 100644 (file)
--- a/crates/db_views_actor/src/community_follower_view.rs
+++ b/crates/db_views_actor/src/community_follower_view.rs
@@ -1,8 +1,14 @@
 use crate::structs::CommunityFollowerView;
-use diesel::{result::Error, ExpressionMethods, QueryDsl};
+use diesel::{
+  dsl::{count_star, not},
+  result::Error,
+  sql_function,
+  ExpressionMethods,
+  QueryDsl,
+};
 use diesel_async::RunQueryDsl;
 use lemmy_db_schema::{
-  newtypes::{CommunityId, PersonId},
+  newtypes::{CommunityId, DbUrl, PersonId},
   schema::{community, community_follower, person},
   source::{community::Community, person::Person},
   traits::JoinView,
@@ -11,22 +17,40 @@ use lemmy_db_schema::{
 
 type CommunityFollowerViewTuple = (Community, Person);
 
+sql_function!(fn coalesce(x: diesel::sql_types::Nullable<diesel::sql_types::Text>, y: diesel::sql_types::Text) -> diesel::sql_types::Text);
+
 impl CommunityFollowerView {
-  pub async fn for_community(pool: &DbPool, community_id: CommunityId) -> Result<Vec<Self>, Error> {
+  pub async fn get_community_follower_inboxes(
+    pool: &mut DbPool<'_>,
+    community_id: CommunityId,
+  ) -> Result<Vec<DbUrl>, Error> {
     let conn = &mut get_conn(pool).await?;
     let res = community_follower::table
-      .inner_join(community::table)
+      .filter(community_follower::community_id.eq(community_id))
+      .filter(not(person::local))
       .inner_join(person::table)
-      .select((community::all_columns, person::all_columns))
+      .select(coalesce(person::shared_inbox_url, person::inbox_url))
+      .distinct()
+      .load::<DbUrl>(conn)
+      .await?;
+
+    Ok(res)
+  }
+  pub async fn count_community_followers(
+    pool: &mut DbPool<'_>,
+    community_id: CommunityId,
+  ) -> Result<i64, Error> {
+    let conn = &mut get_conn(pool).await?;
+    let res = community_follower::table
       .filter(community_follower::community_id.eq(community_id))
-      .order_by(community::title)
-      .load::<CommunityFollowerViewTuple>(conn)
+      .select(count_star())
+      .first::<i64>(conn)
       .await?;
 
-    Ok(res.into_iter().map(Self::from_tuple).collect())
+    Ok(res)
   }
 
-  pub async fn for_person(pool: &DbPool, person_id: PersonId) -> Result<Vec<Self>, Error> {
+  pub async fn for_person(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Vec<Self>, Error> {
     let conn = &mut get_conn(pool).await?;
     let res = community_follower::table
       .inner_join(community::table)