From f080854b84d80f6063b4f9392d059a84ec09e66c Mon Sep 17 00:00:00 2001
From: Shav Kinderlehrer <shav@trinket.icu>
Date: Sun, 7 Apr 2024 15:35:46 -0400
Subject: Version 1.0

---
 src/get.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/get.rs')

diff --git a/src/get.rs b/src/get.rs
index e6b7426..61c5dd2 100644
--- a/src/get.rs
+++ b/src/get.rs
@@ -43,9 +43,7 @@ pub async fn id(
     Path(id): Path<String>,
 ) -> impl IntoResponse {
     let mut show_request = false;
-    let ip = get_ip(headers.clone(), addr, state.clone())
-        .await
-        .unwrap_or_default();
+    let ip = get_ip(&headers, addr, &state).unwrap_or_default();
     log!("Request for '{}' from {}", id.clone(), ip);
     let mut use_id = id;
     if use_id.ends_with('+') {
@@ -96,7 +94,7 @@ pub async fn id(
 
 async fn save_analytics(headers: HeaderMap, item: UrlRow, addr: SocketAddr, state: ServerState) {
     let id = item.id;
-    let ip = get_ip(headers.clone(), addr, state.clone()).await;
+    let ip = get_ip(&headers, addr, &state);
     let referer = match headers.get("referer") {
         Some(it) => {
             if let Ok(i) = it.to_str() {
@@ -136,7 +134,7 @@ VALUES ($1,$2,$3,$4)
     }
 }
 
-async fn get_ip(headers: HeaderMap, addr: SocketAddr, state: ServerState) -> Option<String> {
+fn get_ip(headers: &HeaderMap, addr: SocketAddr, state: &ServerState) -> Option<String> {
     if state.behind_proxy {
         match headers.get("x-real-ip") {
             Some(it) => {
-- 
cgit v1.2.3