Add further silo processing

2 files changed, 17 insertions, 8 deletions

@@ -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" \
@@ -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", "<a href=\"" id "\" target=\"_blank\">" stamp "</a>"
                         }
                         print "</td>"
-                        printf "<td class=\"entry-title%s", (link ~ /youtube/ ? " youtube" : "")
+                        printf "<td class=\"entry-title%s", silo_links(link)
                         print "\"><a href=\"" link "\" target=\"_blank\">" title "</a></td>"
                         print "</tr>"
                 }
@@ -146,7 +147,15 @@ html_feed() { # html_feed FEED(file) => HTML
                                 printf "<a%s href=\"#%s\">%s</a></li>\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 "<section id=\"$filename\">"
         # TODO: Include a link back to the website