fast redirect option

Author: HookedBehemoth

src/api/legacy_article.rs

@@ -54,7 +54,7 @@ pub struct LegacyArticleBodyItem {
 pub fn fetch_legacy_article(client: &Client, path: &str) -> Result<ureq::Response, ureq::Error> {
     let link = format!("https://www.reuters.com{path}");
 
-    get(&client, &link).call()
+    get(client, &link).call()
 }
 
 pub fn parse_legacy_article(request: ureq::Response) -> ApiResult<LegacyArticle> {

src/main.rs

@@ -241,11 +241,25 @@ fn main() {
 }
 
 fn render_api_error(err: &ApiError, path: &str, settings: &Settings) -> rouille::Response {
+    if settings.fast_redirect {
+        if let ApiError::Redirect(code, location) = err {
+            return rouille::Response {
+                status_code: *code,
+                headers: vec![
+                    ("Location".into(), strip_prefix(location).to_owned().into()),
+                    ("Cache-Control".into(), "public, max-age=31536000".into()),
+                ],
+                data: rouille::ResponseBody::empty(),
+                upgrade: None,
+            };
+        }
+    }
+
     let (status, title) = match err {
         ApiError::Empty | ApiError::External(404, _) => {
             (404, "404 - Content not found".to_string())
         }
-        ApiError::Redirect(_, _) => (200, format!("Redirect found")),
+        ApiError::Redirect(_, _) => (200, "Redirect found".to_string()),
         ApiError::External(code, _) => (*code, format!("{code} - External error")),
         ApiError::Internal(message) => (500, format!("500 - Internal server error {message}")),
     };

src/render/images.rs

@@ -6,7 +6,7 @@ pub fn render_image(thumbnail: &Image, settings: &Settings) -> maud::Markup {
     let resizer_url = &thumbnail.resizer_url;
 
     let url = if settings.proxy_images {
-        if let Some(base_path) = proxy::strip_prefix(&resizer_url) {
+        if let Some(base_path) = proxy::strip_prefix(resizer_url) {
             format!("/proxy/{base_path}")
         } else {
             return maud::html! {

src/routes/article.rs

@@ -1,5 +1,5 @@
 use crate::{
-    api::{article::fetch_article_by_url, common::Image, error::ApiResult},
+    api::{article::fetch_article_by_url, error::ApiResult},
     client::Client,
     render::{byline, images::render_image},
     settings::Settings,

src/routes/settings.rs

@@ -1,15 +1,16 @@
 use maud::{html, Markup};
-use rouille::{input, post_input, try_or_400, Request, Response};
+use rouille::{post_input, try_or_400, Request, Response};
 
 use crate::{
     document,
-    settings::{Settings, EMBED_EMBEDS, EMBED_IMAGES, PROXY_IMAGES, REDIRECT_TIMER},
+    settings::{Settings, EMBED_EMBEDS, EMBED_IMAGES, FAST_REDIRECT, PROXY_IMAGES, REDIRECT_TIMER},
 };
 
 fn render_settings(
     embed_images: bool,
     embed_embeds: bool,
     proxy_images: bool,
+    fast_redirect: bool,
     redirect_timer: u32,
 ) -> Markup {
     document!(
@@ -35,6 +36,11 @@ fn render_settings(
                     input type="checkbox" id=(PROXY_IMAGES) name=(PROXY_IMAGES) checked[proxy_images] {}
                 }
 
+                label for=(FAST_REDIRECT) {
+                    "Use fast redirect"
+                    input type="checkbox" id=(FAST_REDIRECT) name=(FAST_REDIRECT) checked[fast_redirect] {}
+                }
+
                 label for=(REDIRECT_TIMER) {
                     "Redirect timer"
                     input type="number" id=(REDIRECT_TIMER) name=(REDIRECT_TIMER) value=(redirect_timer) {}
@@ -52,6 +58,7 @@ fn store_settings(
     embed_images: bool,
     embed_embeds: bool,
     proxy_images: bool,
+    fast_redirect: bool,
     redirect_timer: u32,
 ) -> Response {
     Response::redirect_303("/settings")
@@ -67,6 +74,10 @@ fn store_settings(
             "Set-Cookie",
             format!("{PROXY_IMAGES}={}; Path=/; SameSite=Strict", proxy_images),
         )
+        .with_additional_header(
+            "Set-Cookie",
+            format!("{FAST_REDIRECT}={}; Path=/; SameSite=Strict", fast_redirect),
+        )
         .with_additional_header(
             "Set-Cookie",
             format!(
@@ -82,20 +93,23 @@ pub fn handle_settings(request: &Request, settings: &Settings) -> Response {
             embed_images: bool,
             embed_embeds: bool,
             proxy_images: bool,
+            fast_redirect: bool,
             redirect_timer: i32,
         }));
 
         store_settings(
             settings.embed_images,
             settings.embed_embeds,
             settings.proxy_images,
+            settings.fast_redirect,
             settings.redirect_timer.clamp(0, 600) as u32,
         )
     } else {
         let page = render_settings(
             settings.embed_images,
             settings.embed_embeds,
             settings.proxy_images,
+            settings.fast_redirect,
             settings.redirect_timer,
         );
         Response::html(page).with_status_code(200)

src/settings.rs

@@ -3,12 +3,14 @@ use rouille::{input, Request};
 pub const EMBED_IMAGES: &str = "embed_images";
 pub const EMBED_EMBEDS: &str = "embed_embeds";
 pub const PROXY_IMAGES: &str = "proxy_images";
+pub const FAST_REDIRECT: &str = "fast_redirect";
 pub const REDIRECT_TIMER: &str = "redirect_timer";
 
 pub struct Settings {
     pub embed_images: bool,
     pub embed_embeds: bool,
     pub proxy_images: bool,
+    pub fast_redirect: bool,
     pub redirect_timer: u32,
 }
 
@@ -17,12 +19,14 @@ impl Settings {
         let mut embed_images = true;
         let mut embed_embeds = true;
         let mut proxy_images = false;
+        let mut fast_redirect = false;
         let mut redirect_timer = 5;
         for (key, value) in input::cookies(request) {
             match key {
                 EMBED_IMAGES => embed_images = value == "true",
                 EMBED_EMBEDS => embed_embeds = value == "true",
                 PROXY_IMAGES => proxy_images = value == "true",
+                FAST_REDIRECT => fast_redirect = value == "true",
                 REDIRECT_TIMER => redirect_timer = value.parse().unwrap_or(5),
                 _ => {}
             }
@@ -32,6 +36,7 @@ impl Settings {
             embed_images,
             embed_embeds,
             proxy_images,
+            fast_redirect,
             redirect_timer,
         }
     }