chore: lint code

crates/api_admin/src/routes/block_url.rs

@@ -28,23 +28,21 @@ pub async fn block_url(
 ) -> Result<(StatusCode, Json<BlockUrlResult>), AppError> {
     match &query.url {
         url if url.query().is_some() => Err(AppError::new(
-            format!(
-                "wrong url: {} (can't contain search params)",
-                url.to_string()
-            ),
+            format!("wrong url: {} (can't contain search params)", url),
             None,
             Some(StatusCode::BAD_REQUEST),
         )),
-        _ => match BlockedUrl::find_by_id(&query.url.to_string())
-            .one(&data.conn)
-            .await?
-        {
-            Some(url) => Err(AppError::new(
-                format!("The url already blocked: {}", url.id),
-                None,
-                Some(StatusCode::BAD_REQUEST),
-            )),
-            None => {
+        _ =>
+            if let Some(url) = BlockedUrl::find_by_id(query.url.to_string())
+                .one(&data.conn)
+                .await?
+            {
+                Err(AppError::new(
+                    format!("The url already blocked: {}", url.id),
+                    None,
+                    Some(StatusCode::BAD_REQUEST),
+                ))
+            } else {
                 blocked_url::ActiveModel {
                     id: Set(query.url.to_string()),
                     is_instance: Set(query.url.path().eq("/")),
@@ -56,13 +54,9 @@ pub async fn block_url(
                     StatusCode::OK,
                     Json(BlockUrlResult {
                         url: query.url.clone(),
-                        message: format!(
-                            "The url was successfully blocked: {}",
-                            &query.url.to_string()
-                        ),
+                        message: format!("The url was successfully blocked: {}", &query.url),
                     }),
                 ))
             },
-        },
     }
 }

crates/api_admin/src/routes/unblock_url.rs

@@ -26,7 +26,7 @@ pub async fn unblock_url(
     data: Data<AppData>,
     query: Query<BlockUrlQuery>,
 ) -> Result<(StatusCode, Json<BlockUrlResult>), AppError> {
-    match BlockedUrl::find_by_id(&query.url.to_string())
+    match BlockedUrl::find_by_id(query.url.to_string())
         .one(&data.conn)
         .await?
     {
@@ -37,15 +37,12 @@ pub async fn unblock_url(
                 StatusCode::OK,
                 Json(BlockUrlResult {
                     url: query.url.clone(),
-                    message: format!(
-                        "The url was successfully unblocked: {}",
-                        &query.url.to_string()
-                    ),
+                    message: format!("The url was successfully unblocked: {}", &query.url),
                 }),
             ))
         },
         None => Err(AppError::new(
-            format!("The url doesn't exist: {}", query.url.to_string()),
+            format!("The url doesn't exist: {}", query.url),
             None,
             Some(StatusCode::BAD_REQUEST),
         )),

crates/api_apub/src/lib.rs

@@ -38,6 +38,7 @@ pub const TAG: &str = "apub";
 )]
 pub struct ApubApi;
 
+#[must_use]
 pub fn routes() -> OpenApiRouter {
     OpenApiRouter::with_openapi(ApubApi::openapi())
         .merge(activities::routes())

crates/api_apub/src/users/user_followers.rs

@@ -80,7 +80,7 @@ pub async fn handler(
                             .into_iter()
                             .map(|follow| Url::parse(&follow.id))
                             .filter_map(Result::ok)
-                            .map(|url| serde_json::to_value(url))
+                            .map(serde_json::to_value)
                             .filter_map(Result::ok)
                             .collect(),
                         total.number_of_pages,

crates/api_mastodon/src/entities/instance.rs

@@ -32,15 +32,15 @@ impl Instance {
                 .env
                 .hatsu_node_name
                 .as_deref()
-                .unwrap_or_else(|| "Hatsu")
+                .unwrap_or("Hatsu")
                 .to_string(),
             version: String::from(VERSION),
             source_url: Url::parse("https://github.com/importantimport/hatsu")?,
             description: data
                 .env
                 .hatsu_node_description
                 .as_deref()
-                .unwrap_or_else(|| env!("CARGO_PKG_DESCRIPTION"))
+                .unwrap_or(env!("CARGO_PKG_DESCRIPTION"))
                 .to_string(),
             usage: json!({
                 "users": {

crates/api_mastodon/src/routes/mod.rs

@@ -31,6 +31,7 @@ pub const TAG: &str = "mastodon";
 )]
 pub struct MastodonApi;
 
+#[must_use]
 pub fn routes() -> OpenApiRouter {
     OpenApiRouter::with_openapi(MastodonApi::openapi())
         .merge(instance::routes())

crates/apub/src/activities/create_or_update/note.rs

@@ -98,7 +98,7 @@ impl ActivityHandler for CreateOrUpdateNote {
     async fn verify(&self, data: &Data<Self::DataType>) -> Result<(), Self::Error> {
         // TODO
         ApubPost::verify(&self.object, &self.id, data).await?;
-        verify_blocked(&self.actor(), data).await?;
+        verify_blocked(self.actor(), data).await?;
         Ok(())
     }
 

crates/apub/src/activities/following/follow.rs

@@ -61,7 +61,7 @@ impl ActivityHandler for Follow {
 
     async fn verify(&self, data: &Data<Self::DataType>) -> Result<(), Self::Error> {
         // TODO
-        verify_blocked(&self.actor(), data).await?;
+        verify_blocked(self.actor(), data).await?;
         Ok(())
     }
 

crates/apub/src/activities/following/undo_follow.rs

@@ -46,7 +46,7 @@ impl ActivityHandler for UndoFollow {
 
     async fn verify(&self, data: &Data<Self::DataType>) -> Result<(), Self::Error> {
         // TODO
-        verify_blocked(&self.actor(), data).await?;
+        verify_blocked(self.actor(), data).await?;
         Ok(())
     }
 

crates/apub/src/activities/like_or_announce/like_or_announce.rs

@@ -51,7 +51,7 @@ impl ActivityHandler for LikeOrAnnounce {
 
     async fn verify(&self, data: &Data<Self::DataType>) -> Result<(), Self::Error> {
         // TODO
-        verify_blocked(&self.actor(), data).await?;
+        verify_blocked(self.actor(), data).await?;
         Ok(())
     }
 

crates/apub/src/activities/like_or_announce/undo_like_or_announce.rs

@@ -39,7 +39,7 @@ impl ActivityHandler for UndoLikeOrAnnounce {
 
     async fn verify(&self, data: &Data<Self::DataType>) -> Result<(), Self::Error> {
         // TODO
-        verify_blocked(&self.actor(), data).await?;
+        verify_blocked(self.actor(), data).await?;
         Ok(())
     }
 

crates/apub/src/actors/db_user.rs

@@ -129,7 +129,7 @@ impl Object for ApubUser {
             icon: self
                 .icon
                 .as_deref()
-                .and_then(|icon| Url::parse(&icon).map_or(None, |url| Some(UserImage::new(url)))),
+                .and_then(|icon| Url::parse(icon).map_or(None, |url| Some(UserImage::new(url)))),
             image: self.hatsu.clone().and_then(|hatsu| {
                 hatsu.banner_image.and_then(|image| {
                     Url::parse(&image).map_or(None, |url| Some(UserImage::new(url)))

crates/apub/src/actors/db_user_impl.rs

@@ -64,7 +64,7 @@ impl ApubUser {
             hatsu: self.hatsu.clone().map(UserFeedHatsu::from_db),
             title: self.name.clone(),
             description: self.summary.clone(),
-            icon: self.icon.as_deref().and_then(|url| Url::parse(&url).ok()),
+            icon: self.icon.as_deref().and_then(|url| Url::parse(url).ok()),
             language: self.language.clone(),
             feed_url: Url::parse("https://hatsu.local").unwrap(),
             next_url: Option::default(),

crates/apub/src/objects/note.rs

@@ -138,7 +138,10 @@ impl Note {
             to: vec![public()],
             // Leaving a CC here to retain compatibility, figured I should CC followers instead of public twice
             cc: vec![Url::parse(&format!("{}/followers", actor.id()))?],
-            content_map: generate_map(&content, json.language.or(top_level.language.clone())),
+            content_map: generate_map(
+                &content,
+                json.language.or_else(|| top_level.language.clone()),
+            ),
             content,
             source: Some(serde_json::to_value(NoteSource::new(source))?),
             tag: json.tags.map_or_else(Vec::new, |tags| {

crates/apub/src/utils/verify_blocked.rs

@@ -27,7 +27,7 @@ pub async fn verify_blocked(url: &Url, data: &Data<AppData>) -> Result<(), AppEr
         .any(|actor| url.eq(&actor))
     {
         Err(AppError::new(
-            format!("blocked actor: {}", url),
+            format!("blocked actor: {url}"),
             None,
             Some(StatusCode::BAD_REQUEST),
         ))

crates/backend/src/lib.rs

@@ -49,7 +49,7 @@ pub async fn run(federation_config: FederationConfig<AppData>) -> Result<(), App
             .with_graceful_shutdown(async {
                 hatsu_utils::shutdown_signal()
                     .await
-                    .expect("failed to install graceful shutdown handler")
+                    .expect("failed to install graceful shutdown handler");
             })
             .await?;
 

crates/db_migration/src/m20240131_000001_user.rs

@@ -1,4 +1,7 @@
-use sea_orm_migration::{prelude::*, schema::*};
+use sea_orm_migration::{
+    prelude::*,
+    schema::{boolean, string, string_null},
+};
 
 #[derive(DeriveMigrationName)]
 pub struct Migration;

crates/db_migration/src/m20240131_000002_user_feed_item.rs

@@ -1,4 +1,7 @@
-use sea_orm_migration::{prelude::*, schema::*};
+use sea_orm_migration::{
+    prelude::*,
+    schema::{string, string_null},
+};
 
 #[derive(DeriveMigrationName)]
 pub struct Migration;

crates/db_migration/src/m20240131_000003_post.rs

@@ -1,4 +1,7 @@
-use sea_orm_migration::{prelude::*, schema::*};
+use sea_orm_migration::{
+    prelude::*,
+    schema::{boolean, string, string_null, text},
+};
 
 #[derive(DeriveMigrationName)]
 pub struct Migration;

crates/db_migration/src/m20240131_000004_activity.rs

@@ -1,4 +1,7 @@
-use sea_orm_migration::{prelude::*, schema::*};
+use sea_orm_migration::{
+    prelude::*,
+    schema::{json, string, string_null},
+};
 
 #[derive(DeriveMigrationName)]
 pub struct Migration;

crates/db_migration/src/m20240131_000005_received_follow.rs

@@ -1,4 +1,7 @@
-use sea_orm_migration::{prelude::*, schema::*};
+use sea_orm_migration::{
+    prelude::*,
+    schema::{string, text_null},
+};
 
 #[derive(DeriveMigrationName)]
 pub struct Migration;

crates/db_migration/src/m20240501_000001_received_like.rs

@@ -1,4 +1,4 @@
-use sea_orm_migration::{prelude::*, schema::*};
+use sea_orm_migration::{prelude::*, schema::string};
 
 #[derive(DeriveMigrationName)]
 pub struct Migration;

crates/db_migration/src/m20240501_000002_received_announce.rs

@@ -1,4 +1,4 @@
-use sea_orm_migration::{prelude::*, schema::*};
+use sea_orm_migration::{prelude::*, schema::string};
 
 #[derive(DeriveMigrationName)]
 pub struct Migration;

crates/db_migration/src/m20240515_000001_user_feed_hatsu_extension.rs

@@ -1,4 +1,7 @@
-use sea_orm_migration::{prelude::*, schema::*};
+use sea_orm_migration::{
+    prelude::*,
+    schema::{json_null, string_null},
+};
 
 use crate::{m20240131_000001_user::User, m20240131_000002_user_feed_item::UserFeedItem};
 

crates/db_migration/src/m20240515_000002_user_feed.rs

@@ -1,4 +1,7 @@
-use sea_orm_migration::{prelude::*, schema::*};
+use sea_orm_migration::{
+    prelude::*,
+    schema::{json_null, string_null},
+};
 
 use crate::m20240131_000001_user::User;
 

crates/db_migration/src/m20240926_000001_blocked_url.rs

@@ -1,4 +1,7 @@
-use sea_orm_migration::{prelude::*, schema::*};
+use sea_orm_migration::{
+    prelude::*,
+    schema::{boolean, string},
+};
 
 #[derive(DeriveMigrationName)]
 pub struct Migration;

crates/db_migration/src/m20241028_000001_user_language.rs

@@ -1,4 +1,4 @@
-use sea_orm_migration::{prelude::*, schema::*};
+use sea_orm_migration::{prelude::*, schema::string_null};
 
 use crate::m20240131_000001_user::User;
 

crates/feed/src/user_feed_top_level.rs

@@ -76,8 +76,8 @@ impl UserFeedTopLevel {
                 None => String::from("untitled"),
             },
             description: feed.description.map(|text| text.content),
-            icon: feed.icon.map_or(
-                feed.logo.and_then(|image| Url::parse(&image.uri).ok()),
+            icon: feed.icon.map_or_else(
+                || feed.logo.and_then(|image| Url::parse(&image.uri).ok()),
                 |image| Url::parse(&image.uri).ok(),
             ),
             language: feed.language,

crates/utils/src/version.rs

@@ -1 +1 @@
-pub const VERSION: &'static str = env!("CARGO_PKG_VERSION");
+pub const VERSION: &str = env!("CARGO_PKG_VERSION");