From 2ff0fa75211510abc1030e320ecb3307b82d268e Mon Sep 17 00:00:00 2001
From: Nereuxofficial <37740907+Nereuxofficial@users.noreply.github.com>
Date: Wed, 24 Jul 2024 18:34:52 +0200
Subject: [PATCH] fix: fixes for errors in 2.5

---
 Cargo.lock               | 43 ++++++++++++++++++++--------------------
 Cargo.toml               |  2 +-
 liquid/header.liquid     |  4 ++--
 liquid/index.html.liquid |  2 +-
 src/main.rs              |  4 ++--
 5 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 12f25ac..f37a60c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -610,7 +610,7 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
 [[package]]
 name = "duckblog"
-version = "0.2.0"
+version = "0.2.5"
 dependencies = [
  "axum",
  "axum-extra",
@@ -1265,9 +1265,9 @@ dependencies = [
 
 [[package]]
 name = "jobserver"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
@@ -1289,9 +1289,9 @@ dependencies = [
 
 [[package]]
 name = "kstring"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747"
+checksum = "e703acfd696000db3f6d1238e23b3d1f889192e1e439969c44e8423bb7a5655e"
 dependencies = [
  "serde",
  "static_assertions",
@@ -1648,9 +1648,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
@@ -1680,9 +1680,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.102"
+version = "0.9.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
 dependencies = [
  "cc",
  "libc",
@@ -1985,14 +1985,13 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.2"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46"
+checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
 dependencies = [
  "libc",
  "once_cell",
  "socket2",
- "tracing",
  "windows-sys 0.52.0",
 ]
 
@@ -2270,9 +2269,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.11"
+version = "0.23.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0"
+checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
 dependencies = [
  "once_cell",
  "ring",
@@ -2300,9 +2299,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.5"
+version = "0.102.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78"
+checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -2671,9 +2670,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.71"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3497,9 +3496,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374ec40a2d767a3c1b4972d9475ecd557356637be906f2cb3f7fe17a6eb5e22f"
+checksum = "557404e450152cd6795bb558bca69e43c585055f4606e3bcae5894fc6dac9ba0"
 dependencies = [
  "memchr",
 ]
@@ -3537,9 +3536,9 @@ dependencies = [
 
 [[package]]
 name = "zune-jpeg"
-version = "0.4.11"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448"
+checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768"
 dependencies = [
  "zune-core",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 5d501c2..809d75f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "duckblog"
-version = "0.2.0"
+version = "0.2.5"
 edition = "2021"
 rust-version = "1.70.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/liquid/header.liquid b/liquid/header.liquid
index f520036..209ede4 100644
--- a/liquid/header.liquid
+++ b/liquid/header.liquid
@@ -44,9 +44,9 @@
     <meta property="og:locale" content="en-us">
     <meta property="og:site_name" content="DuckBlog">
     <link href="https://nereux.blog/feed.xml" type="application/atom+xml" rel="alternate" title="Sitewide Atom feed">
-    {% if metadata.images %}
+    {% unless metadata.images == empty %}
         <meta property="og:image" content="https://nereux.blog/{{ metadata.images[0] }}">
-    {% endif %}
+    {% endunless %}
     <style>
         h2 {
             font-size: 2rem;
diff --git a/liquid/index.html.liquid b/liquid/index.html.liquid
index 15f2569..bf0b7d9 100644
--- a/liquid/index.html.liquid
+++ b/liquid/index.html.liquid
@@ -30,7 +30,7 @@
       {% for post in posts %}
         <div class="flex-column text-center my-10">
           <h2 class="text-4xl font-bold mb-0 text-green-500">
-            <a href="/{{ post.path }}">
+            <a href="{{ post.path }}">
               {{ post.metadata.title }}</a>
           </h2>
           <p class="text-gray-500 text-sm mb-0">{{ post.metadata.date }}</p>
diff --git a/src/main.rs b/src/main.rs
index 1c0805b..a2411fe 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -230,7 +230,7 @@ async fn get_about() -> impl IntoResponse {
 async fn get_post(Path(path): Path<String>) -> impl IntoResponse {
     if !path.ends_with('/') {
         // Workaround for wrong image paths, breaks /about
-        return Redirect::to(format!("/posts_map/{}/", path).as_str()).into_response();
+        return Redirect::to(format!("/posts/{}/", path).as_str()).into_response();
     }
     // Remove trailing slash
     let path = format!("/posts/{}", path.trim_end_matches('/'));
@@ -260,7 +260,7 @@ async fn get_post(Path(path): Path<String>) -> impl IntoResponse {
 #[instrument]
 async fn list_posts(Path(path): Path<String>) -> impl IntoResponse {
     info!("Listing posts with filter: {:#?}", path);
-    let mut posts = Post::parse_all_posts().await.unwrap();
+    let mut posts = POSTS.get().unwrap().values().cloned().collect::<Vec<Post>>();
     if !path.is_empty() {
         posts.retain(|post| post.metadata.tags.iter().any(|tag| tag == &path));
     }