diff --git a/README.md b/README.md index c8793c7..33c1359 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ For more information, please check out some blog entries: * [The Blocklist Algorithm](https://writer.oliphant.social/oliphant/the-blocklist-algorithm) -How the various lists were built, and the algorithms behind Min, Max, and Tier 0-3. +How the various lists were built, and the algorithms behind Tier 0-3. * [How to Sync Up Blocklist Changes From Trusted Sources](https://writer.oliphant.social/oliphant/how-to-sync-up-blocklist-changes-from-trusted-sources) A step-by-step tutorial on how to install FediBlockHole yourself and start pulling down blocklists and applying them to your server. * [Blocklists](https://writer.oliphant.social/oliphant/blocklists) @@ -26,15 +26,13 @@ You are encouraged to use these lists if you find them useful, or you can rely m The advantage of a tier merge is that it acts like a second (or third) opinion. Most of these blocks use a *min* merge strategy, meaning that a single source choosing 'silence' over 'suspend' will force that domain to be silenced instead of suspended. -All tiers are based on mathematical consensus, and at least 2 sources must agree for a source to be on any list except the "max" list (which includes all blocks). +All tiers are based on mathematical consensus, and at least 2 sources must agree for a source to be on any list. * Tier 0 - Requires 60-80% consensus on blocks to appear on this list. * Tier 1 - Requires 50% consensus to appear on this list * Tier 2 - Requires 33% consensus * Tier 3 - Requires 2 sites (moved and seconded) to appear on the list -There is a "max" list which pulls in literally everything included here: Tiers 0-3, Mastodon.Social, Mastodon.Online, even [RapidBlock](https://rapidblock.org/) and pulls them all into the pot and whoever gives the most severe ranking wins. - Note that unless the list specifies otherwise, blocks from a lower tier are always included. That means Tier0 blocks are in every unified (merged) list. ## What's The Purpose Here? diff --git a/blocklists/README.md b/blocklists/README.md index 85b59f8..173f171 100644 --- a/blocklists/README.md +++ b/blocklists/README.md @@ -1,16 +1,16 @@ # Blocklist Index +**NOTE:** The oliphant.social, mastodon.social, and mastodon.online blocklists are provided for download, but is not weighted with other blocklists into the tiered blocklists. + * `100.percent.csv` - Blocks that are on 100% of all blocklists in the Fedi Council. -* `__allowlist.csv` - The 'safelist' to ensure that the Fedi Council doesn't appear on the blocklist. (Does not prevent individuals from blocking us, of course.) -* `_unified_max_blocklist.csv` - The harshest available list, pulls blocks from all sources including mastodon.social, rapidblock, and the Fedi Council. Uses the `max` strategy, which means it takes the harshest judgement. This is the largest, most unforgiving blocklist available. +* `__allowlist.csv` - The 'safelist' to ensure that accidental defederations don't happen. Nothing in this list will appear in a unified blocklist. * `_unified_min_blocklist.csv` - Minimum recommended blocks. Synonymous with the unified tier 0. * `_unified_tier0_blocklist.csv` - Same as the minimum file above, called the "Tier 0" file. Requires a majority consensus to appear on this list. * `_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. -* `https:--rapidblock.org-blocklist.json.csv` - The Rapidblock list itself, prepared as a CSV for download. * `tier0.csv` - Seirdy's Tier0 File, a solid contender for a starting blocklist you could import on its own. * `gardenfence.csv` - A mirror of the [Gardenfence](https://gardenfence.github.io/) Tier 0 file. * `tier0-council.csv` - Requires 80% agreement on blocks from Fedi Council sources. * `birdsite.csv` - All the Birdsite Live Blocks. This file is provided separately as a convenience. -* *Other Files* - Other files listed here are individual trusted sources who provided data for the blocklist. \ No newline at end of file +* *Other Files* - Other files listed here are individual trusted sources who provided data for the blocklist.