clippy

src/backend/api/instance.rs

@@ -1,8 +1,13 @@
 use crate::{
     backend::{database::IbisData, error::MyResult, federation::activities::follow::Follow},
     common::{
-        DbInstance, FollowInstance, FollowInstanceResponse, GetInstance, InstanceView,
+        DbInstance,
-        LocalUserView, ResolveObject,
+        FollowInstance,
+        FollowInstanceResponse,
+        GetInstance,
+        InstanceView,
+        LocalUserView,
+        ResolveObject,
     },
 };
 use activitypub_federation::{config::Data, fetch::object_id::ObjectId};

src/backend/mod.rs

@@ -7,7 +7,13 @@ use crate::{
         utils::generate_activity_id,
     },
     common::{
-        utils::http_protocol_str, Auth, DbArticle, DbInstance, DbPerson, EditVersion, AUTH_COOKIE,
+        utils::http_protocol_str,
+        Auth,
+        DbArticle,
+        DbInstance,
+        DbPerson,
+        EditVersion,
+        AUTH_COOKIE,
         MAIN_PAGE_NAME,
     },
     frontend::app::{shell, App},
@@ -26,7 +32,8 @@ use axum::{
     middleware::Next,
     response::{IntoResponse, Response},
     routing::get,
-    Router, ServiceExt,
+    Router,
+    ServiceExt,
 };
 use axum_extra::extract::CookieJar;
 use axum_macros::debug_middleware;
@@ -37,7 +44,8 @@ use diesel::{
 };
 use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
 use federation::objects::{
-    articles_collection::local_articles_url, instance_collection::linked_instances_url,
+    articles_collection::local_articles_url,
+    instance_collection::linked_instances_url,
 };
 use leptos::prelude::*;
 use leptos_axum::{generate_route_list, LeptosRoutes};

src/common/mod.rs

@@ -246,7 +246,7 @@ pub struct FollowInstance {
 
 #[derive(Deserialize, Serialize, Debug)]
 pub struct FollowInstanceResponse {
-    pub success: bool
+    pub success: bool,
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug)]

src/frontend/api.rs

@@ -2,19 +2,38 @@ use crate::{
     common::{
         newtypes::{ArticleId, ConflictId},
         utils::http_protocol_str,
-        ApiConflict, ApproveArticleForm, ArticleView, CreateArticleForm, DbArticle, DbInstance,
+        ApiConflict,
-        DbPerson, DeleteConflictForm, EditArticleForm, FollowInstance, FollowInstanceResponse,
+        ApproveArticleForm,
-        ForkArticleForm, GetArticleForm, GetInstance, GetUserForm, InstanceView, ListArticlesForm,
+        ArticleView,
-        LocalUserView, LoginUserForm, Notification, ProtectArticleForm, RegisterUserForm,
+        CreateArticleForm,
-        ResolveObject, SearchArticleForm, SiteView,
+        DbArticle,
+        DbInstance,
+        DbPerson,
+        DeleteConflictForm,
+        EditArticleForm,
+        FollowInstance,
+        FollowInstanceResponse,
+        ForkArticleForm,
+        GetArticleForm,
+        GetInstance,
+        GetUserForm,
+        InstanceView,
+        ListArticlesForm,
+        LocalUserView,
+        LoginUserForm,
+        Notification,
+        ProtectArticleForm,
+        RegisterUserForm,
+        ResolveObject,
+        SearchArticleForm,
+        SiteView,
     },
     frontend::error::MyResult,
 };
 use anyhow::anyhow;
 use http::*;
 use serde::{Deserialize, Serialize};
-use std::fmt::Debug;
+use std::{fmt::Debug, sync::LazyLock};
-use std::sync::LazyLock;
 use url::Url;
 
 pub static CLIENT: LazyLock<ApiClient> = LazyLock::new(|| {
@@ -39,12 +58,9 @@ pub struct ApiClient {
 impl ApiClient {
     #[cfg(feature = "ssr")]
     pub fn new(client: reqwest::Client, hostname_: Option<String>) -> Self {
-        let mut hostname;
-        let ssl;
         use leptos::config::get_config_from_str;
         let leptos_options = get_config_from_str(include_str!("../../Cargo.toml")).unwrap();
-        hostname = leptos_options.site_addr.to_string();
+        let mut hostname = leptos_options.site_addr.to_string();
-        ssl = false;
         // required for tests
         if let Some(hostname_) = hostname_ {
             hostname = hostname_;
@@ -52,7 +68,7 @@ impl ApiClient {
         Self {
             client,
             hostname,
-            ssl,
+            ssl: false,
         }
     }
     #[cfg(not(feature = "ssr"))]
@@ -177,10 +193,7 @@ impl ApiClient {
     }
 
     pub async fn logout(&self) -> MyResult<()> {
-        Ok(self
+        self.get("/api/v1/account/logout", None::<()>).await
-            .get("/api/v1/account/logout", None::<()>)
-            .await
-            .unwrap())
     }
 
     pub async fn fork_article(&self, form: &ForkArticleForm) -> MyResult<ArticleView> {
@@ -273,12 +286,13 @@ impl ApiClient {
 
             let path_with_endpoint = self.request_endpoint(path);
             let path = if method == Method::GET {
+                // Cannot pass the struct directly but need to convert it manually
+                // https://github.com/rustwasm/gloo/issues/378
                 let query = serde_urlencoded::to_string(&params).unwrap();
                 format!("{path_with_endpoint}?{query}")
             } else {
                 path_with_endpoint
             };
-            log::info!("{path}");
             let builder = RequestBuilder::new(&path)
                 .method(method.clone())
                 .abort_signal(abort_signal.as_ref())

src/frontend/app.rs

@@ -6,8 +6,12 @@ use crate::{
         dark_mode::DarkMode,
         pages::{
             article::{
-                actions::ArticleActions, create::CreateArticle, edit::EditArticle,
+                actions::ArticleActions,
-                history::ArticleHistory, list::ListArticles, read::ReadArticle,
+                create::CreateArticle,
+                edit::EditArticle,
+                history::ArticleHistory,
+                list::ListArticles,
+                read::ReadArticle,
             },
             diff::EditDiff,
             instance::{details::InstanceDetails, list::ListInstances},

src/frontend/components/nav.rs

@@ -51,7 +51,7 @@ pub fn Nav() -> impl IntoView {
                             <A href="/article/list">"Articles"</A>
                         </li>
                         <Transition>
-                            <Show when=move || is_logged_in()>
+                            <Show when=is_logged_in>
                                 <li>
                                     <A href="/article/create">"Create Article"</A>
                                 </li>

src/frontend/pages/article/list.rs

@@ -32,9 +32,6 @@ pub fn ListArticles() -> impl IntoView {
                     class="btn rounded-r-none"
                     node_ref=button_only_local
                     on:click=move |_| {
-                        // TODO
-                        //button_all.get().map(|c| c.class("btn-primary", false));
-                        //button_only_local.get().map(|c| c.class("btn-primary", true));
                         set_only_local.set(true);
                     }
                 />
@@ -44,8 +41,6 @@ pub fn ListArticles() -> impl IntoView {
                     class="btn btn-primary rounded-l-none"
                     node_ref=button_all
                     on:click=move |_| {
-                        //button_all.get().map(|c| c.class("btn-primary", true));
-                        //button_only_local.get().map(|c| c.class("btn-primary", false));
                         set_only_local.set(false);
                     }
                 />