sources

NotaInutilis · Nov 23, 2023 · b7d4eb5 · b7d4eb5
1 parent 8901f31
commit b7d4eb5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -1,4 +1,4 @@
-name: Generate blocklists
+name: Update blocklists
 
 on:
   push:
@@ -27,6 +27,6 @@ jobs:
         git config --local user.email "[email protected]"
         git config --local user.name "GitHub Action"
         git add -A
-        if git commit -m "Generate blocklists"; then
+        if git commit -m "Update blocklists"; then
           git push
         fi
diff --git a/scripts/update.sh b/scripts/update.sh
@@ -7,7 +7,6 @@
 # Cleanup sources (same code in import.sh)
 ## Normalizes URLs into domains: lowercases, remove leading spaces, protocol (`x://`) `www.` subdomains, everything after `/`, only one space before `#`. Keeps comments intact
 find ./sources -type f -name "*.txt" -exec sed -ri 'h; s/[^#]*//1; x; s/#.*//; s/.*/\L&/; s/^[[:space:]]*//i; s/^.*:\/\///i; s/^[.*]*//i; s/^www\.//i; s/\/[^[:space:]]*//i; s/[[:space:]].*$/ /i; G; s/(.*)\n/\1/' {} \;
-find ./sources -type f -name "*.txt" -exec sed -ri 's/^www\.//i' {} \; # Removing "www." twice because unmaintained imported lists are weird.
 ## Remove duplicate domains from each source file (keeps repeated comments and empty lines for organization)
 find ./sources -type f -name "*.txt" -exec bash -c '
     awk "(\$0 ~ /^[[:space:]]*#/ || NF == 0 || !seen[\$0]++)" "$0" > "$0_temp.txt";

diff --git a/sources/Jordan Peterson.txt → sources/Far right/Canada/Jordan Peterson.txt b/sources/Jordan Peterson.txt → sources/Far right/Canada/Jordan Peterson.txt
diff --git a/sources/Far right/USA/Podcasts.txt b/sources/Far right/USA/Podcasts.txt
@@ -0,0 +1,3 @@
+# Wrong Opinion, Josh Lekash
+https://wrongop.gumroad.com/
+https://wrongop.creator-spring.com/
diff --git a/sources/Far right/USA/Pro Trump/Artists.txt b/sources/Far right/USA/Pro Trump/Artists.txt
@@ -0,0 +1 @@
+https://lucianwintrich.com/ # Twinks 4 Trump
diff --git a/sources/Trump.txt → sources/Far right/USA/Pro Trump/Trump.txt b/sources/Trump.txt → sources/Far right/USA/Pro Trump/Trump.txt
@@ -17,11 +17,14 @@ melaniatrump.com
 shopdonjr.com
 donjr.com
 trumplive.com.au
+
 # Political campaigns
 donaldjtrump.com
 45office.com
+
 # PAC
 magapac.com
+
 # Unsorted
 donaldtrumpnews.co
 trumpvision365.com
@@ -39,8 +42,6 @@ freetrumpcommemorative.com
 freetrumpbox.com
 thedonald.win
 news.thetrumptimes.com
-# Probably fake stores
-officialtrump2024store.com
 
-# Pro Trump media
-atomicfabrik.com # Publisher of "The Last Hope Trump vs Mafia" shovelware, their steam forums are nasty
+# Probably fake stores
+officialtrump2024store.com
diff --git a/sources/Far right/USA/Pro Trump/Video games.txt b/sources/Far right/USA/Pro Trump/Video games.txt
@@ -0,0 +1 @@
+atomicfabrik.com # Publisher of "The Last Hope Trump vs Mafia" shovelware, their steam forums are nasty
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		atomicfabrik.com # Publisher of "The Last Hope Trump vs Mafia" shovelware, their steam forums are nasty