Fix rewrite

Author: maquchizi

nginx.conf.sigil

@@ -19,16 +19,16 @@
 # Example conversions:
 #
 # French
-# partiellement-faux-le-gouvernement-sénégalais-na-pas-été-dissout-après-les-manifestations-du-19 ->
+# partiellement-faux-le-gouvernement-sénégalais-na-pas-été-dissout-après-les-manifestations-du-19-5a7e55071173 ->
 # partiellement-faux-le-gouvernement-s-c3-a9n-c3-a9galais-na-pas--c3-a9t-c3-a9-dissout-apr-c3-a8s-les-manifestations-du-19
 #
 # Amharic
-# የፈጠራ-ወሬ-የየመን-ሚሳኤል-በእስራኤል-ላይ-ያደረሰውን-ጥቃት-ያሳይሉ-የተባሉት-እነዚህ-ሁለት-ፎቶዎች-የተቀነባበሩ-ናቸውi ->
+# የፈጠራ-ወሬ-የየመን-ሚሳኤል-በእስራኤል-ላይ-ያደረሰውን-ጥቃት-ያሳይሉ-የተባሉት-እነዚህ-ሁለት-ፎቶዎች-የተቀነባበሩ-ናቸው-36aa9b306317 ->
 # -e1-8b-a8-e1-8d-88-e1-8c-a0-e1-88-ab--e1-8b-88-e1-88-ac--e1-8b-a8-e1-8b-a8-e1-88-98-e1-8a-95--e1-88-9a-e1-88-b3-e1-8a-a4-e1-88-8d--e1-89-a0-e1-8a-a5-e1-88-b5-e1-88-ab-e1-8a-a4-e1-88-8d-
 #
 # English
-# false-ugandas-education-minister-janet-museveni-has-not-ordered-schools-to-end-their-third-term ->
-# false-ugandas-education-minister-janet-museveni-has-not-ordered-schools-to-end-their-third-term (No change as expected)
+# false-ugandas-education-minister-janet-museveni-has-not-ordered-schools-to-end-their-third-term-4ef52ad31a17 ->
+# false-ugandas-education-minister-janet-museveni-has-not-ordered-schools-to-end-their-third-term
 #
 
 
@@ -53,10 +53,16 @@ server {
   lingering_timeout 5s;
   send_timeout 60s;
 
-  include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf;
+  # Remove the random ID that Medium appends to post URLs. This effectively does the same redirect recommended by Ghost here:
+  # https://docs.ghost.org/migration/medium#using-custom-domains
+  # Note: This rewrite happens before the redirect to HTTPS
+  rewrite "^/(.*)(-[0-9a-f]{10,12})$" /$1 permanent;
+
   location / {
     return 301 https://$host:443$request_uri;
   }
+  include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf;
+
 }
 
 server {
@@ -79,7 +85,6 @@ server {
   lingering_timeout 5s;
   send_timeout 60s;
 
-
   location    / {
     gzip on;
     gzip_min_length  1100;
@@ -88,12 +93,17 @@ server {
     gzip_vary on;
     gzip_comp_level  6;
 
-    # Remove the random ID that Medium appends to post URLs. This effectively does the same redirect recommended by Ghost here:
-    # https://docs.ghost.org/migration/medium#using-custom-domains
-    rewrite "^/(.*)(-[0-9a-f]{10,12})$" /$1 permanent;
-
     # Check if conversion is needed using the map
     access_by_lua_block {
+        -- First check for Medium ID and remove it before processing
+        local has_medium_id = string.match(ngx.var.uri, "/(.*)-([%x][%x][%x][%x][%x][%x][%x][%x][%x][%x][%x]?[%x]?)$")
+        if has_medium_id then
+            -- Remove Medium ID and redirect to the cleaned URL
+            local clean_path = string.gsub(ngx.var.uri, "/(.*)-([%x][%x][%x][%x][%x][%x][%x][%x][%x][%x][%x]?[%x]?)$", "/%1")
+            ngx.redirect(clean_path, 301)
+            return
+        end
+
         if ngx.var.needs_conversion == "yes" then
           local function convert_string(input_str)
               -- Split the input string by hyphens