3 files changed, 179 insertions, 145 deletions

@@ -96,7 +96,13 @@ FNR == 1 {
         } else {
                 yt = ""
         }
+        # extra metadata, yaaaaay
         URLS = envor("SFEED_DATA", ENVIRON["HOME"] "/.sfeed") "/urls/" safe_name
+        getline feed_url < URLS
+        getline site_url < URLS
+        getline feed_tags < URLS
+        # put more lines to read here
+        close(URLS)
         # State variables
         stamp = "."
         buf = ""
@@ -229,8 +235,6 @@ function end_file()
         printf "<nav class=\"flinks\">"
         feed_url = ""
         site_url = ""
-        getline feed_url < URLS
-        getline site_url < URLS
         if (site_url) {
                 #print_link(site_url, "", (yt ? "chan" : "site"), "site-url")
                 printf "<a class=\"site-url\" href=\"%s\">%s</a>\n", site_url, (yt ? "chan" : "site")
@@ -3,7 +3,14 @@
 . "$1"
 
 feed() { # feed NAME URL BASE_URL ENCODING
-        printf '%s\t%s\t%s\n' "$1" "$2" "${3:-}"
+        name="$1"
+        url="$2"
+        base="$3"
+        encoding="$4"
+        shift 4
+        printf '%s\t%s\t%s' "$name" "$url" "${base:-}"
+        printf '\t%s' "$@"
+        printf '\n'
 }
 
 DIR="${SFEED_DATA:-$HOME/.sfeed}/urls"
@@ -16,4 +23,8 @@ BEGIN{FS="\t";}
       file = dir "/" $1;
       if ($2) print $2 > file;
       if ($3) print $3 >> file;
+      for (i=4;i<=NF;i++) {
+          print $i >> file;
+      }
+      close(file);
 }'
@@ -25,20 +25,16 @@ feeds() {
 }
 
 feeds_planets() {
-        feed "Planet Emacs" "https://planet.emacslife.com/atom.xml" "https://planet.emacslife.com/" ""
-        feed "r/emacs" "https://i.reddit.com/r/emacs.rss" "https://i.reddit.com/r/emacs" ""
-        feed "Planet Lisp" "https://planet.lisp.org/rss20.xml" "https://planet.lisp.org/" ""
-        feed "Planet Scheme" "https://planet.scheme.org/atom.xml" "https://planet.scheme.org/" ""
-}
-
-yt_feed() { # yt_feed TITLE CHANNEL_ID
-        feed "$1 [yt]" "https://www.youtube.com/feeds/videos.xml?channel_id=$2" "https://youtube.com/channel/$2"
+        feedx "Planet Emacs" "https://planet.emacslife.com/atom.xml" "https://planet.emacslife.com/" ""
+        feedx "r/emacs" "https://i.reddit.com/r/emacs.rss" "https://i.reddit.com/r/emacs" ""
+        feedx "Planet Lisp" "https://planet.lisp.org/rss20.xml" "https://planet.lisp.org/" ""
+        feedx "Planet Scheme" "https://planet.scheme.org/atom.xml" "https://planet.scheme.org/" ""
 }
 
 feeds_podcasts() {
         yt_feed "iilluminaughtii" "UCpDmn2FfVYdPIDwRTcf5-OA"
-        feed "Maintenance Phase" "https://feeds.buzzsprout.com/1411126.rss" "https://www.maintenancephase.com/"
-        feed "Switched on Pop" "https://feeds.megaphone.fm/switchedonpop" "https://switchedonpop.com/"
+        feedx "Maintenance Phase" "https://feeds.buzzsprout.com/1411126.rss" "https://www.maintenancephase.com/"
+        feedx "Switched on Pop" "https://feeds.megaphone.fm/switchedonpop" "https://switchedonpop.com/"
 }
 
 feeds_youtube() {
@@ -103,149 +99,172 @@ feeds_from_agafnd() {
         yt_feed "brian david gilbert" "UCakAg8hC_RFJm4RI3DlD7SA"
         yt_feed "Jonni Phillips" "UC1NbRaGNot6kNEL3Jsa7SRA"
         # podcasts
-        feed "Lingthusiasm" "https://feeds.soundcloud.com/users/soundcloud:users:237055046/sounds.rss" "https://lingthusiasm.com/"
+        feedx "Lingthusiasm" "https://feeds.soundcloud.com/users/soundcloud:users:237055046/sounds.rss" "https://lingthusiasm.com/"
         # other stuff
-        feed "Buttersafe" "https://feeds.feedburner.com/buttersafe" "https://www.buttersafe.com/"
-        feed "Going Medieval" "https://going-medieval.com/feed/"
-        feed "Scooby Doo Mistakes" "https://scoobydoomistakes.tumblr.com/rss" "https://scoobydoomistakes.tumblr.com/"
+        feedx "Buttersafe" "https://feeds.feedburner.com/buttersafe" "https://www.buttersafe.com/"
+        feedx "Going Medieval" "https://going-medieval.com/feed/"
+        feedx "Scooby Doo Mistakes" "https://scoobydoomistakes.tumblr.com/rss" "https://scoobydoomistakes.tumblr.com/"
 }
 
 feeds_from_elioat() {
         # feed <name> <feedurl> [basesiteurl] [encoding]
-        feed "antoine.studio" "https://antoine.studio/rss.xml"
-        feed "apenwarr" "https://apenwarr.ca/log/rss.php"
-        feed "bert.org" "https://bert.org/feed.xml"
-        feed "Ben Hoyt's technical writing" "https://benhoyt.com/writings/rss.xml"
-        feed "Buried Treasure" "https://buried-treasure.org/feed/"
-
-        feed "catapult" "https://catapult.co/rss"
-        feed "codex99" "http://codex99.com"
-        feed "compudanzas log" "https://compudanzas.net/atom.xml"
-        feed "DustyCloud Brainstorms" "http://dustycloud.org/blog/index.xml"
-        feed "Earthly" "https://earthly.dev/blog/feed.xml"
-        feed "Ella Hoeppner" "https://www.ellahoeppner.com/blog.rss"
-        feed "Esoteric Codes" "https://esoteric.codes/rss"
-        feed "Grimgrains" "https://grimgrains.com/links/rss.xml"
-        feed "hisaac.net" "https://hisaac.net/feed.xml"
-        feed "Hundred Rabbits" "http://100r.co/links/rss.xml"
-        feed "Hypercritical" "https://hypercritical.co/feeds/main"
-        feed "joshua stein" "https://jcs.org/rss"
-        feed "journal.stuffwithstuff.com" "http://journal.stuffwithstuff.com/rss.xml"
-        feed "Julia Evans" "https://jvns.ca/atom.xml"
-        feed "Kicks Condor [RSS]" "https://www.kickscondor.com/rss.xml"
-        feed "kottke.org" "http://feeds.kottke.org/main"
-        feed "literary monster" "https://literary.monster/index.xml"
-        feed "Linus Lee" "https://thesephist.com/index.xml"
-        feed "Meg Conley" "https://www.megconley.com/rss/"
-        feed "minimalist baker" "https://minimalistbaker.com/feed/"
-        feed "llimllib notes" "https://notes.billmill.org/atom.xml"
-        feed "petermolnar.net" "https://petermolnar.net/feed/"
-        feed "Piper Haywood" "https://piperhaywood.com/feed/"
-        feed "Rainbow Plant Life" "https://rainbowplantlife.com/feed/"
-        feed "Robin Rendle" "https://robinrendle.com/feed.xml"
-        feed "sogrady" "https://sogrady.org/feed/"
-        feed "Sibylla Bostoniensis" "https://siderea.dreamwidth.org/data/rss"
-        feed "The only good system is a sound system" "https://ftrv.se/posts.atom"
-        feed "weaver.skepti.ch" "https://weaver.skepti.ch/atom.xml"
-        feed "whippet" "https://thewhippet.org/archive/rss/"
-        feed "r/Worldnews" "https://www.reddit.com/r/worldnews/.rss"
-        feed "zep [Lexaloffle Blog Feed]" "https://www.lexaloffle.com/bbs/feed.php?uid=1"
+        feedx "antoine.studio" "https://antoine.studio/rss.xml"
+        feedx "apenwarr" "https://apenwarr.ca/log/rss.php"
+        feedx "bert.org" "https://bert.org/feed.xml"
+        feedx "Ben Hoyt's technical writing" "https://benhoyt.com/writings/rss.xml"
+        feedx "Buried Treasure" "https://buried-treasure.org/feed/"
+
+        feedx "catapult" "https://catapult.co/rss"
+        feedx "codex99" "http://codex99.com"
+        feedx "compudanzas log" "https://compudanzas.net/atom.xml"
+        feedx "DustyCloud Brainstorms" "http://dustycloud.org/blog/index.xml"
+        feedx "Earthly" "https://earthly.dev/blog/feed.xml"
+        feedx "Ella Hoeppner" "https://www.ellahoeppner.com/blog.rss"
+        feedx "Esoteric Codes" "https://esoteric.codes/rss"
+        feedx "Grimgrains" "https://grimgrains.com/links/rss.xml"
+        feedx "hisaac.net" "https://hisaac.net/feed.xml"
+        feedx "Hundred Rabbits" "http://100r.co/links/rss.xml"
+        feedx "Hypercritical" "https://hypercritical.co/feeds/main"
+        feedx "joshua stein" "https://jcs.org/rss"
+        feedx "journal.stuffwithstuff.com" "http://journal.stuffwithstuff.com/rss.xml"
+        feedx "Julia Evans" "https://jvns.ca/atom.xml"
+        feedx "Kicks Condor [RSS]" "https://www.kickscondor.com/rss.xml"
+        feedx "kottke.org" "http://feeds.kottke.org/main"
+        feedx "literary monster" "https://literary.monster/index.xml"
+        feedx "Linus Lee" "https://thesephist.com/index.xml"
+        feedx "Meg Conley" "https://www.megconley.com/rss/"
+        feedx "minimalist baker" "https://minimalistbaker.com/feed/"
+        feedx "llimllib notes" "https://notes.billmill.org/atom.xml"
+        feedx "petermolnar.net" "https://petermolnar.net/feed/"
+        feedx "Piper Haywood" "https://piperhaywood.com/feed/"
+        feedx "Rainbow Plant Life" "https://rainbowplantlife.com/feed/"
+        feedx "Robin Rendle" "https://robinrendle.com/feed.xml"
+        feedx "sogrady" "https://sogrady.org/feed/"
+        feedx "Sibylla Bostoniensis" "https://siderea.dreamwidth.org/data/rss"
+        feedx "The only good system is a sound system" "https://ftrv.se/posts.atom"
+        feedx "weaver.skepti.ch" "https://weaver.skepti.ch/atom.xml"
+        feedx "whippet" "https://thewhippet.org/archive/rss/"
+        feedx "r/Worldnews" "https://www.reddit.com/r/worldnews/.rss"
+        feedx "zep [Lexaloffle Blog Feed]" "https://www.lexaloffle.com/bbs/feed.php?uid=1"
 }
 
 feeds_podcasts() {
-        feed "Tilde Whirl Tildeverse Podcast" "https://tilde.town/~dozens/podcast/rss.xml" "https://tilde.town/~dozens/podcast/" ""
-        feed "trash cat tech cat" "https://podcast.librepunk.club/tctc/ogg.xml" "https://podcast.librepunk.club/tctc/" ""
-        feed "Hacker Public Radio" "https://hackerpublicradio.org/hpr_ogg_rss.php" "https://hackerpublicradio.org/" ""
-        feed "Levar Burton Reads" "https://feeds.simplecast.com/LDNgBXht"
+        feedx "Tilde Whirl Tildeverse Podcast" "https://tilde.town/~dozens/podcast/rss.xml" "https://tilde.town/~dozens/podcast/" ""
+        feedx "trash cat tech cat" "https://podcast.librepunk.club/tctc/ogg.xml" "https://podcast.librepunk.club/tctc/" ""
+        feedx "Hacker Public Radio" "https://hackerpublicradio.org/hpr_ogg_rss.php" "https://hackerpublicradio.org/" ""
+        feedx "Levar Burton Reads" "https://feeds.simplecast.com/LDNgBXht"
 }
 
 feeds_friends() {
-        feed "lipu pi jan Niko" "https://tilde.town/~nihilazo/index.xml" "https://tilde.town/~nihilazo/" ""
-        feed "chrismanbrown.gitlab.io (dozens)" "https://chrismanbrown.gitlab.io/rss.xml" "https://chrismanbrown.gitlab.io/" ""
-        feed "Dozens and Dragons" "https://dozensanddragons.neocities.org/rss.xml" "https://dozensanddragons.neocities.org/" ""
-        feed "dozens: Society For Putting Things On Top Of Other Things" "https://society.neocities.org/rss.xml" "https://society.neocities.org/" ""
-        feed "dozens: vgnfdblg" "https://supervegan.neocities.org/feed.xml" "https://supervegan.neocities.org/" ""
-        feed "dozens: backgammon" "http://tilde.town/~dozens/backgammon/rss.xml" "http://tilde.town/~dozens/backgammon/" ""
-        feed "dozens: It's Pro Toad and Superb Owl" "https://git.tilde.town/dozens/protoadandsuperbowl/raw/branch/master/feed.xml" "https://git.tilde.town/dozens/protoadandsuperbowl/" ""
-        feed "dozens dreams" "https://tilde.team/~dozens/dreams/rss.xml" "https://tilde.team/~dozens/dreams/" ""
-        feed "dozens: write.as" "https://write.tildeverse.org/dozens/feed/" "https://write.tildeverse.org/dozens/" ""
-        feed "dozens css art" "http://tilde.town/~dozens/cssart/feed.xml" "http://tilde.town/~dozens/cssart/" ""
-        feed "Benjamin Wil" "https://benjaminwil.info/feed.xml" "https://benjaminwil.info/" ""
-        feed "(lambda (x) (create x))" "http://lambdacreate.com/static/feed.rss" "http://lambdacreate.com/" ""
-        feed "m455.casa" "https://m455.casa/feed.rss" "https://m455.casa/" ""
-        feed "Oatmeal" "https://eli.li/feed.rss" "https://eli.li/" ""
-        feed "RSRSSS" "https://envs.net/~lucidiot/rsrsss/feed.xml" "https://envs.net/~lucidiot/rsrsss/" ""
-        feed "Tomasino Blog" "https://blog.tomasino.org/index.xml" "https://blog.tomasino.org/" ""
-        feed "Tomasino Labs" "https://labs.tomasino.org/index.xml" "https://labs.tomasino.org/" ""
-        feed "Will's Blog" "https://wflewis.com/feed.xml" "https://wflewis.com/" ""
-        feed "Rick Carlino's Blog" "https://rickcarlino.com/rss/feed.rss" "https://rickcarlino.com/rss/" ""
-        feed "Causal Agency" "https://text.causal.agency/feed.atom" "https://text.causal.agency/" ""
-        feed "Benoit Joly" "https://blog.benoitj.ca/posts/index.xml" "https://blog.benoitj.ca/posts/" ""
-        feed "linkbudz" "https://linkbudz.m455.casa/feed.rss" "https://linkbudz.m455.casa/" ""
-        feed "Alex Schroeder" "https://alexschroeder.ch/wiki/feed/full/" "https://alexschroeder.ch/" ""
-        feed "Björn Wärmedal" "https://warmedal.se/~bjorn/atom.xml" "https://warmedal.se/~bjorn/" ""
-        feed "a rickety bridge of impossible crossing" "https://bluelander.bearblog.dev/feed/" "https://bluelander.bearblog.dev/" ""
-        feed "javapool updates" "https://tilde.town/~m455/javapool.rss" "" ""
-        feed "coolguy.website" "https://coolguy.website/rss/index.xml" "https://coolguy.website/"
-        feed "brainshit" "https://brainshit.fr/rss" "https://brainshit.fr"
-        feed 'Idiomdrottning' 'https://idiomdrottning.org/blog' "https://idiomdrottning.org"
-        feed "Rick Carlino's Blog" "https://rickcarlino.com/rss/feed.rss"
-        feed "Rick Carlino's Recent News Feed" "https://news.rickcarlino.com/rss.rss"
+        feedx "lipu pi jan Niko" "https://tilde.town/~nihilazo/index.xml" "https://tilde.town/~nihilazo/" ""
+        feedx "chrismanbrown.gitlab.io (dozens)" "https://chrismanbrown.gitlab.io/rss.xml" "https://chrismanbrown.gitlab.io/" ""
+        feedx "Dozens and Dragons" "https://dozensanddragons.neocities.org/rss.xml" "https://dozensanddragons.neocities.org/" ""
+        feedx "dozens: Society For Putting Things On Top Of Other Things" "https://society.neocities.org/rss.xml" "https://society.neocities.org/" ""
+        feedx "dozens: vgnfdblg" "https://supervegan.neocities.org/feed.xml" "https://supervegan.neocities.org/" ""
+        feedx "dozens: backgammon" "http://tilde.town/~dozens/backgammon/rss.xml" "http://tilde.town/~dozens/backgammon/" ""
+        feedx "dozens: It's Pro Toad and Superb Owl" "https://git.tilde.town/dozens/protoadandsuperbowl/raw/branch/master/feed.xml" "https://git.tilde.town/dozens/protoadandsuperbowl/" ""
+        feedx "dozens dreams" "https://tilde.team/~dozens/dreams/rss.xml" "https://tilde.team/~dozens/dreams/" ""
+        feedx "dozens: write.as" "https://write.tildeverse.org/dozens/feed/" "https://write.tildeverse.org/dozens/" ""
+        feedx "dozens css art" "http://tilde.town/~dozens/cssart/feed.xml" "http://tilde.town/~dozens/cssart/" ""
+        feedx "Benjamin Wil" "https://benjaminwil.info/feed.xml" "https://benjaminwil.info/" ""
+        feedx "(lambda (x) (create x))" "http://lambdacreate.com/static/feed.rss" "http://lambdacreate.com/" ""
+        feedx "m455.casa" "https://m455.casa/feed.rss" "https://m455.casa/" ""
+        feedx "Oatmeal" "https://eli.li/feed.rss" "https://eli.li/" ""
+        feedx "RSRSSS" "https://envs.net/~lucidiot/rsrsss/feed.xml" "https://envs.net/~lucidiot/rsrsss/" ""
+        feedx "Tomasino Blog" "https://blog.tomasino.org/index.xml" "https://blog.tomasino.org/" ""
+        feedx "Tomasino Labs" "https://labs.tomasino.org/index.xml" "https://labs.tomasino.org/" ""
+        feedx "Will's Blog" "https://wflewis.com/feed.xml" "https://wflewis.com/" ""
+        feedx "Rick Carlino's Blog" "https://rickcarlino.com/rss/feed.rss" "https://rickcarlino.com/rss/" ""
+        feedx "Causal Agency" "https://text.causal.agency/feed.atom" "https://text.causal.agency/" ""
+        feedx "Benoit Joly" "https://blog.benoitj.ca/posts/index.xml" "https://blog.benoitj.ca/posts/" ""
+        feedx "linkbudz" "https://linkbudz.m455.casa/feed.rss" "https://linkbudz.m455.casa/" ""
+        feedx "Alex Schroeder" "https://alexschroeder.ch/wiki/feed/full/" "https://alexschroeder.ch/" ""
+        feedx "Björn Wärmedal" "https://warmedal.se/~bjorn/atom.xml" "https://warmedal.se/~bjorn/" ""
+        feedx "a rickety bridge of impossible crossing" "https://bluelander.bearblog.dev/feed/" "https://bluelander.bearblog.dev/" ""
+        feedx "javapool updates" "https://tilde.town/~m455/javapool.rss" "" ""
+        feedx "coolguy.website" "https://coolguy.website/rss/index.xml" "https://coolguy.website/"
+        feedx "brainshit" "https://brainshit.fr/rss" "https://brainshit.fr"
+        feedx 'Idiomdrottning' 'https://idiomdrottning.org/blog' "https://idiomdrottning.org"
+        feedx "Rick Carlino's Blog" "https://rickcarlino.com/rss/feed.rss"
+        feedx "Rick Carlino's Recent News Feed" "https://news.rickcarlino.com/rss.rss"
 }
 
 feeds_people() {
-        feed "ajroach" "http://ajroach42.com/feed.xml" "http://ajroach42.com/" ""
-        feed "rachelbythebay" "https://rachelbythebay.com/w/atom.xml" "https://rachelbythebay.com/" ""
-        feed "Codemadness" "https://codemadness.org/atom.xml"
-        feed "Ben Hoyt's technical writing" "https://benhoyt.com/writings/rss.xml" "https://benhoyt.com/writings/"
-        feed "Tom Van Winkle's Return to Gaming" "https://lichvanwinkle.blogspot.com/feeds/posts/default" "https://lichvanwinkle.blogspot.com/"
-        feed "Chris Wellons" "https://nullprogram.com/feed/" "https://nullprogram.com/"
-        feed "maya.land" "https://maya.land/feed.xml" "https://maya.land/"
+        feedx "ajroach" "http://ajroach42.com/feed.xml" "http://ajroach42.com/" ""
+        feedx "rachelbythebay" "https://rachelbythebay.com/w/atom.xml" "https://rachelbythebay.com/" ""
+        feedx "Codemadness" "https://codemadness.org/atom.xml"
+        feedx "Ben Hoyt's technical writing" "https://benhoyt.com/writings/rss.xml" "https://benhoyt.com/writings/"
+        feedx "Tom Van Winkle's Return to Gaming" "https://lichvanwinkle.blogspot.com/feeds/posts/default" "https://lichvanwinkle.blogspot.com/"
+        feedx "Chris Wellons" "https://nullprogram.com/feed/" "https://nullprogram.com/"
+        feedx "maya.land" "https://maya.land/feed.xml" "https://maya.land/"
 }
 
 feeds_news() {
-        feed "lobste.rs" "https://lobste.rs/rss" "https://lobste.rs/" ""
-        feed "tilde news" "https://tilde.news/rss" "https://tilde.news/" ""
-        feed "Tildes Atom feed" "https://tildes.net/topics.atom" "https://tildes.net/" ""
-        feed "NPR" "https://feeds.npr.org/1001/rss.xml" "https://text.npr.org/" ""
+        feedx "lobste.rs" "https://lobste.rs/rss" "https://lobste.rs/" ""
+        feedx "tilde news" "https://tilde.news/rss" "https://tilde.news/" ""
+        feedx "Tildes Atom feed" "https://tildes.net/topics.atom" "https://tildes.net/" ""
+        feedx "NPR" "https://feeds.npr.org/1001/rss.xml" "https://text.npr.org/" ""
 }
 
 feeds_smolweb() {
-        feed "~town friday postcard" "https://tilde.town/~lucidiot/fridaypostcard.xml" ""
-        feed "Cosmic Voyage" "https://cosmic.voyage/rss.xml" "https://cosmic.voyage/" ""
-        feed "plan.cat" "https://plan.cat/rss" "https://plan.cat/" ""
-        feed "The Plain Text Project" "https://plaintextproject.online/feed.xml" "https://plaintextproject.online/"
+        feedx "~town friday postcard" "https://tilde.town/~lucidiot/fridaypostcard.xml" ""
+        feedx "Cosmic Voyage" "https://cosmic.voyage/rss.xml" "https://cosmic.voyage/" ""
+        feedx "plan.cat" "https://plan.cat/rss" "https://plan.cat/" ""
+        feedx "The Plain Text Project" "https://plaintextproject.online/feed.xml" "https://plaintextproject.online/"
 }
 
 feeds_comics() {
-        feed "Cat and Girl" "https://catandgirl.com/feed/" "https://catandgirl.com/" ""
-        feed "Dinosaur Comics!" "https://qwantz.com/rssfeed.php" "https://qwantz.com/" ""
-        feed "False Knees" "https://falseknees.tumblr.com/rss" "https://falseknees.tumblr.com/" ""
-        feed "Saturday Morning Breakfast Cereal" "https://www.smbc-comics.com/comic/rss" "https://www.smbc-comics.com/" ""
-        feed "xkcd" "https://xkcd.com/atom.xml" "https://xkcd.com/" ""
+        feedx "Cat and Girl" "https://catandgirl.com/feed/" "https://catandgirl.com/" ""
+        feedx "Dinosaur Comics!" "https://qwantz.com/rssfeed.php" "https://qwantz.com/" ""
+        feedx "False Knees" "https://falseknees.tumblr.com/rss" "https://falseknees.tumblr.com/" ""
+        feedx "Saturday Morning Breakfast Cereal" "https://www.smbc-comics.com/comic/rss" "https://www.smbc-comics.com/" ""
+        feedx "xkcd" "https://xkcd.com/atom.xml" "https://xkcd.com/" ""
 }
 
 feeds_misc() {
-        feed "Crystalverse" "https://crystalverse.com/feed/" "https://crystalverse.com/" ""
-        feed "Hetzner" "https://status.hetzner.com/en.atom" "https://status.hetzner.com/" ""
-        feed "LOW-TECH MAGAZINE" "https://feeds2.feedburner.com/typepad/krisdedecker/lowtechmagazineenglish" "https://www.lowtechmagazine.com/" ""
-        feed "500-mile email" "https://500mile.email/feed.xml" "https://500mile.email/"
-        feed "computers are bad" "https://computer.rip/rss.xml" "https://computer.rip/"
-        feed "Eggs Unlimited (5)" "https://eggs.call-cc.org/rss-5.xml"
+        feedx "Crystalverse" "https://crystalverse.com/feed/" "https://crystalverse.com/" ""
+        feedx "Hetzner" "https://status.hetzner.com/en.atom" "https://status.hetzner.com/" ""
+        feedx "LOW-TECH MAGAZINE" "https://feeds2.feedburner.com/typepad/krisdedecker/lowtechmagazineenglish" "https://www.lowtechmagazine.com/" ""
+        feedx "500-mile email" "https://500mile.email/feed.xml" "https://500mile.email/"
+        feedx "computers are bad" "https://computer.rip/rss.xml" "https://computer.rip/"
+        feedx "Eggs Unlimited (5)" "https://eggs.call-cc.org/rss-5.xml"
 }
 
 feeds_me() {
         :
 }
 
+### Feed helpers ################################################
+
+feedx() { # feedx [OPTIONS] FEED_ARGS...
+        ## Wrapper around `feed' to allow for more metadata
+        while getopts t: opt; do
+                case "$opt" in
+                t) tags="$OPTARG" ;; # tags should be a comma-separated list
+                *) ;;
+                esac
+        done
+        shift $((OPTIND - 1))
+        # `feed' (well, really `_feed') expects only 4 arguments, so we can pass
+        # more after that.
+        feed "$1" "$2" "$3" "$4" \
+                "$tags"
+}
+
+yt_feed() { # yt_feed TITLE CHANNEL_ID
+        feedx -t yt "$1 [yt]" \
+             "https://www.youtube.com/feeds/videos.xml?channel_id=$2" \
+             "https://youtube.com/channel/$2"
+}
+
 ### Remove feeds ################################################
 
 unsubscribe_feeds() {
-        feed "Web3 is going just great" "https://web3isgoinggreat.com/feed.xml" "https://web3isgoinggreat.com/"
-        feed "Hacker News" "https://news.ycombinator.com/rss" "https://news.ycombinator.com/" ""
-        feed "uxn" "https://git.sr.ht/~rabbits/uxn/log/main/rss.xml"
-        feed "uxnfth" "https://git.sr.ht/~binarycat/uxnfth/log/front/rss.xml"
-        feed "worgle" "https://git.sr.ht/~pbatch/worgle/log/master/rss.xml"
+        feedx "Web3 is going just great" "https://web3isgoinggreat.com/feed.xml" "https://web3isgoinggreat.com/"
+        feedx "Hacker News" "https://news.ycombinator.com/rss" "https://news.ycombinator.com/" ""
+        feedx "uxn" "https://git.sr.ht/~rabbits/uxn/log/main/rss.xml"
+        feedx "uxnfth" "https://git.sr.ht/~binarycat/uxnfth/log/front/rss.xml"
+        feedx "worgle" "https://git.sr.ht/~pbatch/worgle/log/master/rss.xml"
         yt_feed "Jelle's Marble Runs" "UCYJdpnjuSWVOLgGT9fIzL0g"
         yt_feed "LOOK MUM NO COMPUTER" "UCafxR2HWJRmMfSdyZXvZMTw"
         yt_feed "Ska Tune Network" "UCji2l5wcs6GoYJY1GgG_slQ"
@@ -253,30 +272,30 @@ unsubscribe_feeds() {
         yt_feed "STRANGE ÆONS" "UCrq3JYirgV-BLluzTF6X_7A"
         yt_feed "NileRed" "UCFhXFikryT4aFcLkLw2LBLA"
         yt_feed "Cathode Ray Dude" "UCXnNibvR_YIdyPs8PZIBoEw"
-        feed "Kill James Bond!" "https://feed.podbean.com/killjamesbondpod/feed.xml"
-        feed "Jo's Boys" "https://anchor.fm/s/840fb444/podcast/rss"
-        feed "Boonta Vista" "http://feeds.soundcloud.com/users/soundcloud:users:307723090/sounds.rss"
-        feed "Yesterday's Print" "https://yesterdaysprint.tumblr.com/rss"
-        feed "Threatening Music Notation" "https://nitter.kavin.rocks/ThreatNotation/rss"
-        feed "arstechnica features" "https://feeds.arstechnica.com/arstechnica/features"
-        feed "ars ludi" "https://arsludi.lamemage.com/index.php/feed/"
-        feed "Carlos Carrasco" "https://carloscarrasco.com/index.xml"
-        feed "dracula daily" "https://draculadaily.substack.com/feed"
-        feed "DRIVE™: The SciFi Comic, by Dave Kellett" "http://cdn.drivecomic.com/rss.xml"
-        feed "EcoClipper" "https://ecoclipper.org/feed/"
-        feed "esolangs wiki" "https://esolangs.org/w/api.php?hidebots=1&urlversion=1&days=7&limit=50&action=feedrecentchanges&feedformat=atom"
-        feed "Flashing Palely in the Margins" "https://www.inthemargins.ca/feed.rss"
-        feed "Gamestudies.org" "http://gamestudies.org/rss.php"
-        feed "gbadev.org" "https://rss.gbadev.org/feed.php"
-        feed "handmade.network" "https://handmade.network/atom"
-        feed "Indigenous Environmental Network" "https://www.ienearth.org/feed/"
-        feed "milofultz" "https://milofultz.com/atom.xml"
-        feed "N O D E" "https://n-o-d-e.net/rss/rss.xml"
-        feed "bill mill" "https://billmill.org/Atom"
-        feed "nullrouted.space" "https://nullrouted.space/feed/"
-        feed "orllewin" "https://orllewin.uk/category/blog/feed/"
-        feed "Pinboard (unread bookmarks for eli-oat)" "https://feeds.pinboard.in/rss/u:eli-oat/"
-        feed "Rock Paper Shotgun" "https://www.rockpapershotgun.com/feed"
+        feedx "Kill James Bond!" "https://feed.podbean.com/killjamesbondpod/feed.xml"
+        feedx "Jo's Boys" "https://anchor.fm/s/840fb444/podcast/rss"
+        feedx "Boonta Vista" "http://feeds.soundcloud.com/users/soundcloud:users:307723090/sounds.rss"
+        feedx "Yesterday's Print" "https://yesterdaysprint.tumblr.com/rss"
+        feedx "Threatening Music Notation" "https://nitter.kavin.rocks/ThreatNotation/rss"
+        feedx "arstechnica features" "https://feeds.arstechnica.com/arstechnica/features"
+        feedx "ars ludi" "https://arsludi.lamemage.com/index.php/feed/"
+        feedx "Carlos Carrasco" "https://carloscarrasco.com/index.xml"
+        feedx "dracula daily" "https://draculadaily.substack.com/feed"
+        feedx "DRIVE™: The SciFi Comic, by Dave Kellett" "http://cdn.drivecomic.com/rss.xml"
+        feedx "EcoClipper" "https://ecoclipper.org/feed/"
+        feedx "esolangs wiki" "https://esolangs.org/w/api.php?hidebots=1&urlversion=1&days=7&limit=50&action=feedrecentchanges&feedformat=atom"
+        feedx "Flashing Palely in the Margins" "https://www.inthemargins.ca/feed.rss"
+        feedx "Gamestudies.org" "http://gamestudies.org/rss.php"
+        feedx "gbadev.org" "https://rss.gbadev.org/feed.php"
+        feedx "handmade.network" "https://handmade.network/atom"
+        feedx "Indigenous Environmental Network" "https://www.ienearth.org/feed/"
+        feedx "milofultz" "https://milofultz.com/atom.xml"
+        feedx "N O D E" "https://n-o-d-e.net/rss/rss.xml"
+        feedx "bill mill" "https://billmill.org/Atom"
+        feedx "nullrouted.space" "https://nullrouted.space/feed/"
+        feedx "orllewin" "https://orllewin.uk/category/blog/feed/"
+        feedx "Pinboard (unread bookmarks for eli-oat)" "https://feeds.pinboard.in/rss/u:eli-oat/"
+        feedx "Rock Paper Shotgun" "https://www.rockpapershotgun.com/feed"
 }
 
 ### Filter ######################################################