chore: Cleanup

src/web/mod.rs

@@ -34,12 +34,11 @@ struct Error {
 		}
 
 		let status = match &self {
-			| Self::ValidationError(_) => StatusCode::BAD_REQUEST,
-			| Self::BadRequest(_) => StatusCode::BAD_REQUEST,
+			| Self::ValidationError(_) | Self::BadRequest(_) => StatusCode::BAD_REQUEST,
 			| _ => StatusCode::INTERNAL_SERVER_ERROR,
 		};
 
-		let template = Error { error: self, status: status.clone() };
+		let template = Error { error: self, status };
 
 		if let Ok(body) = template.render() {
 			(status, Html(body)).into_response()

src/web/pages/components/mod.rs

@@ -1,8 +1,7 @@
 use askama::{Template, filters::HtmlSafe};
 use base64::Engine;
-use conduwuit_core::{Result, result::FlatOk, utils::TryFutureExtExt};
+use conduwuit_core::result::FlatOk;
 use conduwuit_service::Services;
-use futures::TryFutureExt;
 use ruma::UserId;
 
 pub(super) mod form;
@@ -32,7 +31,7 @@ pub(super) struct UserCard<'a> {
 impl HtmlSafe for UserCard<'_> {}
 
 impl<'a> UserCard<'a> {
-	pub async fn for_local_user(services: &Services, user_id: &'a UserId) -> Self {
+	pub(super) async fn for_local_user(services: &Services, user_id: &'a UserId) -> Self {
 		let display_name = services.users.displayname(user_id).await.ok();
 
 		let avatar_src = async {

src/web/pages/password_reset.rs

@@ -3,10 +3,9 @@
 	Router,
 	extract::{Query, State},
 	http::StatusCode,
-	response::{Html, IntoResponse, Redirect, Response},
+	response::{Html, IntoResponse, Response},
 	routing::get,
 };
-use ruma::{UserId, user_id};
 use serde::Deserialize;
 use validator::Validate;
 
@@ -15,8 +14,6 @@
 	pages::components::{UserCard, form::Form},
 };
 
-const TEST: &str = "data:image/png;base64,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
Line truncated
-
 #[derive(Deserialize)]
 struct PasswordResetQuery {
 	token: String,

src/web/pages/templates/_components/form.html.j2

@@ -19,6 +19,7 @@
             <input
                 type="{{ input.input_type }}"
                 id="{{ input.id }}"
+                autocomplete="{{ input.autocomplete }}
                 {% if input.type_name.is_some() %}name="{{ input.id }}"{% endif %}
                 {% if input.required %}required{% endif %}
             >