From c0913def624067d49565883aa96b584132dbc26e Mon Sep 17 00:00:00 2001 From: Oliphant Date: Thu, 11 May 2023 20:20:37 +0000 Subject: [PATCH] copy blocklist readme to mastodon subfolder as well --- blocklists/mastodon/README.md | 21 +++++++++++++++++++++ fedisync.sh | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 blocklists/mastodon/README.md diff --git a/blocklists/mastodon/README.md b/blocklists/mastodon/README.md new file mode 100644 index 0000000..1faab5b --- /dev/null +++ b/blocklists/mastodon/README.md @@ -0,0 +1,21 @@ +#domain,#severity,#reject_media,#reject_reports,#public_comment,#obfuscate + +**NOTE:** Mastodon.social and mastodon.online blocklists are provided for download as a sort of 'control group' for comparison, but are not weighted with other blocklists into the tiered blocklists. + +* `100.percent.csv` - Blocks that are on 100% of all blocklists for all sources. +* `__allowlist.csv` - The 'safelist' to ensure that accidental defederations don't happen. Nothing in this list will appear in a unified blocklist. +* `_unified_tier0_blocklist.csv` - Combines blocks from all T0 sources (Seirdy, Gardenfence, Council) into a unified Tier 0 file. +* `_unified_tier1_blocklist.csv` - Requires 50% consensus to appear on this list. Includes Tier 0. +* `_unified_tier2_blocklist.csv` - Requires 33% consensus to appear on this list. Includes Tier 0 and Tier 1. +* `_unified_tier3_blocklist.csv` - Requires 2 sources to agree for it to appear on this list. Includes Tier 0, 1, and 2. +* `tier0.csv` - The original Tier0 file. Algorithmic *and* curated. See Seirdy's [Fediverse Blocklists](https://seirdy.one/posts/2023/05/02/fediverse-blocklists/) for notes about the process behind creating it. +* `gardenfence.csv` - A mirror of the [Gardenfence](https://gardenfence.github.io/) Tier 0 file. +* `tier0-council.csv` - Requires 80% agreement on blocks from trusted sources. +* `birdsite.csv` - All the Birdsite Live Blocks. This file is provided separately as a convenience. +* `_unified_min_blocklist.csv` - [Deprecated] Identical to the `_unified_tier0_blocklist.csv`. +* *Other Files* - Other files listed here are individual trusted sources who provided data for the blocklist. + +**Subfolders:** + +* `mastodon` - identical blocklist data, but with proper mastodon headers in format `#domain,#severity...` etc. +* `other` - These aren't blocklists, but reports. diff --git a/fedisync.sh b/fedisync.sh index 0459bad..80eb975 100755 --- a/fedisync.sh +++ b/fedisync.sh @@ -62,7 +62,8 @@ cp /opt/fediblockhole/blocklists/_unified_tier0_blocklist.csv /opt/fediblockhole rm -f /opt/fediblockhole/blocklists/_working_*.csv # copy all files to mastodon subfolder -cp /opt/fediblockhole/blocklists/*.csv /opt/fediblockhole/blocklists/mastodon/ +cp /opt/fediblockhole/blocklists/*.csv /opt/fediblockhole/blocklists/mastodon/ && \ +cp /opt/fediblockhole/blocklists/README.md /opt/fediblockhole/blocklists/mastodon/README.md echo "Creating mastodon versions of files..."