From 13352ef42532d1f96e3b54059756d8b6e3c7f374 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Thu, 24 Sep 2020 04:39:19 +0200
Subject: Add embedded favicon (fixes #364)

---
 src/file_upload.rs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/file_upload.rs')

diff --git a/src/file_upload.rs b/src/file_upload.rs
index 136bd45..394afbc 100644
--- a/src/file_upload.rs
+++ b/src/file_upload.rs
@@ -111,6 +111,7 @@ pub fn upload_file(
     payload: actix_web::web::Payload,
     default_color_scheme: ColorScheme,
     uses_random_route: bool,
+    favicon_route: String,
 ) -> Pin<Box<dyn Future<Output = Result<HttpResponse, actix_web::Error>>>> {
     let conf = req.app_data::<crate::MiniserveConfig>().unwrap();
     let return_path = if let Some(header) = req.headers().get(header::REFERER) {
@@ -139,6 +140,7 @@ pub fn upload_file(
                 color_scheme,
                 default_color_scheme,
                 uses_random_route,
+                &favicon_route,
             ));
         }
     };
@@ -159,6 +161,7 @@ pub fn upload_file(
                 color_scheme,
                 default_color_scheme,
                 uses_random_route,
+                &favicon_route,
             ));
         }
     };
@@ -179,6 +182,7 @@ pub fn upload_file(
                 color_scheme,
                 default_color_scheme,
                 uses_random_route,
+                &favicon_route,
             ));
         }
     };
@@ -204,6 +208,7 @@ pub fn upload_file(
                     color_scheme,
                     default_color_scheme,
                     uses_random_route,
+                    &favicon_route,
                 ),
             }),
     )
@@ -220,6 +225,7 @@ fn create_error_response(
     color_scheme: ColorScheme,
     default_color_scheme: ColorScheme,
     uses_random_route: bool,
+    favicon_route: &str,
 ) -> future::Ready<Result<HttpResponse, actix_web::Error>> {
     errors::log_error_chain(description.to_string());
     future::ok(
@@ -236,6 +242,7 @@ fn create_error_response(
                     default_color_scheme,
                     true,
                     !uses_random_route,
+                    &favicon_route,
                 )
                 .into_string(),
             ),
-- 
cgit v1.2.3