Apply linting

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

View file

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

View file

@ -12,7 +12,6 @@ pub async fn list_custom_emojis(
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(),
@ -20,7 +19,7 @@ pub async fn list_custom_emojis(
data.page,
data.limit,
)
.await
.await
.map_err(|e| anyhow::anyhow!("Failed to construct custom emojis response: {e}"))?;
Ok(Json(ListCustomEmojisResponse { custom_emojis }))

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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