From f9d86ec57f17b320d8dc2e9f63618cbd5cbbb25a Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Tue, 19 Jul 2022 15:00:46 -0500 Subject: Add further silo processing --- runsfeed | 8 ++++---- sfeed_html.sh | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/runsfeed b/runsfeed index 0db2bac..4c1aef0 100755 --- a/runsfeed +++ b/runsfeed @@ -23,10 +23,10 @@ main() { test -d "$sfeedpath" || mkdir -p "$sfeedpath" touch /tmp/runsfeed.ok - if ! $NOFETCH; then - logok "Finding Invidious host" \ - get_invidious_url "https://api.invidious.io/instances.json?sort_by=health" - fi + # if ! $NOFETCH; then + # logok "Finding Invidious host" \ + # get_invidious_url "https://api.invidious.io/instances.json?sort_by=health" + # fi logok "Removing unsubscribed feeds" \ remove_unsubs "$sfeedrc" logok -n "Updating feeds" \ diff --git a/sfeed_html.sh b/sfeed_html.sh index 9fc749d..b245f0b 100755 --- a/sfeed_html.sh +++ b/sfeed_html.sh @@ -69,8 +69,9 @@ EOF filter_invidious() { # Convert youtube links to invidious links - host="$(cat /tmp/invidious.host)" - sed "s@https://www\.youtube\.com@${host}@" + sed -e "s@https://www\.youtube\.com@https://invidious.snopyta.org@" \ + -e 's@https://i\.reddit\.com@https://libreddit.spike.codes@' \ + -e 's@https://twitter\.com@https://nitter.net@' } html_feed() { # html_feed FEED(file) => HTML @@ -136,7 +137,7 @@ html_feed() { # html_feed FEED(file) => HTML printf "%s", "" stamp "" } print "" - printf "" title "" print "" } @@ -146,7 +147,15 @@ html_feed() { # html_feed FEED(file) => HTML printf "%s\n", (yt ? " class=\"yt\"" : ""), FNAME, NAME >> ASIDE } printf "%s", (stamp ? stamp : ".") > "/dev/stderr" - }' "$1" | filter_invidious)" + } +function silo_links(link) { + if (link ~ /youtube\.com/) return " youtube" + if (link ~ /facebook\.com/) return " facebook" + if (link ~ /twitter\.com/) return " twitter" + if (link ~ /reddit\.com/) return " reddit" + return "" +} +' "$1" | filter_invidious)" if [ -z "$entries" ]; then return 1; fi echo "
" # TODO: Include a link back to the website -- cgit 1.4.1-21-gabe81