Respect toc attribute in metadata

.forgejo/workflows/pr-check.yml

@@ -1,23 +0,0 @@
-name: PR Check
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-jobs:
-  lint-and-format:
-    container:
-      image: cimg/rust:1.81-node
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Build
-        run: cargo build
-
-      - name: Run format check
-        run: cargo fmt --check
-
-      - name: Run Clippy
-        run: cargo clippy

.forgejo/workflows/publish.yml

@@ -1,47 +0,0 @@
-name: Publish latest version
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    container:
-      image: ghcr.io/catthehacker/ubuntu:act-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Checkout LFS
-        run: |
-          # Replace double auth header, see https://github.com/actions/checkout/issues/1830
-          AUTH=$(git config --local http.${{ github.server_url }}/.extraheader)
-          git config --local --unset http.${{ github.server_url }}/.extraheader
-          git config --local http.${{ github.server_url }}/${{ github.repository }}.git/info/lfs/objects/batch.extraheader "$AUTH"
-
-          # Get files
-          git lfs fetch
-          git lfs checkout
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Sanitize metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          tags: latest
-          images: git.mylloon.fr/${{ github.repository }}
-
-      - name: Login to Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ github.server_url }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}

.woodpecker/publish.yml

@@ -0,0 +1,15 @@
+steps:
+  publish:
+    image: woodpeckerci/plugin-docker-buildx:2
+    settings:
+      labels:
+        platform: linux/amd64
+      repo: git.mylloon.fr/${CI_REPO,,}
+      auto_tag: true
+      registry: git.mylloon.fr
+      username: ${CI_REPO_OWNER}
+      password:
+        from_secret: cb_token
+    when:
+      event: push
+      branch: main

Cargo.toml

@@ -10,9 +10,9 @@ publish = false
 license = "AGPL-3.0-or-later"
 
 [dependencies]
-actix-web = { version = "4.9", default-features = false, features = ["macros", "compress-brotli"] }
+actix-web = { version = "4.6", default-features = false, features = ["macros", "compress-brotli"] }
 actix-files = "0.6"
-cached = { version = "0.53", features = ["async", "ahash"] }
+cached = { version = "0.51", features = ["async", "ahash"] }
 ramhorns = "1.0"
 toml = "0.8"
 serde = { version = "1.0", features = ["derive"] }
@@ -21,17 +21,16 @@ serde_json = "1.0"
 minify-html = "0.15"
 minify-js = "0.6"
 glob = "0.3"
-comrak = "0.29"
+comrak = "0.24"
 reqwest = { version = "0.12", features = ["json"] }
 chrono = { version = "0.4.38", default-features = false, features = ["clock"]}
-chrono-tz = "0.10"
+chrono-tz = "0.9"
 rss = { version = "2.0", features = ["atom"] }
-lol_html = "2.0"
+lol_html = "1.2"
 base64 = "0.22"
 mime_guess = "2.0"
 urlencoding = "2.1"
 regex = "1.10"
-cyborgtime = "2.1.1"
 
 [lints.clippy]
 pedantic = "warn"

README.md

@@ -3,7 +3,7 @@
 Easy WebPage generator
 
 [![dependency status](https://deps.rs/repo/gitea/git.mylloon.fr/Anri/mylloon.fr/status.svg)](https://deps.rs/repo/gitea/git.mylloon.fr/Anri/mylloon.fr)
-[![status-badge](https://git.mylloon.fr/Anri/mylloon.fr/badges/workflows/publish.yml/badge.svg)](https://git.mylloon.fr/Anri/mylloon.fr/actions?workflow=publish.yml)
+[![status-badge](https://ci.mylloon.fr/api/badges/Anri/mylloon.fr/status.svg)](https://ci.mylloon.fr/Anri/mylloon.fr)
 
 - See [issues](https://git.mylloon.fr/Anri/mylloon.fr/issues)
 - See [documentation](https://git.mylloon.fr/Anri/mylloon.fr/src/branch/main/Documentation.md)

src/main.rs

@@ -42,14 +42,7 @@ async fn main() -> Result<()> {
                     .add(("Server", format!("ewp/{}", env!("CARGO_PKG_VERSION"))))
                     .add(("Permissions-Policy", "interest-cohort=()")),
             )
-            .service(
-                web::scope("/api").service(
-                    web::scope("v1")
-                        .service(api_v1::love)
-                        .service(api_v1::btf)
-                        .service(api_v1::websites),
-                ),
-            )
+            .service(web::scope("/api").service(web::scope("v1").service(api_v1::love)))
             .service(index::page)
             .service(agreements::security)
             .service(agreements::humans)

src/misc/markdown.rs

@@ -12,6 +12,8 @@ use serde::{Deserialize, Deserializer};
 use std::fmt::Debug;
 use std::fs;
 use std::path::Path;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
 
 /// Metadata for blog posts
 #[derive(Content, Debug, Default, Deserialize)]
@@ -30,10 +32,10 @@ pub struct Tag {
     pub name: String,
 }
 
-impl<'a> Deserialize<'a> for Tag {
+impl<'de> Deserialize<'de> for Tag {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
-        D: Deserializer<'a>,
+        D: Deserializer<'de>,
     {
         match <&str>::deserialize(deserializer) {
             Ok(s) => match serde_yml::from_str(s) {
@@ -123,7 +125,7 @@ pub struct File {
 }
 
 /// Options used for parser and compiler MD --> HTML
-pub fn get_options<'a>() -> ComrakOptions<'a> {
+pub fn get_options() -> ComrakOptions {
     let mut options = comrak::Options::default();
 
     // Extension
@@ -140,18 +142,12 @@ pub fn get_options<'a>() -> ComrakOptions<'a> {
     options.extension.multiline_block_quotes = true;
     options.extension.math_dollars = true;
     options.extension.math_code = false;
-    options.extension.wikilinks_title_after_pipe = false;
-    options.extension.wikilinks_title_before_pipe = false;
-    options.extension.underline = true;
-    options.extension.spoiler = false;
-    options.extension.greentext = false;
 
     // Parser
     options.parse.smart = true; // could be boring
     options.parse.default_info_string = Some("plaintext".into());
     options.parse.relaxed_tasklist_matching = true;
     options.parse.relaxed_autolinks = true;
-    // options.render.broken_link_callback = ...;
 
     // Renderer
     options.render.hardbreaks = false; // could be true? change by metadata could be good for compatibility
@@ -162,13 +158,7 @@ pub fn get_options<'a>() -> ComrakOptions<'a> {
     options.render.escape = false;
     options.render.list_style = ListStyleType::Dash;
     options.render.sourcepos = false;
-    options.render.experimental_inline_sourcepos = false;
     options.render.escaped_char_spans = false;
-    options.render.ignore_setext = true;
-    options.render.ignore_empty_links = true;
-    options.render.gfm_quirks = true;
-    options.render.prefer_fenced = false;
-    options.render.figure_with_caption = false;
 
     options
 }
@@ -180,7 +170,7 @@ fn custom_img_size(html: &str) -> String {
         RewriteStrSettings {
             element_content_handlers: vec![element!("img[alt]", |el| {
                 let alt = el.get_attribute("alt").unwrap();
-                let possible_piece = alt.split('|').collect::<Vec<&str>>();
+                let possible_piece = alt.split(|c| c == '|').collect::<Vec<&str>>();
 
                 if possible_piece.len() > 1 {
                     let data = possible_piece.last().unwrap().trim();
@@ -231,53 +221,46 @@ fn fix_images_and_integration(path: &str, html: &str) -> (String, Metadata) {
         mail_obfsucated: false,
     };
 
-    // Collection of any additional metadata
-    let mut additional_metadata = Vec::new();
+    (
+        rewrite_str(
+            html,
+            RewriteStrSettings {
+                element_content_handlers: vec![element!("img", |el| {
+                    if let Some(src) = el.get_attribute("src") {
+                        let img_src = Path::new(path).parent().unwrap();
+                        let img_path = urlencoding::decode(img_src.join(src).to_str().unwrap())
+                            .unwrap()
+                            .to_string();
+                        if let Ok(file) = fs::read_to_string(&img_path) {
+                            let mime = mime_guess::from_path(&img_path).first_or_octet_stream();
+                            if mime == "text/markdown" {
+                                let mut options = get_options();
+                                options.extension.footnotes = false;
+                                let data = read_md(
+                                    &img_path,
+                                    &file,
+                                    &TypeFileMetadata::Generic,
+                                    Some(options),
+                                );
+                                el.replace(&data.content, ContentType::Html);
+                                metadata.merge(&data.metadata);
+                            } else {
+                                let image = general_purpose::STANDARD.encode(file);
 
-    let result = rewrite_str(
-        html,
-        RewriteStrSettings {
-            element_content_handlers: vec![element!("img", |el| {
-                if let Some(src) = el.get_attribute("src") {
-                    let img_src = Path::new(path).parent().unwrap();
-                    let img_path = urlencoding::decode(img_src.join(src).to_str().unwrap())
-                        .unwrap()
-                        .to_string();
-                    if let Ok(file) = fs::read_to_string(&img_path) {
-                        let mime = mime_guess::from_path(&img_path).first_or_octet_stream();
-                        if mime == "text/markdown" {
-                            let mut options = get_options();
-                            options.extension.footnotes = false;
-                            let data = read_md(
-                                &img_path,
-                                &file,
-                                &TypeFileMetadata::Generic,
-                                Some(options),
-                            );
-                            el.replace(&data.content, ContentType::Html);
-
-                            // Store the metadata for later merging
-                            additional_metadata.push(data.metadata);
-                        } else {
-                            let image = general_purpose::STANDARD.encode(file);
-                            el.set_attribute("src", &format!("data:{mime};base64,{image}"))
-                                .unwrap();
+                                el.set_attribute("src", &format!("data:{mime};base64,{image}"))
+                                    .unwrap();
+                            }
                         }
                     }
-                }
-                Ok(())
-            })],
-            ..RewriteStrSettings::default()
-        },
+
+                    Ok(())
+                })],
+                ..RewriteStrSettings::default()
+            },
+        )
+        .unwrap(),
+        metadata,
     )
-    .unwrap();
-
-    // Merge all collected metadata
-    for additional in additional_metadata {
-        metadata.merge(&additional);
-    }
-
-    (result, metadata)
 }
 
 /// Transform markdown string to File structure
@@ -417,12 +400,12 @@ fn check_code<'a>(root: &'a AstNode<'a>, blacklist: &[String]) -> bool {
 
 /// Check if html contains maths
 fn check_math(html: &str) -> bool {
-    let mut math_detected = false;
+    let math_detected = Arc::new(AtomicBool::new(false));
 
     let _ = HtmlRewriter::new(
         Settings {
             element_content_handlers: vec![element!("span[data-math-style]", |_| {
-                math_detected = true;
+                math_detected.store(true, Ordering::SeqCst);
 
                 Ok(())
             })],
@@ -432,7 +415,7 @@ fn check_math(html: &str) -> bool {
     )
     .write(html.as_bytes());
 
-    math_detected
+    math_detected.load(Ordering::SeqCst)
 }
 
 /// Change class of languages for hljs detection
@@ -448,7 +431,7 @@ fn hljs_replace<'a>(root: &'a AstNode<'a>, mermaid_str: &str) {
 
 /// Obfuscate email if email found
 fn mail_obfuscation(html: &str) -> (String, bool) {
-    let mut modified = false;
+    let modified = Arc::new(AtomicBool::new(false));
 
     let data_attr = "title";
 
@@ -457,7 +440,7 @@ fn mail_obfuscation(html: &str) -> (String, bool) {
         html,
         RewriteStrSettings {
             element_content_handlers: vec![element!("a[href^='mailto:']", |el| {
-                modified = true;
+                modified.store(true, Ordering::SeqCst);
 
                 // Get mail address
                 let link = el.get_attribute("href").unwrap();
@@ -477,7 +460,9 @@ fn mail_obfuscation(html: &str) -> (String, bool) {
     )
     .unwrap();
 
-    if modified {
+    let is_modified = modified.load(Ordering::SeqCst);
+
+    if is_modified {
         // Remove old data email if exists
         (
             rewrite_str(
@@ -503,10 +488,10 @@ fn mail_obfuscation(html: &str) -> (String, bool) {
                 },
             )
             .unwrap(),
-            modified,
+            is_modified,
         )
     } else {
-        (new_html, modified)
+        (new_html, is_modified)
     }
 }
 

src/routes/api_v1.rs

@@ -1,53 +1,15 @@
-use std::time::Duration;
-
 use actix_web::{get, HttpResponse, Responder};
-use chrono::Utc;
-use cyborgtime::format_duration;
 use serde::Serialize;
 
-/// Response for /love
+/// Response
 #[derive(Serialize)]
-struct InfoLove {
+struct Info {
     unix_epoch: u32,
 }
 
 #[get("/love")]
 pub async fn love() -> impl Responder {
-    HttpResponse::Ok().json(InfoLove {
+    HttpResponse::Ok().json(Info {
         unix_epoch: 1_605_576_600,
     })
 }
-
-/// Response for /backtofrance
-#[derive(Serialize)]
-struct InfoBTF {
-    unix_epoch: u64,
-    countdown: String,
-}
-
-#[get("/backtofrance")]
-pub async fn btf() -> impl Responder {
-    let target = 1_736_618_100;
-    let current_time: u64 = Utc::now().timestamp().try_into().unwrap();
-
-    let info = InfoBTF {
-        unix_epoch: target,
-        countdown: if current_time > target {
-            "Already happened".to_owned()
-        } else {
-            let duration_epoch = target - current_time;
-            let duration = Duration::from_secs(duration_epoch);
-            format_duration(duration).to_string()
-        },
-    };
-
-    HttpResponse::Ok().json(info)
-}
-
-#[get("/websites")]
-pub async fn websites() -> impl Responder {
-    HttpResponse::Ok().json((
-        "http://www.bocal.cs.univ-paris8.fr/~akennel/",
-        "https://anri.up8.site/",
-    ))
-}

static/css/constants.css

@@ -12,7 +12,6 @@
     --background: #f1f1f1;
     --font-color: #18181b;
     --link-color: #df5a9c;
-    --selection-color: #c5c5c560;
   }
 }
 
@@ -22,6 +21,5 @@
     --background: #171e26;
     --font-color: #bcbcc5;
     --link-color: #ff80bf;
-    --selection-color: #c5c5c530;
   }
 }

static/css/style.css

@@ -4,10 +4,6 @@ html {
   font-family: var(--font-family);
 }
 
-::selection {
-  background-color: var(--selection-color);
-}
-
 body,
 a {
   color: var(--font-color);

static/js/index.js

@@ -12,13 +12,12 @@ window.addEventListener("load", () => {
     -webkit-background-clip: text; /* Chromium fix */
     color: transparent;
   `;
-  const mono = "font-family: monospace";
 
   const tags = [
     new Tag("Comment fonctionne un PC 😵‍💫"),
-    new Tag("undefined", mono),
-    new Tag("/api/v1/love", mono),
-    new Tag("/api/v1/websites", mono),
+    new Tag("undefined", "font-family: monospace"),
+    new Tag("/api/v1/love", "font-family: monospace"),
+    new Tag("A rater son master 🎊"),
     new Tag("Peak D2 sur Valo 🤡"),
     new Tag(
       "0x520",
@@ -48,7 +47,7 @@ window.addEventListener("load", () => {
       `
     ),
     new Tag("School hater"),
-    new Tag("Étudiant"),
+    new Tag("Stagiaire"),
     new Tag("Rempli de malice"),
     new Tag(
       "#NouveauFrontPopulaire ✊",
@@ -62,7 +61,6 @@ window.addEventListener("load", () => {
         text-shadow: 0px 0px 20px light-dark(var(--font-color), transparent);
       `
     ),
-    new Tag("s/centre/droite/g", mono),
   ];
 
   const random = Math.round(Math.random() * (tags.length - 1));

static/js/libs/katex.js

@@ -11,9 +11,6 @@ window.addEventListener("load", () => {
       RA: "Rightarrow",
       LA: "Leftarrow",
       u: "mu",
-      Tau: "mathrm{T}",
-      lb: "textlbrackdbl",
-      rb: "textrbrackdbl",
     })
   )[Symbol.iterator]()) {
     const bs = "\\";