From 39a3ee04294ea280851596742ca2b8c1706b834f Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Jan 2021 18:48:29 +0100
Subject: news: serve state also under news.r

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

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix
index a492b0782..5513d1dd4 100644
--- a/krebs/2configs/news.nix
+++ b/krebs/2configs/news.nix
@@ -12,6 +12,9 @@
       ];
     };
     "brockman.r" = {
+      serverAliases = [
+        "news.r"
+      ];
       locations."/".extraConfig = ''
         root /var/lib/brockman;
         index brockman.json;
-- 
cgit v1.2.3


From a2ca5f2e214be259fdb0f9ea92b79d74e6216a51 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 26 Jan 2021 12:03:24 +0100
Subject: news: add reaktor with helper commands

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

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix
index 5513d1dd4..3bf991433 100644
--- a/krebs/2configs/news.nix
+++ b/krebs/2configs/news.nix
@@ -60,25 +60,46 @@
           hooks.PRIVMSG = [
             {
               activate = "match";
-              pattern = "^(?:.*\\s)?\\s*brockman-helper:\\s*([0-9A-Za-z._][0-9A-Za-z._-]*)(?:\\s+(.*\\S))?\\s*$";
+              pattern = "^brockman-helper:\\s*(\\S*)(?:\\s+(.*\\S))?\\s*$";
               command = 1;
               arguments = [2];
               commands = {
+                add-reddit.filename = pkgs.writeDash "add-reddit" ''
+                  set -euf
+                  if [ "$#" -ne 1 ]; then
+                    echo 'usage: brockman-helper: add-reddit $reddit_channel'
+                    exit 1
+                  fi
+                  reddit_channel=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
+                  echo "brockman: add r_$reddit_channel http://rss.r/?action=display&bridge=Telegram&username=$reddit_channel&format=Mrss"
+                '';
                 add-telegram.filename = pkgs.writeDash "add-telegram" ''
+                  set -euf
+                  if [ "$#" -ne 1 ]; then
+                    echo 'usage: brockman-helper: add-telegram $telegram_user'
+                    exit 1
+                  fi
+                  telegram_user=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
+                  echo "brockman: add t_$telegram_user http://rss.r/?action=display&bridge=Telegram&username=$telegram_user&format=Mrss"
+                '';
+                add-youtube.filename = pkgs.writeDash "add-youtube" ''
+                  set -euf
                   if [ "$#" -ne 1 ]; then
-                    echo 'usage: brockman-helper: add-telegram $telegramname'
-                    echo "$#"
+                    echo 'usage: brockman-helper: add-youtube $nick $channelid'
                     exit 1
                   fi
-                  echo "brockman: add t_$1 http://rss.r/?action=display&bridge=Telegram&username=$1&format=Mrss"
+                  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]')
+                  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"
                 '';
                 search.filename = pkgs.writeDash "search" ''
+                  set -euf
                   if [ "$#" -ne 1 ]; then
                     echo 'usage: brockman-helper: search $searchterm'
-                    echo "$#"
                     exit 1
                   fi
-                  ${pkgs.curl}/bin/curl -Ss "https://feedsearch.dev/api/v1/search?url=$1&info=true&favicon=false" |
+                  searchterm=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
+                  ${pkgs.curl}/bin/curl -Ss "https://feedsearch.dev/api/v1/search?url=$searchterm&info=true&favicon=false" |
                     ${pkgs.jq}/bin/jq '.[].url'
                 '';
               };
-- 
cgit v1.2.3