From 39423504689a0f7a0dfb8da22258e03072d1552d Mon Sep 17 00:00:00 2001
From: blankie <blankie@nixnetmail.com>
Date: Sun, 31 Dec 2023 21:55:56 +1100
Subject: [PATCH] Fix error on a redirect page with no link

https://lists.sr.ht/~cadence/breezewiki-discuss/%3CCY2G0E3G55N3.ANW2QREUS5SO%40nixnetmail.com%3E
---
 src/page-wiki-offline.rkt | 9 ++++++---
 src/page-wiki.rkt         | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/page-wiki-offline.rkt b/src/page-wiki-offline.rkt
index 1d0323b..3f818ee 100644
--- a/src/page-wiki-offline.rkt
+++ b/src/page-wiki-offline.rkt
@@ -98,16 +98,19 @@
          #:head-data head-data
          #:siteinfo (siteinfo-fetch wikiname)
          ))
-      (define redirect-msg ((query-selector (attribute-selector 'class "redirectMsg") body)))
       (define redirect-query-parameter (dict-ref (url-query (request-uri req)) 'redirect "yes"))
+      (define redirect-msg ((query-selector (attribute-selector 'class "redirectMsg") body)))
+      (define redirect-msg-a (if redirect-msg
+                                 ((query-selector (λ (t a c) (eq? t 'a)) redirect-msg))
+                                 #f))
       (define headers
         (build-headers
          always-headers
          ; redirect-query-parameter: only the string "no" is significant:
          ; https://github.com/Wikia/app/blob/fe60579a53f16816d65dad1644363160a63206a6/includes/Wiki.php#L367
-         (when (and redirect-msg
+         (when (and redirect-msg-a
                     (not (equal? redirect-query-parameter "no")))
-           (let* ([dest (get-attribute 'href (bits->attributes ((query-selector (λ (t a c) (eq? t 'a)) redirect-msg))))]
+           (let* ([dest (get-attribute 'href (bits->attributes redirect-msg-a))]
                   [value (bytes-append #"0;url=" (string->bytes/utf-8 dest))])
              (header #"Refresh" value)))))
       (when (config-true? 'debug)
diff --git a/src/page-wiki.rkt b/src/page-wiki.rkt
index 8df701c..ae060d4 100644
--- a/src/page-wiki.rkt
+++ b/src/page-wiki.rkt
@@ -80,16 +80,19 @@
                #:title title
                #:head-data head-data
                #:siteinfo siteinfo))
-            (define redirect-msg ((query-selector (attribute-selector 'class "redirectMsg") body)))
             (define redirect-query-parameter (dict-ref (url-query (request-uri req)) 'redirect "yes"))
+            (define redirect-msg ((query-selector (attribute-selector 'class "redirectMsg") body)))
+            (define redirect-msg-a (if redirect-msg
+                                       ((query-selector (λ (t a c) (eq? t 'a)) redirect-msg))
+                                       #f))
             (define headers
               (build-headers
                always-headers
                ; redirect-query-parameter: only the string "no" is significant:
                ; https://github.com/Wikia/app/blob/fe60579a53f16816d65dad1644363160a63206a6/includes/Wiki.php#L367
-               (when (and redirect-msg
+               (when (and redirect-msg-a
                           (not (equal? redirect-query-parameter "no")))
-                 (let* ([dest (get-attribute 'href (bits->attributes ((query-selector (λ (t a c) (eq? t 'a)) redirect-msg))))]
+                 (let* ([dest (get-attribute 'href (bits->attributes redirect-msg-a))]
                         [value (bytes-append #"0;url=" (string->bytes/utf-8 dest))])
                    (header #"Refresh" value)))))
             (when (config-true? 'debug)