🚨 Run clippy pedantic

apps/server/src/config/cors.rs

@@ -21,7 +21,7 @@
 		.map(|origin| origin.to_string())
 		.chain(local_origins)
 		.map(|origin| origin.parse())
-		.filter_map(|res| res.ok())
+		.filter_map(Result::ok)
 		.collect::<Vec<HeaderValue>>()
 }
 
@@ -30,9 +30,10 @@
 
 	let mut allowed_origins = Vec::new();
 	for origin in config.allowed_origins {
-		match origin.parse::<HeaderValue>() {
-			Ok(val) => allowed_origins.push(val),
-			Err(_) => tracing::error!("Failed to parse allowed origin: {:?}", origin),
+		if let Ok(val) = origin.parse::<HeaderValue>() {
+			allowed_origins.push(val)
+		} else {
+			tracing::error!("Failed to parse allowed origin: {:?}", origin);
 		}
 	}
 
@@ -46,7 +47,9 @@
 
 	// Format the local IP with both http and https, and the port. If is_debug is true,
 	// then also add port 3000.
-	let local_orgins = if !local_ip.is_empty() {
+	let local_orgins = if local_ip.is_empty() {
+		vec![]
+	} else {
 		let port = config.port;
 		let mut base = vec![
 			format!("http://{local_ip}:{port}"),
@@ -61,8 +64,6 @@
 		}
 
 		base
-	} else {
-		vec![]
 	};
 
 	let mut cors_layer = CorsLayer::new();

apps/server/src/errors.rs

@@ -290,7 +290,7 @@ impl From<std::io::Error> for APIError {
 }
 
 /// The response body for API errors. This is just a basic JSON response with a status code and a message.
-/// Any axum handlers which return a Result with an Error of APIError will be converted into this response.
+/// Any axum handlers which return a [`Result`] with an Error of [`APIError`] will be converted into this response.
 pub struct APIErrorResponse {
 	status: StatusCode,
 	message: String,

apps/server/src/filter/basic_filter.rs

@@ -257,7 +257,7 @@
 	pub relation_filter: MediaMetadataRelationFilter,
 }
 
-/// A user-friendly representation of a media's read_progress. This will map to
+/// A user-friendly representation of a media's `read_progress`. This will map to
 /// a query condition that will be used to filter the media.
 #[derive(Default, Debug, Clone, Deserialize, Serialize, ToSchema)]
 pub enum ReadStatus {
@@ -278,7 +278,7 @@
 			"unread" => Ok(ReadStatus::Unread),
 			"reading" => Ok(ReadStatus::Reading),
 			"completed" => Ok(ReadStatus::Completed),
-			_ => Err(APIError::BadRequest(format!("invalid read status: {}", s))),
+			_ => Err(APIError::BadRequest(format!("invalid read status: {s}"))),
 		}
 	}
 }

apps/server/src/middleware/auth.rs

@@ -163,8 +163,7 @@
 			let opds_version = request_uri
 				.split('/')
 				.nth(2)
-				.map(|v| v.replace('v', ""))
-				.unwrap_or("1.2".to_string());
+				.map_or("1.2".to_string(), |v| v.replace('v', ""));
 
 			return Err(
 				OPDSBasicAuth::new(opds_version, host_details.url()).into_response()
@@ -664,7 +663,7 @@
 			.get("/test")
 			.add_header(
 				HeaderName::from_str("Authorization").expect("Failed to create header"),
-				HeaderValue::from_str(&format!("Bearer {}", access_token))
+				HeaderValue::from_str(&format!("Bearer {access_token}"))
 					.expect("Failed to create header"),
 			)
 			.await;
@@ -723,7 +722,7 @@
 			.get("/test")
 			.add_header(
 				HeaderName::from_str("Authorization").expect("Failed to create header"),
-				HeaderValue::from_str(&format!("Bearer {}", access_token))
+				HeaderValue::from_str(&format!("Bearer {access_token}"))
 					.expect("Failed to create header"),
 			)
 			.await;

apps/server/src/routers/api/v1/auth.rs

@@ -55,7 +55,7 @@
 			tracing::error!(?error, "Failed to load user's existing session(s)");
 			Vec::default()
 		})
-		.to_owned();
+		.clone();
 	let existing_login_sessions_count = existing_sessions.len() as i32;
 
 	match (for_user.max_sessions_allowed, existing_login_sessions_count) {
@@ -396,7 +396,7 @@
 	let created_user = db
 		.user()
 		.create(
-			input.username.to_owned(),
+			input.username.clone(),
 			hashed_password,
 			vec![user::is_server_owner::set(is_server_owner)],
 		)

apps/server/src/routers/api/v1/book_club.rs

@@ -411,8 +411,7 @@
 	let invalid_role = payload
 		.role
 		.as_ref()
-		.map(|role| *role == BookClubMemberRole::CREATOR)
-		.unwrap_or(false);
+		.is_some_and(|role| *role == BookClubMemberRole::CREATOR);
 
 	if invalid_role {
 		return Err(APIError::BadRequest("Cannot invite a creator".to_string()));
@@ -833,11 +832,14 @@
 					},
 					(Some(start_at), None) => {
 						let start_at = safe_string_to_date(start_at);
-						(start_at, start_at + Duration::days(interval_days as i64))
+						(
+							start_at,
+							start_at + Duration::days(i64::from(interval_days)),
+						)
 					},
 					(None, Some(end_at)) => {
 						let end_at = safe_string_to_date(end_at);
-						(end_at - Duration::days(interval_days as i64), end_at)
+						(end_at - Duration::days(i64::from(interval_days)), end_at)
 					},
 					(None, None) => {
 						let start_at = if let Some(last_end_at) = last_end_at {
@@ -846,7 +848,10 @@
 							Utc::now()
 						};
 
-						(start_at, start_at + Duration::days(interval_days as i64))
+						(
+							start_at,
+							start_at + Duration::days(i64::from(interval_days)),
+						)
 					},
 				};
 
@@ -1000,11 +1005,14 @@
 			},
 			(Some(start_at), None) => {
 				let start_at = safe_string_to_date(start_at);
-				(start_at, start_at + Duration::days(interval_days as i64))
+				(
+					start_at,
+					start_at + Duration::days(i64::from(interval_days)),
+				)
 			},
 			(None, Some(end_at)) => {
 				let end_at = safe_string_to_date(end_at);
-				(end_at - Duration::days(interval_days as i64), end_at)
+				(end_at - Duration::days(i64::from(interval_days)), end_at)
 			},
 			(None, None) => {
 				let start_at = if let Some(last_end_at) = last_end_at {
@@ -1013,7 +1021,10 @@
 					Utc::now()
 				};
 
-				(start_at, start_at + Duration::days(interval_days as i64))
+				(
+					start_at,
+					start_at + Duration::days(i64::from(interval_days)),
+				)
 			},
 		};
 

apps/server/src/routers/api/v1/emailer.rs

@@ -101,7 +101,7 @@
 
 	// TODO: consider auto truncating?
 	if include_params.include_send_history {
-		query = query.with(emailer::send_history::fetch(vec![]))
+		query = query.with(emailer::send_history::fetch(vec![]));
 	}
 
 	let emailers = query

apps/server/src/routers/api/v1/epub.rs

@@ -74,10 +74,7 @@
 	if let Some(book) = result {
 		Ok(Json(Epub::try_from(book)?))
 	} else {
-		Err(APIError::NotFound(format!(
-			"Media with id {} not found",
-			id
-		)))
+		Err(APIError::NotFound(format!("Media with id {id} not found")))
 	}
 }
 
@@ -281,10 +278,7 @@
 	if let Some(book) = result {
 		Ok(EpubProcessor::get_chapter(book.path.as_str(), chapter)?.into())
 	} else {
-		Err(APIError::NotFound(format!(
-			"Media with id {} not found",
-			id
-		)))
+		Err(APIError::NotFound(format!("Media with id {id} not found")))
 	}
 }
 
@@ -323,9 +317,6 @@
 
 		Ok(BufferResponse::new(content_type, buffer))
 	} else {
-		Err(APIError::NotFound(format!(
-			"Media with id {} not found",
-			id
-		)))
+		Err(APIError::NotFound(format!("Media with id {id} not found")))
 	}
 }

apps/server/src/routers/api/v1/filesystem.rs

@@ -103,7 +103,7 @@
 	let listing = std::fs::read_dir(start_path)?;
 
 	let files = listing
-		.filter_map(|res| res.ok())
+		.filter_map(Result::ok)
 		.filter_map(filter_if_hidden)
 		.map(|entry| DirectoryListingFile::from(entry.path()))
 		.collect();
@@ -193,7 +193,7 @@
 				};
 
 				let drive_text = match volume_name {
-					Some(name) => format!("{} ({})", drive_letter, name),
+					Some(name) => format!("{drive_letter} ({name})"),
 					None => drive_letter.clone(),
 				};
 

apps/server/src/routers/api/v1/job.rs

@@ -107,10 +107,10 @@
 					},
 					Pagination::Cursor(cursor_query) => {
 						if let Some(cursor) = cursor_query.cursor {
-							query = query.cursor(job::id::equals(cursor)).skip(1)
+							query = query.cursor(job::id::equals(cursor)).skip(1);
 						}
 						if let Some(limit) = cursor_query.limit {
-							query = query.take(limit)
+							query = query.take(limit);
 						}
 					},
 					_ => unreachable!(),
@@ -213,13 +213,12 @@
 	))
 	.map_err(|e| {
 		APIError::InternalServerError(format!(
-			"Failed to send command to job manager: {}",
-			e
+			"Failed to send command to job manager: {e}"
 		))
 	})?;
 
 	Ok(task_rx.await.map_err(|e| {
-		APIError::InternalServerError(format!("Failed to get cancel confirmation: {}", e))
+		APIError::InternalServerError(format!("Failed to get cancel confirmation: {e}"))
 	})??)
 }