From 49d2a168e54e379777d2a3e13b12d0e23e6dd1cd Mon Sep 17 00:00:00 2001
From: mbays <mbays@sdf.org>
Date: Sun, 29 Nov 2020 00:00:00 +0000
Subject: [PATCH] update to >=feed-1.1

---
 Server.hs       | 3 +--
 intricacy.cabal | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Server.hs b/Server.hs
index d7f1bd0..788a2c2 100644
--- a/Server.hs
+++ b/Server.hs
@@ -528,8 +528,7 @@ handleRequest dbpath mfeedPath req@(ClientRequest pv auth action) = do
             Nothing -> return ()
             Just feedPath -> lift $ void $ forkIO $ do
                 let baseFeed = withFeedTitle (TS.pack "Intricacy updates") $ newFeed $ RSSKind Nothing
-                feed <- (parseFeedFromFile feedPath) `catchAll`
-                    (const $ return baseFeed)
+                feed <- fromMaybe baseFeed <$> parseFeedFromFile feedPath
                 time <- formatTime defaultTimeLocale rfc822DateFormat <$> getZonedTime
                 let newsText = TS.pack news
                     timeText = TS.pack time
diff --git a/intricacy.cabal b/intricacy.cabal
index aeae52d..9fccd18 100644
--- a/intricacy.cabal
+++ b/intricacy.cabal
@@ -224,7 +224,7 @@ executable intricacy-server
             crypto-api >=0.10,
             random >=1.0,
             pipes >=4,
-            feed >=1.0.0,
+            feed >=1.1.0,
             xml-conduit >=1.0.0,
             email-validate >=1.0.0,
             text -any,
-- 
2.11.4.GIT