From 2ee95b14cc4190da39798220a1e9954ceaab2576 Mon Sep 17 00:00:00 2001 From: tastytea Date: Tue, 10 Mar 2020 23:12:19 +0100 Subject: [PATCH] Condense all categories into a single list. --- README.adoc | 9 +------ harassment/README.adoc | 25 ------------------ {hateful_speech => list}/README.adoc | 22 ++++++++++++--- .../receipts/freespeechextremist.com_1.png | Bin .../receipts/smuglo.li_1.png | Bin spam/README.adoc | 14 ---------- 6 files changed, 20 insertions(+), 50 deletions(-) delete mode 100644 harassment/README.adoc rename {hateful_speech => list}/README.adoc (58%) rename {hateful_speech => list}/receipts/freespeechextremist.com_1.png (100%) rename {hateful_speech => list}/receipts/smuglo.li_1.png (100%) delete mode 100644 spam/README.adoc diff --git a/README.adoc b/README.adoc index c750fdd..f1235c6 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,5 @@ = FediBlock :showtitle: -:toc: preamble :project: FediBlock :uri-base: https://schlomp.space/tastytea/{project} :uri-fediverse: https://en.wikipedia.org/wiki/Fediverse @@ -16,13 +15,7 @@ link:{uri-fediverse}[Fediverse]-instances that serves as a collective reference for the pleasant part of the Fediverse and to help new admins to get started without being flooded with shit. -== Categories - -Each category has their own rules for inclusions. - -* link:{uri-base}/src/branch/main/harassment[Harassment] -* link:{uri-base}/src/branch/main/hateful_speech[Hateful speech] -* link:{uri-base}/src/branch/main/spam[Spam] +*link:{uri-base}/src/branch/main/list[Take me to the list]* == How to contribute diff --git a/harassment/README.adoc b/harassment/README.adoc deleted file mode 100644 index d2fa3f1..0000000 --- a/harassment/README.adoc +++ /dev/null @@ -1,25 +0,0 @@ -= Harassment -:toc: preamble -:project: FediBlock -:list: harassment -:uri-base: https://schlomp.space/tastytea/{project} -:imagesdir: {uri-base}/raw/branch/main/{list}/receipts -:figure-caption!: - -Instances are on this list because: - -* At least one of the admins / moderators harassed people. -* At least one user harassed people and the admins / moderators didn't stop it - after 24 hours. - -== Definition of harassment - -* Continuing to engage in conversation with a user that has specifically has - requested for said engagement with that user to cease and desist. -* Aggregating, posting, and/or disseminating a person's demographic, personal, - or private data without express permission (informally called doxing). -* Inciting users to engage another user in continued interaction or discussion - after a user has requested for said engagement with that user to cease and - desist (informally called brigading or dogpiling). - -== Instances diff --git a/hateful_speech/README.adoc b/list/README.adoc similarity index 58% rename from hateful_speech/README.adoc rename to list/README.adoc index 53760ce..30c28d4 100644 --- a/hateful_speech/README.adoc +++ b/list/README.adoc @@ -1,9 +1,8 @@ -= Hateful Speech += Blocklist :toc: preamble :project: FediBlock -:list: hateful_speech :uri-base: https://schlomp.space/tastytea/{project} -:imagesdir: {uri-base}/raw/branch/main/{list}/receipts +:imagesdir: {uri-base}/raw/branch/main/list/receipts :figure-caption!: Instances are on this list because: @@ -14,6 +13,13 @@ Instances are on this list because: * At least one user engaged in hateful speech and the admins / moderators didn't stop it after 24 hours. +* At least one of the admins / moderators harassed people. +* At least one user harassed people and the admins / moderators didn't stop it + after 24 hours. + +* At least one user is mass following people they don't know and the admins / + moderators didn't stop it after 24 hours. + == Definition of hateful speech * Racism or advocation of racism. @@ -25,6 +31,16 @@ Instances are on this list because: disabled, or mentally ill. * Xenophobic and/or violent nationalism. +== Definition of harassment + +* Continuing to engage in conversation with a user that has specifically has + requested for said engagement with that user to cease and desist. +* Aggregating, posting, and/or disseminating a person's demographic, personal, + or private data without express permission (informally called doxing). +* Inciting users to engage another user in continued interaction or discussion + after a user has requested for said engagement with that user to cease and + desist (informally called brigading or dogpiling). + == Instances === freespeechextremist.com diff --git a/hateful_speech/receipts/freespeechextremist.com_1.png b/list/receipts/freespeechextremist.com_1.png similarity index 100% rename from hateful_speech/receipts/freespeechextremist.com_1.png rename to list/receipts/freespeechextremist.com_1.png diff --git a/hateful_speech/receipts/smuglo.li_1.png b/list/receipts/smuglo.li_1.png similarity index 100% rename from hateful_speech/receipts/smuglo.li_1.png rename to list/receipts/smuglo.li_1.png diff --git a/spam/README.adoc b/spam/README.adoc deleted file mode 100644 index bde1eb7..0000000 --- a/spam/README.adoc +++ /dev/null @@ -1,14 +0,0 @@ -= Spam -:toc: preamble -:project: FediBlock -:list: spam -:uri-base: https://schlomp.space/tastytea/{project} -:imagesdir: {uri-base}/raw/branch/main/{list}/receipts -:figure-caption!: - -Instances are on this list because: - -* At least one user is mass following people they don't know and the admins / - moderators didn't stop it after 24 hours. - -== Instances