From 2acdcc6d2f54b64b8fa25dbb9256819fb556df21 Mon Sep 17 00:00:00 2001
From: Zynh Ludwig <zynh0722@gmail.com>
Date: Thu, 29 Aug 2024 23:40:53 -0700
Subject: [PATCH] fix remaining text

---
 src/router/link.rs | 16 ++++++++++------
 src/views/links.rs |  8 ++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/router/link.rs b/src/router/link.rs
index c76c449..ab3dfe1 100644
--- a/src/router/link.rs
+++ b/src/router/link.rs
@@ -53,6 +53,15 @@ async fn link_delete(
     Ok(Html("".to_string()))
 }
 
+#[inline]
+pub fn get_remaining_text(downloads_remaining: u8) -> String {
+    let plural = if downloads_remaining > 1 { "s" } else { "" };
+    format!(
+        "You have {} download{} remaining!",
+        downloads_remaining, plural
+    )
+}
+
 async fn remaining(
     State(state): State<AppState>,
     axum::extract::Path(id): axum::extract::Path<String>,
@@ -60,12 +69,7 @@ async fn remaining(
     let records = state.records.lock().await;
     if let Some(record) = records.get(&id) {
         let downloads_remaining = record.downloads_remaining();
-        let plural = if downloads_remaining > 1 { "s" } else { "" };
-        let out = format!(
-            "You have {} download{} remaining!",
-            downloads_remaining, plural
-        );
-        Html(out)
+        Html(get_remaining_text(downloads_remaining))
     } else {
         Html("?".to_string())
     }
diff --git a/src/views/links.rs b/src/views/links.rs
index e0a1624..2297c00 100644
--- a/src/views/links.rs
+++ b/src/views/links.rs
@@ -1,5 +1,6 @@
 use leptos::{component, view, IntoView};
 
+use crate::link::get_remaining_text;
 use crate::state::UploadRecord;
 use crate::HtmxPage;
 
@@ -19,7 +20,6 @@ pub fn DownloadLinkPage(id: String, record: UploadRecord) -> impl IntoView {
 #[component]
 pub fn LinkView(id: String, record: UploadRecord) -> impl IntoView {
     let downloads_remaining = record.max_downloads - record.downloads;
-    let plural = if downloads_remaining > 1 { "s" } else { "" };
     view! {
         <div class="column-container">
             <div class="link-wrapper">
@@ -33,11 +33,7 @@ pub fn LinkView(id: String, record: UploadRecord) -> impl IntoView {
                 hx-get="/link/{id}/remaining"
                 hx-trigger="click from:#link delay:0.2s, every 10s"
             >
-                You have
-                {record.downloads_remaining()}
-                download
-                {plural}
-                remaining!
+                {get_remaining_text(downloads_remaining)}
             </div>
             <button class="return-button" onclick="clipboard()">
                 Copy to Clipboard