preferences and thumbnail image embeds

Author: HookedBehemoth

sass/includes/basic.scss

@@ -96,6 +96,13 @@ figcaption {
   }
 }
 
+form {
+  label {
+    display: block;
+    margin: 0 0 10px;
+  }
+}
+
 footer {
   max-width: $page-width;
   margin: 1em auto;

src/api/common.rs

@@ -20,9 +20,18 @@ pub struct Article {
     pub description: String,
     pub content_elements: Option<Box<[serde_json::Value]>>,
     pub authors: Option<Box<[Topic]>>,
+    pub thumbnail: Option<Image>,
     pub published_time: String,
 }
 
+#[derive(Deserialize)]
+pub struct Image {
+    pub caption: Option<String>,
+    pub width: u16,
+    pub height: u16,
+    pub resizer_url: String,
+}
+
 #[derive(Deserialize)]
 pub struct ApiResponse<T> {
     #[serde(rename = "statusCode")]

src/main.rs

@@ -2,6 +2,7 @@ mod api;
 mod client;
 mod render;
 mod routes;
+mod settings;
 
 use std::collections::HashMap;
 
@@ -12,7 +13,9 @@ use routes::{
     article::render_article,
     internet_news::render_legacy_article,
     markets::render_market,
+    proxy::image_proxy,
     search::{render_search, render_section, render_topic},
+    settings::handle_settings,
 };
 
 const CSS: &str = include_str!(concat!(env!("OUT_DIR"), "/main.css"));
@@ -24,7 +27,7 @@ macro_rules! document {
             html lang="en" {
                 head {
                     title { ($title) }
-                    link rel="stylesheet" href="/main.css?v=0";
+                    link rel="stylesheet" href="/main.css?v=1";
                     meta name="viewport" content="width=device-width, initial-scale=1";
                     $( ($head) )?
                 }
@@ -35,13 +38,16 @@ macro_rules! document {
                         " - "
                         a href="/search" { "Search" }
                         " - "
+                        a href="/settings" { "Settings" }
+                        " - "
                         a href="/about" { "About" } } }
                 }
             }
         }
     };
 }
 pub(crate) use document;
+use settings::Settings;
 
 pub struct Section {
     id: String,
@@ -133,12 +139,15 @@ fn main() {
             .as_deref()
             .unwrap_or_default()
             .iter()
-            .map(|s| SectionChild { id: s.id.clone(), name: s.name.clone() })
+            .map(|s| SectionChild {
+                id: s.id.clone(),
+                name: s.name.clone(),
+            })
             .collect();
         for child in section.children.unwrap_or_default() {
             queue.push(child);
         }
-        let node= Section {
+        let node = Section {
             id: section.id.clone(),
             name: section.name.clone(),
             children,
@@ -151,6 +160,8 @@ fn main() {
     println!("Listening on http://{}", list_address);
     rouille::start_server(list_address, move |request| {
         let path = request.url();
+        let settings = Settings::from_request(request);
+
         let response = match path.as_str() {
             "/" | "/home" | "/world/" => {
                 let offset = request
@@ -159,10 +170,11 @@ fn main() {
                 let section = sections_by_id
                     .get("/world/")
                     .unwrap_or_else(|| panic!("Section 'world' not found"));
-            
+
                 render_section(&client, section, offset, 8)
             }
             "/about" => render_about(),
+            "/settings" => return handle_settings(request, &settings),
             "/search" | "/search/" => render_search(&client, request),
             "/main.css" => {
                 return rouille::Response {
@@ -213,23 +225,26 @@ fn main() {
                     render_market(&client, path)
                 } else if let Some(path) = path.strip_prefix("/markets/companies/") {
                     render_market(&client, path)
+                } else if let Some(path) = request.raw_url().strip_prefix("/proxy/") {
+                    return image_proxy(&client, request, path);
                 } else {
-                    render_article(&client, &path)
+                    render_article(&client, &path, &settings)
                 }
             }
         };
 
         match response {
             Ok(body) => rouille::Response::html(body),
-            Err(err) => render_api_error(&err, &path),
+            Err(err) => render_api_error(&err, &path, &settings),
         }
     });
 }
 
-fn render_api_error(err: &ApiError, path: &str) -> rouille::Response {
+fn render_api_error(err: &ApiError, path: &str, settings: &Settings) -> rouille::Response {
     let (status, title) = match err {
-        ApiError::Empty |
-        ApiError::External(404, _) => (404, "404 - Content not found".to_string()),
+        ApiError::Empty | ApiError::External(404, _) => {
+            (404, "404 - Content not found".to_string())
+        }
         ApiError::Redirect(_, _) => (200, format!("Redirect found")),
         ApiError::External(code, _) => (*code, format!("{code} - External error")),
         ApiError::Internal(message) => (500, format!("500 - Internal server error {message}")),
@@ -241,21 +256,23 @@ fn render_api_error(err: &ApiError, path: &str) -> rouille::Response {
             let location = strip_prefix(location);
             (
                 maud::html! {
-                    meta http-equiv="refresh" content=(format!("10; url={}", location));
+                    meta http-equiv="refresh" content=(format!("{}; url={}", settings.redirect_timer, location));
                     link rel="canonical" href=(location);
                 },
                 maud::html! {
-                    p { "Redirecting to " (location) " in 10 seconds. Or click " a href=(location) { "here" } " to follow the link directly." }
-                }
-            )},
+                    p { "Redirecting to " (location) " in " (settings.redirect_timer) " seconds. Or click " a href=(location) { "here" } " to follow the link directly." }
+                },
+            )
+        }
         ApiError::External(_, message) => (
             maud::html!(),
             maud::html! {
                 details {
                     summary { "Server response" }
                     p { (message) }
                 }
-            }),
+            },
+        ),
         ApiError::Internal(_) => (maud::html!(), maud::html!()),
     };
 

src/render/images.rs

@@ -0,0 +1,40 @@
+use crate::{api::common::Image, routes::proxy, settings::Settings};
+
+const RESIZE_STEPS: [u16; 6] = [480, 640, 720, 960, 1080, 1200];
+
+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) {
+            format!("/proxy/{base_path}")
+        } else {
+            return maud::html! {
+                p {
+                    i { "Proxy requested but no supported link found!" }
+                }
+            };
+        }
+    } else {
+        resizer_url.to_string()
+    };
+    let mut srcset = String::new();
+    for width in RESIZE_STEPS {
+        if width > thumbnail.width {
+            break;
+        }
+        srcset.push_str(&format!("{url}&width={width}&quality=80 {width}w,"));
+    }
+
+    maud::html! {
+        figure {
+            img src=(url)
+                srcset=(srcset)
+                width=(thumbnail.width) height=(thumbnail.height)
+                alt="";
+            @if let Some(caption) = &thumbnail.caption {
+                figcaption { i { (caption) } }
+            }
+        }
+    }
+}

src/render/mod.rs

@@ -1,2 +1,3 @@
 pub mod byline;
+pub mod images;
 pub mod legacy_article_byline;

src/routes/article.rs

@@ -1,12 +1,13 @@
 use crate::{
-    api::{article::fetch_article_by_url, error::ApiResult},
+    api::{article::fetch_article_by_url, common::Image, error::ApiResult},
     client::Client,
-    render::byline,
+    render::{byline, images::render_image},
+    settings::Settings,
 };
 use chrono::{DateTime, Utc};
 use maud::{html, PreEscaped};
 
-pub fn render_article(client: &Client, path: &str) -> ApiResult<String> {
+pub fn render_article(client: &Client, path: &str, settings: &Settings) -> ApiResult<String> {
     let article = fetch_article_by_url(client, path)?;
 
     let published_time = article
@@ -29,16 +30,25 @@ pub fn render_article(client: &Client, path: &str) -> ApiResult<String> {
             }
             @if Some("live-blog") == article.subtype.as_deref() {
                 p {
-                    "You seem to have accidentally clicked on AI sloppa. There is nothing of value here."
+                    i {
+                        "You seem to have accidentally clicked on AI sloppa. There is nothing of value here."
+                    }
                 }
                 p {
-                    "Neuters is currently not planning to support live blogs.
-                    If you want to see the original \"content\", disable any redirector extension and click on this link: "
-                    @let url = format!("https://www.reuters.com{}", path);
-                    a href=(url) { "Original" }
+                    i {
+                        "Neuters is currently not planning to support live blogs.
+                        If you want to see the original \"content\", disable any redirector extension and click on this link: "
+                        @let url = format!("https://www.reuters.com{}", path);
+                        a href=(url) { "Original" }
+                    }
                 }
             } @else {
-                (render_items(&article.content_elements.unwrap_or_default()))
+                @if settings.embed_images {
+                    @if let Some(thumbnail) = &article.thumbnail {
+                        (render_image(thumbnail, settings))
+                    }
+                }
+                (render_items(&article.content_elements.unwrap_or_default(), settings))
             }
         ),
         html! {
@@ -52,7 +62,7 @@ pub fn render_article(client: &Client, path: &str) -> ApiResult<String> {
     Ok(doc.into_string())
 }
 
-fn render_items(items: &[serde_json::Value]) -> maud::Markup {
+fn render_items(items: &[serde_json::Value], settings: &Settings) -> maud::Markup {
     html! {
         @for content in items {
             @match content["type"].as_str() {
@@ -75,24 +85,50 @@ fn render_items(items: &[serde_json::Value]) -> maud::Markup {
                     }
                 }
                 Some("image") => {
-                    @if let Some(image) = content["url"].as_str() {
-                        @let alt = content["alt"].as_str();
-                        @let (width, height) = (content["width"].as_u64(), content["height"].as_u64());
-                        img src=(image) alt=[alt] width=[width] height=[height];
+                    @if settings.embed_images {
+                        @if let Some(image) = content["url"].as_str() {
+                            @let alt = content["alt"].as_str();
+                            @let (width, height) = (content["width"].as_u64(), content["height"].as_u64());
+                            img src=(image) alt=[alt] width=[width] height=[height];
+                        }
+                    } @else {
+                        p {
+                            i {
+                                "Embedding images is disabled. Navigate to the original resource or change the settings to enable it."
+                            }
+                        }
+                        @if let Some(image) = content["url"].as_str() {
+                            p {
+                                a href=(image) { "Image" }
+                            }
+                        }
                     }
                 }
                 Some("graphic") => {
-                    @match content["graphic_type"].as_str() {
-                        Some("image") => {
-                            @if let (Some(image), Some(description)) = (content["url"].as_str(), content["description"].as_str()) {
-                                figure {
-                                    img src=(image) alt=(description);
-                                    figcaption { (description) }
+                    @if settings.embed_images {
+                        @match content["graphic_type"].as_str() {
+                            Some("image") => {
+                                @if let (Some(image), Some(description)) = (content["url"].as_str(), content["description"].as_str()) {
+                                    figure {
+                                        img src=(image) alt=(description);
+                                        figcaption { (description) }
+                                    }
                                 }
                             }
+                            Some(unknown) => { p { "Unknown graphic type: " (unknown) } }
+                            None => { p { "Missing graphic type" } }
+                        }
+                    } @else {
+                        p {
+                            i {
+                                "Embedding images is disabled. Navigate to the original resource or change the settings to enable it."
+                            }
+                        }
+                        @if let Some(image) = content["url"].as_str() {
+                            p {
+                                a href=(image) { "Image" }
+                            }
                         }
-                        Some(unknown) => { p { "Unknown graphic type: " (unknown) } }
-                        None => { p { "Missing graphic type" } }
                     }
                 }
                 Some("table") => {
@@ -120,17 +156,25 @@ fn render_items(items: &[serde_json::Value]) -> maud::Markup {
                 }
                 Some("list") => {
                     @if let Some(items) = content["items"].as_array() {
-                        (render_items(items))
+                        (render_items(items, settings))
                     }
                 }
                 Some("social_media") => {
-                    @if let Some(markup) = content["html"].as_str() {
-                        @let embed = if let Some(index) = markup.find("\n<script") {
-                            &markup[..index]
-                        } else {
-                            markup
-                        };
-                       (maud::PreEscaped(embed))
+                    @if settings.embed_embeds {
+                        @if let Some(markup) = content["html"].as_str() {
+                            @let embed = if let Some(index) = markup.find("\n<script") {
+                                &markup[..index]
+                            } else {
+                                markup
+                            };
+                           (maud::PreEscaped(embed))
+                        }
+                    } @else {
+                        p {
+                            i {
+                                "Embedding social media is disabled. Navigate to the original resource or change the settings to enable it."
+                            }
+                        }
                     }
                 }
                 Some(unknown) => { p { "Unknown type: " (unknown) } }

src/routes/mod.rs

@@ -2,4 +2,6 @@ pub mod about;
 pub mod article;
 pub mod internet_news;
 pub mod markets;
+pub mod proxy;
 pub mod search;
+pub mod settings;