make-pages/BuilderQQ.hs

@@ -19,8 +19,7 @@ import Data.List.NonEmpty (NonEmpty, toList)
 data Chunk = Lit String | Var String
 
 parseB :: String -> ExpQ
-parseB = toExpQ . reverse . go "" [] . trim where
-  trim = dropWhileEnd isSpace . dropWhile (== '\n')
+parseB = toExpQ . reverse . go "" [] . dropWhileEnd isSpace where
   go acc cs []             = addLit acc cs
   go acc cs ('$':'&':rest) = go acc cs rest         -- $&: expands to nothing
   go acc cs ('$':'$':rest) = go ('$' : acc) cs rest -- $$: expands to one $

make-pages/RSS.hs

@@ -25,18 +25,18 @@ make root name ginfo output infos =
 make' :: Strict.Text -> Strict.Text -> GalleryInfo
       -> Maybe FilePath -> [(FilePath, Info)] -> Builder
 make' root name ginfo@(GalleryInfo {title, desc, prefix}) output infos = [b|
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
-  <channel>
-    <title>$name—$title</title>
-    <link>$link</link>
-    <description>$desc</description>
-    $selflink
+    <?xml version="1.0" encoding="UTF-8"?>
+    <rss version="2.0">
+      <channel>
+        <title>$name—$title</title>
+        <link>$link</link>
+        <description>$desc</description>
+        $selflink
 
-    $items
-  </channel>
-</rss>
-|]
+        $items
+      </channel>
+    </rss>
+  |]
  where
   link = [b|$root/$prefix|]
   nsfw = ginfo.nsfw
@@ -45,7 +45,7 @@ make' root name ginfo@(GalleryInfo {title, desc, prefix}) output infos = [b|
     filter (not . (.unlisted) . snd) infos
   selflink = case output of
     Nothing -> ""
-    Just o  -> [b|<atom:link href="$link/$o" rel="self" />|]
+    Just o  -> [b|<link href="$link/$o" rel="self" />|]
 
 makeItem :: Strict.Text -> FilePath -> Bool -> FilePath -> Info -> Builder
 makeItem root prefix nsfw path info@(Info {title}) = [b|

make-pages/SinglePage.hs

@@ -62,7 +62,7 @@ make' root siteName prefix nsfw _dataDir dir
   let updates       = sort $ updatesFor nsfw info
   let updatesList   = makeUpdates updates
 
-  let makePrefetch img = [b|<link rel=prefetch href=$path'>|]
+  let makePrefetch img = [b|<link rel=prefetch as=image href=$path'>|]
         where path' = bigFile img
   let prefetches = map makePrefetch otherImages