Staging for the JARSS 2026 Campaign

.github/workflows/generate-website.yml

@@ -17,10 +17,10 @@ jobs:
     steps:
       ##### Setup ##############################################
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Detect if we should rebuild the binaries
-        uses: dorny/paths-filter@v2
+        uses: dorny/paths-filter@v3
         id: changes
         if: github.event_name != 'schedule'
         with:
@@ -30,15 +30,9 @@ jobs:
               - '*.hs'
               - '.github/workflows/generate-website.yml'
 
-      - name: Install cabal and GHC
-        if: github.event_name != 'schedule' && steps.changes.outputs.haskell-changed == 'true'
-        uses: haskell-actions/setup@v2
-        with:
-          ghc-version: ${{ env.GHC_VERSION }}
-          cabal-version: 'latest'
-
       - name: Cache cabal and executables
-        uses: actions/cache@v3
+        uses: actions/cache@v4
+        id: caching
         with:
           path: |
             ~/.cabal/store
@@ -47,9 +41,16 @@ jobs:
           key: cabal-${{ runner.os }}-${{ env.GHC_VERSION }}-${{ github.sha }}
           restore-keys: cabal-${{ runner.os }}-${{ env.GHC_VERSION }}
 
+      - name: Install cabal and GHC
+        if: github.event_name != 'schedule' && steps.changes.outputs.haskell-changed == 'true' || hashFiles('~/cabal/bin/Generate') != ''
+        uses: haskell-actions/setup@v2
+        with:
+          ghc-version: ${{ env.GHC_VERSION }}
+          cabal-version: 'latest'
+
       ##### Installation #######################################
       - name: Install Generate[101]
-        if: github.event_name != 'schedule' && steps.changes.outputs.haskell-changed == 'true'
+        if: github.event_name != 'schedule' && steps.changes.outputs.haskell-changed == 'true' || hashFiles('~/cabal/bin/Generate') != ''
         run: cabal install --overwrite-policy=always --builddir _dist
 
       - name: Add .cabal/bin to PATH

.gitignore

@@ -3,6 +3,9 @@ _build/*
 _dist/*
 dist/*
 
+# Misc Backup files
+*~
+
 # Logs downloaded using make get-logs
 _logs/*
 

GenerateNews.hs

@@ -9,9 +9,12 @@ import Data.List
 import Data.Maybe
 import Data.Function
 
+import Data.Default (def)
+
 -- import Data.ByteString.Lazy (ByteString)
 -- import qualified Data.ByteString.Lazy as LBS
 import qualified Data.ByteString as BS
+import qualified Data.ByteString.Char8 as BS8
 import Data.Text (Text)
 import qualified Data.Text as T
 
@@ -22,6 +25,10 @@ import Data.Foldable
 import Network.HTTP.Client
 import Network.HTTP.Client.TLS
 import Network.HTTP.Types.Status
+import Network.TLS (defaultParamsClient, clientShared, clientSupported, sharedCAStore, supportedCiphers, supportedExtendedMainSecret, EMSMode(..))
+import Network.TLS.Extra (ciphersuite_default)
+import Network.Connection (TLSSettings(..))
+import System.X509 (getSystemCertificateStore)
 
 import Data.Time
 import Data.Time.Format
@@ -117,6 +124,19 @@ pubsRSS = parseRequest_ "https://pureportal.strath.ac.uk/en/organisations/mathem
 getPureRSS :: Int -- number of entries
            -> IO [Item]
 getPureRSS n = do
+  certificateStore <- getSystemCertificateStore
+  let tlsSettings = TLSSettings $
+        (defaultParamsClient
+                          (show $ host pubsRSS)
+                          (BS8.pack $ show $ port pubsRSS))
+          { clientSupported = def { supportedCiphers =
+                                      ciphersuite_default
+                                  , supportedExtendedMainSecret =
+                                      AllowEMS
+                                  }
+          , clientShared = def { sharedCAStore = certificateStore }
+          }
+  let tlsManagerSettings = mkManagerSettings tlsSettings Nothing
   manager <- newManager tlsManagerSettings
   res <- httpLbs pubsRSS manager
   case statusIsSuccessful (responseStatus res) of

MSPweb.cabal

@@ -47,12 +47,16 @@ executable GenerateNews
   main-is:          GenerateNews.hs
   other-modules:    Html
   build-depends:    base,
+                    crypton-connection,
+                    crypton-x509-system,
+                    data-default,
                     yaml,
                     bytestring,
                     http-client,
                     http-client-tls,
                     http-types,
                     time,
+                    tls,
                     feed,
                     text
   default-language: Haskell2010

OneOhOne.hs

@@ -42,10 +42,10 @@ usualTime :: TimeOfDay
 usualTime = TimeOfDay 15 0 0
 
 usualDay :: String
-usualDay = "Friday"
+usualDay = "Monday"
 
 usualRoom :: String
-usualRoom = "LT209"
+usualRoom = "LT1414a"
 
 usualBuilding :: String
 usualBuilding = "Livingstone Tower"
@@ -128,8 +128,10 @@ html2text s = foldl' (\ t (p , r) -> subRegex (makeRegex p) t r) s $
                      ("<b>(.*?)</b>", "*\\1*"),
                      ("<i>(.*?)</i>", "/\\1/"),            -- italic
                      ("<dfn>(.*?)</dfn>", "/\\1/"),
+                     ("<q>(.*?)</q>", "\"\\1\""),          -- quoted
                      ("<br/>|<br>", "\n"),                 -- line breaks
-                     ("<p>(.*?)</p>", "\\1\n\n"),          -- paragraph breaks
+                     ("<p>", ""),          -- paragraph breaks; remove opening tag
+                     ("</p>", "\n\n"),     --   turn closing tag into double linebreaks
                      ("<a\\s+href\\s*=\\s*[\"'](.*?)[\"']>\\1</a>", "\\1"), -- links
                      ("<a\\s+href\\s*=\\s*[\"'](.*?)[\"']>(.*?)</a>", "\\2 (\\1)"),
                      ("<ul>", "\n"),                       -- lists
@@ -423,10 +425,10 @@ generateHTML ts out = do
       header = unlines ["### default.html(section.msp101=current,headtags=<link rel='alternate' type='application/rss+xml' title='MSP101 seminars RSS feed' href='/msp101.rss'/>)",
                         "<!-- DO NOT EDIT THIS FILE DIRECTLY — EDIT _101.json AND RUN Generate101.hs INSTEAD -->",
                         "<h2>MSP101 Seminar</h2>",
-                        "<p>MSP101 is an ongoing series of informal talks by visiting academics or members of the MSP group. The talks are usually " ++ usualDay ++ " " ++ formattedTime ++ " in room " ++ usualRoom ++ " in " ++ usualBuilding ++ ". They are announced on the <a href='https://lists.cis.strath.ac.uk/mailman/listinfo/msp-interest'>msp-interest</a> mailing-list. The list of talks is also available as a <a type='application/rss+xml' href='/msp101.rss'><img src='/images/feed-icon-14x14.png' alt='feed icon'>RSS feed</a> and as a <a href='msp101.ics'>calendar file</a>. <b>The MSP 101 seminar is now hybrid, with both in-person attendance in room " ++ usualRoom ++ ", and online via Zoom (the link can be found on the msp-interest mailing list and the SPLS Zulipchat).</b></p>"]
+                        "<p>MSP101 is an ongoing series of informal talks by visiting academics or members of the MSP group. The talks are usually " ++ usualDay ++ " " ++ formattedTime ++ " in room " ++ usualRoom ++ " in " ++ usualBuilding ++ ". They are announced on the <a href='http://lists.strath.ac.uk/mailman/listinfo/msp-interest'>msp-interest</a> mailing-list. The list of talks is also available as a <a type='application/rss+xml' href='/msp101.rss'><img src='/images/feed-icon-14x14.png' alt='feed icon'>RSS feed</a> and as a <a href='msp101.ics'>calendar file</a>. <b>The MSP 101 seminar is now hybrid, with both in-person attendance in room " ++ usualRoom ++ ", and online via Zoom (the link can be found on the msp-interest mailing list and the SPLS Zulipchat).</b></p>"]
   writeFile out (header ++ upcoming ++ previous)
     where
-          entryBlock b i dt abst = unlines $
+          entryBlock b i dt abst nMat mat = unlines $
                    [ "  <dt id='" ++ show i ++ "'>" ++ dt ++ "</dt>"
                    , "  <dd>"]
                    ++
@@ -437,6 +439,14 @@ generateHTML ts out = do
                      , "    </details>"
                      ])
                    ++
+                   (if null mat then [] else
+                     (if null abst then id else (("" :) . ("" :)))
+                     [ "    <details" ++ (if nMat <= 5 then " open" else "") ++ ">"
+                     , "      <summary><b>Material</b></summary>"
+                     , "      " ++ mat
+                     , "    </details>"
+                     ])
+                   ++
                    [ "  </dd>"]
 
           processEntry b (i,(Talk date speaker inst speakerurl insturl title abstract location material))
@@ -455,23 +465,22 @@ generateHTML ts out = do
                   pMat (Whiteboard dir) = createLink ("101/wb/" ++ dir) "Whiteboard photos"
                   mat = if null material then ""
                           else
-                           (if null abstract then "" else "\n\n") ++
-                           "<b>Material</b><ul>" ++
+                           "<ul>" ++
                            (concatMap (\ x -> "<li>" ++ (pMat x) ++ "</li>")
                                       material) ++ "</ul>"
-              in entryBlock b i dt (nl2br abstract ++ nl2br mat)
+              in entryBlock b i dt (nl2br abstract) (length material) (nl2br mat)
           processEntry b (i,(DepartmentalSeminar date speaker inst speakerurl insturl title abstract location))
             = let fmt = \ str -> formatTime defaultTimeLocale str date
                   time = createLinkAnchor ('#':show i) (fmt "%Y-%m-%d") ++ fmt ", %H:%M"
                   place = bracket location
                   person = if null inst then (createLink speakerurl speaker)
                                         else (createLink speakerurl speaker) ++ ", " ++ (createLink insturl inst)
                   dt = time ++ " " ++ "Departmental seminar" ++ " " ++ place ++ ": " ++ title ++ (bracket person)
-              in entryBlock b i dt (nl2br abstract)
+              in entryBlock b i dt (nl2br abstract) 0 ""
           processEntry b (i,(SpecialEvent date endDate title url location locationurl description))
             = let time = createLinkAnchor ('#':show i) (formatTime defaultTimeLocale "%Y-%m-%d" date)
                   dt = time ++ ": " ++ (createLink url title)
                                     ++ (bracket (createLink locationurl location))
-              in entryBlock b i dt (nl2br description)
+              in entryBlock b i dt (nl2br description) 0 ""
           processEntry b (i,(BasicTalk date speaker inst speakerurl insturl title abstract location material))
             = processEntry b (i,(Talk date speaker inst speakerurl insturl ("MSP 101: " ++ title) abstract location material)) -- for now