feat(streams): use lassulus radio as described in irc topic

feat(radio-news): most recent commits show
feat(makanek): redaktion.r
2026-03-28 23:31:07 +01:00 · 2022-02-22 21:52:41 +01:00 · 2022-02-22 21:52:17 +01:00 · 2022-02-22 20:41:55 +01:00
5 changed files with 171 additions and 4 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -158,11 +158,11 @@
    "retiolum": {
      "flake": false,
      "locked": {
-        "lastModified": 1645135023,
-        "narHash": "sha256-kgUEjGo725tJTXJM2a0PRAyG6lqnTvS2t/sBIJTPZWs=",
+        "lastModified": 1645558430,
+        "narHash": "sha256-Q8URzBIbh6vHf5QHKWHEMUDbRHeyVSFpqB8i4PmnX6M=",
        "owner": "krebs",
        "repo": "retiolum",
-        "rev": "b555fab8bdcc4dd1ca2241b05861096e263db5b8",
+        "rev": "5e69ac7782c7d384a4b6cad4619dd83aa952426f",
        "type": "github"
      },
      "original": {
--- a/lib/radio-news.html
+++ b/lib/radio-news.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>lassulus radio news</title>
+    <style>
+      body {
+        font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+      }
+
+      main {
+        max-width: 800px;
+        margin: 0 auto;
+        display: grid;
+        grid-template-columns: 2fr 1fr;
+        grid-gap: 2em;
+      }
+
+      #news-list ul {
+        list-style: none;
+        padding-left: 0;
+      }
+
+      #news-list li {
+        margin-bottom: 1em;
+      }
+
+      #news-list time {
+        display: block;
+        color: grey;
+      }
+
+      form label {
+        display: block;
+      }
+
+      form input,
+      form textarea {
+        width: 100%;
+        margin-bottom: 1em;
+      }
+
+      @media only screen and (max-width: 768px) {
+        main {
+          grid-template-columns: 1fr;
+        }
+      }
+    </style>
+    <script>
+      const newsEndpoint = "http://prism.r:7999";
+
+      function isoString(date) {
+        return date.toISOString().slice(0, -5) + "Z";
+      }
+
+      function setNextNews() {
+        document.getElementById("next-news").innerHTML = (
+          60 - new Date().getUTCMinutes()
+        ).toString();
+      }
+
+      setInterval(setNextNews, 6000);
+
+      function fetchNews() {
+        fetch(newsEndpoint).then((response) => {
+          response.json().then((news) => {
+            const newsList = document.getElementById("news-list");
+            newsList.innerHTML = "";
+            const ul = document.createElement("ul");
+            for (const newsItem of news) {
+              const start = new Date(newsItem.from);
+              const end = new Date(newsItem.to);
+
+              const li = document.createElement("li");
+
+              const startDate = document.createElement("time");
+              startDate.className = "start";
+              startDate.title = start.toString();
+              startDate.setAttribute("datetime", isoString(start));
+              startDate.appendChild(document.createTextNode(isoString(start)));
+
+              const endDate = document.createElement("time");
+              endDate.className = "end";
+              endDate.title = end.toString();
+              endDate.setAttribute("datetime", isoString(end));
+              endDate.appendChild(document.createTextNode(isoString(end)));
+
+              li.appendChild(document.createTextNode(newsItem.text));
+              li.appendChild(startDate);
+              li.appendChild(endDate);
+              ul.appendChild(li);
+            }
+            newsList.appendChild(ul);
+          });
+        });
+      }
+
+      function sendNews(event) {
+        event.preventDefault();
+        const formData = new FormData(event.target);
+
+        const request = new XMLHttpRequest();
+        request.open("POST", newsEndpoint, false); // synchronous
+        request.send(
+          JSON.stringify({
+            from: isoString(new Date(formData.get("from"))),
+            to: isoString(new Date(formData.get("to"))),
+            text: formData.get("text"),
+          })
+        );
+        location.reload();
+      }
+
+      window.onload = () => {
+        setNextNews();
+        fetchNews();
+      };
+    </script>
+  </head>
+  <body>
+    <main>
+      <section>
+        <h1>Submit news</h1>
+        <form onsubmit="sendNews(event)">
+          <label>Start date</label>
+          <input type="datetime-local" name="from" required />
+          <label>End date</label>
+          <input type="datetime-local" name="to" required />
+          <label>News text</label>
+          <textarea name="text" rows="10" required></textarea>
+          <input type="submit" />
+        </form>
+        Next news report should start in <span id="next-news"></span> minutes.
+      </section>
+      <aside>
+        <h1>Planned news</h1>
+        <div id="news-list">
+          <em>No news planned yet.</em>
+        </div>
+      </aside>
+    </main>
+  </body>
+</html>
--- a/lib/streams.nix
+++ b/lib/streams.nix
@@ -44,7 +44,7 @@ let
  caster-fm = subdomain: port: "http://${subdomain}.caster.fm:${toString port}/listen.mp3?authn0b0236758bd0e178156d0787327a055d";
 in [
  {
-    stream = "https://radio.lassul.us/radio.ogg";
+    stream = "http://lassul.us:8000/radio.ogg";
    station = "Radio lassulus";
    logo = "http://lassul.us/art/portraits/selbstportrait.jpg";
    desc = "Diminutive from lassus (“weary, faint, tired”). A programming human. Doing superior professional art.";
--- a/systems/makanek/configuration.nix
+++ b/systems/makanek/configuration.nix
@@ -15,6 +15,7 @@ in
    ./moodle-dl-borsfaye.nix
    ./names.nix
    ./nextcloud.nix
+    ./radio-news.nix
    ./radio.nix
    ./retiolum-map.nix
    ./tarot.nix
--- a/systems/makanek/radio-news.nix
+++ b/systems/makanek/radio-news.nix
@@ -0,0 +1,23 @@
+{ pkgs, lib, ... }:
+let
+  inherit (import <niveum/lib>) serveHtml;
+  remote = "https://cgit.lassul.us/stockholm";
+in
+{
+  services.nginx.virtualHosts."redaktion.r".locations."/".extraConfig = serveHtml <niveum/lib/radio-news.html> pkgs;
+
+  systemd.services.stockholm-history = {
+    startAt = "hourly";
+    script = ''
+      stockholm=$(mktemp -d)
+      trap clean EXIT
+      clean() {
+        rm -rf "$stockholm"
+      }
+      ${pkgs.git}/bin/git clone ${remote} "$stockholm"
+      ${pkgs.git}/bin/git --git-dir "$stockholm"/.git log --pretty='"%s" by %an, %ar' --since "$(${pkgs.coreutils}/bin/date -I -d "yesterday")" \
+        | ${pkgs.jq}/bin/jq -R '{text: ., from: now | todateiso8601, to: (now + (60 * 60)) | todateiso8601}' \
+        | ${pkgs.curl}/bin/curl -Ssfd @- http://prism.r:7999/
+    '';
+  };
+}
Author	SHA1	Message	Date
Kierán Meinhardt	0c72a89760	feat(streams): use lassulus radio as described in irc topic	2022-02-22 21:52:41 +01:00
Kierán Meinhardt	a7db357e54	feat(radio-news): most recent commits show	2022-02-22 21:52:17 +01:00
Kierán Meinhardt	1ad6c63a2f	feat(makanek): redaktion.r	2022-02-22 20:41:55 +01:00