mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-06-12 10:29:22 +00:00
Code Issues Projects Releases Wiki Activity

Apply linting

Browse source
This commit is contained in:
Freakazoid182 2024-03-31 17:42:48 +02:00
parent b4a86157a5
commit 10a8f01fad
8 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/api_common/src/tagline.rs
View file

@ -1,5 +1,5 @@
use serde::{Deserialize, Serialize};
use lemmy_db_views::structs::TaglineView; use lemmy_db_views::structs::TaglineView;
use serde::{Deserialize, Serialize};
use serde_with::skip_serializing_none; use serde_with::skip_serializing_none;
#[cfg(feature = "full")] #[cfg(feature = "full")]
use ts_rs::TS; use ts_rs::TS;

3
crates/api_crud/src/custom_emoji/list.rs
View file

@ -12,7 +12,6 @@ pub async fn list_custom_emojis(
local_user_view: Option<LocalUserView>, local_user_view: Option<LocalUserView>,
context: Data<LemmyContext>, context: Data<LemmyContext>,
) -> Result<Json<ListCustomEmojisResponse>, LemmyError> { ) -> Result<Json<ListCustomEmojisResponse>, LemmyError> {
let local_site = SiteView::read_local(&mut context.pool()).await?; let local_site = SiteView::read_local(&mut context.pool()).await?;
let custom_emojis = CustomEmojiView::list( let custom_emojis = CustomEmojiView::list(
&mut context.pool(), &mut context.pool(),
@ -20,7 +19,7 @@ pub async fn list_custom_emojis(
data.page, data.page,
data.limit, data.limit,
) )
.await .await
.map_err(|e| anyhow::anyhow!("Failed to construct custom emojis response: {e}"))?; .map_err(|e| anyhow::anyhow!("Failed to construct custom emojis response: {e}"))?;
Ok(Json(ListCustomEmojisResponse { custom_emojis })) Ok(Json(ListCustomEmojisResponse { custom_emojis }))

5
crates/api_crud/src/tagline/list.rs
View file

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

2
crates/api_crud/src/tagline/mod.rs
View file

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

4
crates/db_views/src/lib.rs
View file

@ -21,8 +21,8 @@ pub mod private_message_view;
pub mod registration_application_view; pub mod registration_application_view;
#[cfg(feature = "full")] #[cfg(feature = "full")]
pub mod site_view; pub mod site_view;
#[cfg(feature = "full")]
pub mod tagline_view;
pub mod structs; pub mod structs;
#[cfg(feature = "full")] #[cfg(feature = "full")]
pub mod tagline_view;
#[cfg(feature = "full")]
pub mod vote_view; pub mod vote_view;

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

@ -18,7 +18,7 @@ use lemmy_db_schema::{
private_message::PrivateMessage, private_message::PrivateMessage,
private_message_report::PrivateMessageReport, private_message_report::PrivateMessageReport,
registration_application::RegistrationApplication, registration_application::RegistrationApplication,
site::Site, site::Site,
tagline::Tagline, tagline::Tagline,
}, },
SubscribedType, SubscribedType,

7
crates/db_views/src/tagline_view.rs
View file

@ -9,7 +9,6 @@ use lemmy_db_schema::{
}; };
impl TaglineView { impl TaglineView {
pub async fn list( pub async fn list(
pool: &mut DbPool<'_>, pool: &mut DbPool<'_>,
for_local_site_id: LocalSiteId, for_local_site_id: LocalSiteId,
@ -29,11 +28,11 @@ impl TaglineView {
let mut result = Vec::new(); let mut result = Vec::new();
for tagline in &taglines { for tagline in &taglines {
result.push(TaglineView { result.push(TaglineView {
tagline: tagline.clone() tagline: tagline.clone(),
}); });
} }
Ok(result) Ok(result)
} }
} }

14
src/api_routes_http.rs
View file

@ -104,10 +104,10 @@ use lemmy_api_crud::{
update::update_community, update::update_community,
}, },
custom_emoji::{ custom_emoji::{
create::create_custom_emoji, create::create_custom_emoji,
delete::delete_custom_emoji, delete::delete_custom_emoji,
list::list_custom_emojis, list::list_custom_emojis,
update::update_custom_emoji update::update_custom_emoji,
}, },
post::{ post::{
create::create_post, create::create_post,
@ -123,7 +123,7 @@ use lemmy_api_crud::{
update::update_private_message, update::update_private_message,
}, },
site::{create::create_site, read::get_site, update::update_site}, site::{create::create_site, read::get_site, update::update_site},
tagline::list::list_taglines, tagline::list::list_taglines,
user::{create::register, delete::delete_account}, user::{create::register, delete::delete_account},
}; };
use lemmy_apub::api::{ use lemmy_apub::api::{
@ -369,8 +369,8 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimitCell) {
.service( .service(
web::scope("/tagline") web::scope("/tagline")
.wrap(rate_limit.message()) .wrap(rate_limit.message())
.route("/list", web::get().to(list_taglines)) .route("/list", web::get().to(list_taglines)),
) ),
); );
cfg.service( cfg.service(
web::scope("/sitemap.xml") web::scope("/sitemap.xml")