Feature/custom emoji and tagline views

crates/api_common/src/custom_emoji.rs

@@ -1,6 +1,7 @@
 use lemmy_db_schema::newtypes::CustomEmojiId;
 use lemmy_db_views::structs::CustomEmojiView;
 use serde::{Deserialize, Serialize};
+use serde_with::skip_serializing_none;
 #[cfg(feature = "full")]
 use ts_rs::TS;
 use url::Url;
@@ -46,3 +47,21 @@ pub struct DeleteCustomEmoji {
 pub struct CustomEmojiResponse {
   pub custom_emoji: CustomEmojiView,
 }
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[cfg_attr(feature = "full", derive(TS))]
+#[cfg_attr(feature = "full", ts(export))]
+/// A response for custom emojis.
+pub struct ListCustomEmojisResponse {
+  pub custom_emojis: Vec<CustomEmojiView>,
+}
+
+#[skip_serializing_none]
+#[derive(Debug, Serialize, Deserialize, Clone, Copy, Default, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "full", derive(TS))]
+#[cfg_attr(feature = "full", ts(export))]
+/// Fetches a list of registration applications.
+pub struct ListCustomEmojis {
+  pub page: Option<i64>,
+  pub limit: Option<i64>,
+}

crates/api_common/src/lib.rs

@@ -16,6 +16,7 @@ pub mod request;
 pub mod send_activity;
 pub mod sensitive;
 pub mod site;
+pub mod tagline;
 #[cfg(feature = "full")]
 pub mod utils;
 

crates/api_common/src/tagline.rs

@@ -0,0 +1,23 @@
+use lemmy_db_views::structs::TaglineView;
+use serde::{Deserialize, Serialize};
+use serde_with::skip_serializing_none;
+#[cfg(feature = "full")]
+use ts_rs::TS;
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[cfg_attr(feature = "full", derive(TS))]
+#[cfg_attr(feature = "full", ts(export))]
+/// A response for custom emojis.
+pub struct ListTaglinesResponse {
+  pub taglines: Vec<TaglineView>,
+}
+
+#[skip_serializing_none]
+#[derive(Debug, Serialize, Deserialize, Clone, Copy, Default, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "full", derive(TS))]
+#[cfg_attr(feature = "full", ts(export))]
+/// Fetches a list of registration applications.
+pub struct ListTaglines {
+  pub page: Option<i64>,
+  pub limit: Option<i64>,
+}

crates/api_crud/src/custom_emoji/list.rs

@@ -0,0 +1,26 @@
+use actix_web::web::{Data, Json, Query};
+use lemmy_api_common::{
+  context::LemmyContext,
+  custom_emoji::{ListCustomEmojis, ListCustomEmojisResponse},
+};
+use lemmy_db_views::structs::{CustomEmojiView, LocalUserView, SiteView};
+use lemmy_utils::error::LemmyError;
+
+#[tracing::instrument(skip(context))]
+pub async fn list_custom_emojis(
+  data: Query<ListCustomEmojis>,
+  local_user_view: Option<LocalUserView>,
+  context: Data<LemmyContext>,
+) -> Result<Json<ListCustomEmojisResponse>, LemmyError> {
+  let local_site = SiteView::read_local(&mut context.pool()).await?;
+  let custom_emojis = CustomEmojiView::list(
+    &mut context.pool(),
+    local_site.local_site.id,
+    data.page,
+    data.limit,
+  )
+  .await
+  .map_err(|e| anyhow::anyhow!("Failed to construct custom emojis response: {e}"))?;
+
+  Ok(Json(ListCustomEmojisResponse { custom_emojis }))
+}

crates/api_crud/src/custom_emoji/mod.rs

@@ -1,3 +1,4 @@
 pub mod create;
 pub mod delete;
+pub mod list;
 pub mod update;

crates/api_crud/src/lib.rs

@@ -4,4 +4,5 @@ pub mod custom_emoji;
 pub mod post;
 pub mod private_message;
 pub mod site;
+pub mod tagline;
 pub mod user;

crates/api_crud/src/tagline/list.rs

@@ -0,0 +1,26 @@
+use actix_web::web::{Data, Json, Query};
+use lemmy_api_common::{
+  context::LemmyContext,
+  tagline::{ListTaglines, ListTaglinesResponse},
+};
+use lemmy_db_views::structs::{LocalUserView, SiteView, TaglineView};
+use lemmy_utils::error::LemmyError;
+
+#[tracing::instrument(skip(context))]
+pub async fn list_taglines(
+  data: Query<ListTaglines>,
+  local_user_view: Option<LocalUserView>,
+  context: Data<LemmyContext>,
+) -> Result<Json<ListTaglinesResponse>, LemmyError> {
+  let local_site = SiteView::read_local(&mut context.pool()).await?;
+  let taglines = TaglineView::list(
+    &mut context.pool(),
+    local_site.local_site.id,
+    data.page,
+    data.limit,
+  )
+  .await
+  .map_err(|e| anyhow::anyhow!("Failed to construct taglines response: {e}"))?;
+
+  Ok(Json(ListTaglinesResponse { taglines }))
+}

crates/api_crud/src/tagline/mod.rs

@@ -0,0 +1 @@
+pub mod list;

crates/db_views/src/custom_emoji_view.rs

@@ -5,7 +5,7 @@ use lemmy_db_schema::{
   newtypes::{CustomEmojiId, LocalSiteId},
   schema::{custom_emoji, custom_emoji_keyword},
   source::{custom_emoji::CustomEmoji, custom_emoji_keyword::CustomEmojiKeyword},
-  utils::{get_conn, DbPool},
+  utils::{get_conn, limit_and_offset, DbPool},
 };
 use std::collections::HashMap;
 
@@ -57,6 +57,33 @@ impl CustomEmojiView {
     Ok(CustomEmojiView::from_tuple_to_vec(emojis))
   }
 
+  pub async fn list(
+    pool: &mut DbPool<'_>,
+    for_local_site_id: LocalSiteId,
+    page: Option<i64>,
+    limit: Option<i64>,
+  ) -> Result<Vec<Self>, Error> {
+    let conn = &mut get_conn(pool).await?;
+    let (limit, offset) = limit_and_offset(page, limit)?;
+    let emojis = custom_emoji::table
+      .filter(custom_emoji::local_site_id.eq(for_local_site_id))
+      .left_join(
+        custom_emoji_keyword::table.on(custom_emoji_keyword::custom_emoji_id.eq(custom_emoji::id)),
+      )
+      .order(custom_emoji::category)
+      .then_order_by(custom_emoji::id)
+      .select((
+        custom_emoji::all_columns,
+        custom_emoji_keyword::all_columns.nullable(), // (or all the columns if you want)
+      ))
+      .limit(limit)
+      .offset(offset)
+      .load::<CustomEmojiTuple>(conn)
+      .await?;
+
+    Ok(CustomEmojiView::from_tuple_to_vec(emojis))
+  }
+
   fn from_tuple_to_vec(items: Vec<CustomEmojiTuple>) -> Vec<Self> {
     let mut result = Vec::new();
     let mut hash: HashMap<CustomEmojiId, Vec<CustomEmojiKeyword>> = HashMap::new();

crates/db_views/src/lib.rs

@@ -23,4 +23,6 @@ pub mod registration_application_view;
 pub mod site_view;
 pub mod structs;
 #[cfg(feature = "full")]
+pub mod tagline_view;
+#[cfg(feature = "full")]
 pub mod vote_view;

crates/db_views/src/structs.rs

@@ -19,6 +19,7 @@ use lemmy_db_schema::{
     private_message_report::PrivateMessageReport,
     registration_application::RegistrationApplication,
     site::Site,
+    tagline::Tagline,
   },
   SubscribedType,
 };
@@ -193,6 +194,15 @@ pub struct SiteView {
   pub counts: SiteAggregates,
 }
 
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[cfg_attr(feature = "full", derive(TS, Queryable))]
+#[cfg_attr(feature = "full", diesel(check_for_backend(diesel::pg::Pg)))]
+#[cfg_attr(feature = "full", ts(export))]
+/// A custom emoji view.
+pub struct TaglineView {
+  pub tagline: Tagline,
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[cfg_attr(feature = "full", derive(TS, Queryable))]
 #[cfg_attr(feature = "full", diesel(check_for_backend(diesel::pg::Pg)))]

crates/db_views/src/tagline_view.rs

@@ -0,0 +1,38 @@
+use crate::structs::TaglineView;
+use diesel::{result::Error, ExpressionMethods, QueryDsl};
+use diesel_async::RunQueryDsl;
+use lemmy_db_schema::{
+  newtypes::LocalSiteId,
+  schema::tagline,
+  source::tagline::Tagline,
+  utils::{get_conn, limit_and_offset, DbPool},
+};
+
+impl TaglineView {
+  pub async fn list(
+    pool: &mut DbPool<'_>,
+    for_local_site_id: LocalSiteId,
+    page: Option<i64>,
+    limit: Option<i64>,
+  ) -> Result<Vec<Self>, Error> {
+    let conn = &mut get_conn(pool).await?;
+    let (limit, offset) = limit_and_offset(page, limit)?;
+    let taglines = tagline::table
+      .filter(tagline::local_site_id.eq(for_local_site_id))
+      .order(tagline::id)
+      .select(tagline::all_columns)
+      .limit(limit)
+      .offset(offset)
+      .load::<Tagline>(conn)
+      .await?;
+
+    let mut result = Vec::new();
+    for tagline in &taglines {
+      result.push(TaglineView {
+        tagline: tagline.clone(),
+      });
+    }
+
+    Ok(result)
+  }
+}

src/api_routes_http.rs

@@ -106,6 +106,7 @@ use lemmy_api_crud::{
   custom_emoji::{
     create::create_custom_emoji,
     delete::delete_custom_emoji,
+    list::list_custom_emojis,
     update::update_custom_emoji,
   },
   post::{
@@ -122,6 +123,7 @@ use lemmy_api_crud::{
     update::update_private_message,
   },
   site::{create::create_site, read::get_site, update::update_site},
+  tagline::list::list_taglines,
   user::{create::register, delete::delete_account},
 };
 use lemmy_apub::api::{
@@ -361,7 +363,13 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimitCell) {
           .wrap(rate_limit.message())
           .route("", web::post().to(create_custom_emoji))
           .route("", web::put().to(update_custom_emoji))
-          .route("/delete", web::post().to(delete_custom_emoji)),
+          .route("/delete", web::post().to(delete_custom_emoji))
+          .route("/list", web::get().to(list_custom_emojis)),
+      )
+      .service(
+        web::scope("/tagline")
+          .wrap(rate_limit.message())
+          .route("/list", web::get().to(list_taglines)),
       ),
   );
   cfg.service(