From 79dab4b2aecd06f2a2a84196af096253a0296418 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 23 Feb 2021 23:41:38 +0100
Subject: news: allos all CORS

---
 krebs/2configs/news.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'krebs/2configs/news.nix')

diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix
index ce4e83408..780c270bf 100644
--- a/krebs/2configs/news.nix
+++ b/krebs/2configs/news.nix
@@ -19,6 +19,10 @@
         root /var/lib/brockman;
         index brockman.json;
       '';
+      extraConfig = ''
+        add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+      '';
     };
   };
   systemd.tmpfiles.rules = [
-- 
cgit v1.2.3


From 924471087c667640bad7ba38b5f9b00f2770f906 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 23 Feb 2021 23:42:12 +0100
Subject: news: build graph.svg on change

---
 krebs/2configs/news.nix | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'krebs/2configs/news.nix')

diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix
index 780c270bf..a6cf02c17 100644
--- a/krebs/2configs/news.nix
+++ b/krebs/2configs/news.nix
@@ -29,6 +29,36 @@
     "d /var/lib/brockman 1750 brockman nginx -"
   ];
 
+  systemd.services.brockman-graph = {
+    path = [
+      pkgs.graphviz
+      pkgs.jq
+      pkgs.inotifyTools
+    ];
+    serviceConfig = {
+      ExecStart = pkgs.writers.writeDash "brockman-graph" ''
+
+        while :; do
+          graphviz="$(cat /var/lib/brockman/brockman.json \
+            | jq -r '
+              .bots |
+              to_entries |
+              map(select(.value.extraChannels|length > 1 )) |
+              .[] |
+              "\"\(.key)\" -> {\(.value.extraChannels|map("\""+.+"\"")|join(" "))}"
+          ')"
+          echo "digraph news { $graphviz }" | circo -Tsvg > /var/lib/brockman/graph.svg
+
+          inotifywait -q -e MODIFY /var/lib/brockman/brockman.json
+        done
+      '';
+      User = "brockman";
+    };
+    wantedBy = [ "multi-user.target" ];
+  };
+
+  systemd.services.brockman.serviceConfig.LimitNOFILE = 16384;
+  systemd.services.brockman.environment.BROCKMAN_LOG_LEVEL = "DEBUG";
   krebs.brockman = {
     enable = true;
     config = {
@@ -57,6 +87,7 @@
             "#all"
             "#aluhut"
             "#news"
+            "#lasstube"
           ];
         };
       }
-- 
cgit v1.2.3


From 1f34fcdcd076003326a385db958b64820211dd78 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 23 Feb 2021 23:42:33 +0100
Subject: news candyman: add more helpers

---
 krebs/2configs/news.nix | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

(limited to 'krebs/2configs/news.nix')

diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix
index a6cf02c17..410beb041 100644
--- a/krebs/2configs/news.nix
+++ b/krebs/2configs/news.nix
@@ -122,13 +122,36 @@
                 add-youtube.filename = pkgs.writeDash "add-youtube" ''
                   set -euf
                   if [ "$#" -ne 1 ]; then
-                    echo 'usage: ${name}: add-youtube $nick $channelid'
+                    echo 'usage: ${name}: add-youtube $nick $channel/video/stream/id'
                     exit 1
                   fi
                   youtube_nick=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
-                  youtube_id=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][1]')
+                  youtube_url=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][1]')
+                  if [ ''${#youtube_url} -eq 24 ]; then
+                    youtube_id=$youtube_url
+                  else
+                    youtube_id=$(${pkgs.youtube-dl}/bin/youtube-dl --max-downloads 1 -j "$youtube_url" | ${pkgs.jq}/bin/jq -r '.channel_id')
+                  fi
                   echo "brockman: add yt_$youtube_nick http://rss.r/?action=display&bridge=Youtube&context=By+channel+id&c=$youtube_id&duration_min=&duration_max=&format=Mrss"
                 '';
+                add-twitch.filename = pkgs.writeDash "add-twitch" ''
+                  set -euf
+                  if [ "$#" -ne 1 ]; then
+                    echo 'usage: ${name}: add-twitch $handle'
+                    exit 1
+                  fi
+                  twitch_nick=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
+                  echo "brockman: add twitch_$twitch_nick http://rss.r/?action=display&bridge=Twitch&channel=$twitch_nick&type=all&format=Atom"
+                '';
+                add-twitter.filename = pkgs.writeDash "add-twitter" ''
+                  set -euf
+                  if [ "$#" -ne 1 ]; then
+                    echo 'usage: ${name}: add-twitter $handle'
+                    exit 1
+                  fi
+                  twitter_nick=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
+                  echo "brockman: add tw_$twitter_nick http://rss.r/?action=display&bridge=Twitch&channel=$twitter_nick&type=all&format=Atom"
+                '';
                 search.filename = pkgs.writeDash "search" ''
                   set -euf
                   if [ "$#" -ne 1 ]; then
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/72000000.lock: No such file or directory (2)