Largely pointless now, so replacing with just a note

3 files changed, 9 insertions, 12 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a928586..1e11631 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -12,6 +12,7 @@ v1.7.0
 * This isn't somehing I changed but thank you a / triggerofsol for answering Many questions I had about specifics of what the API does that are not documented
 * Fixed search ignoring `exclude_unreviewed` (Thanks acidghost)
 * Add support for using pathlib paths when loading media files (Thanks reagle)
+* Remove blocklist with long dead instances
 * TECHNICALLY BREAKING CHANGE, but I would be quite surprised if this actually breaks anyone: Date parsing will now, when the date string is empty, return Jan. 1st, 1970 instead. This is to work around what I assume is a bug in Pleroma.
 
 v1.6.3
diff --git a/docs/index.rst b/docs/index.rst
index 3d52b08..4484bfa 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -218,9 +218,15 @@ to server misconfiguration.
 
 A brief note on block lists
 ---------------------------
-The default distribution of Mastodon.py prevents you from logging in to instances on a very short list of domains. The purpose of this is to disassociate the developers of Mastodon.py from these instances and to disavow the ideology of violence that they represent. You could, of course, take that part out - Mastodon.py is free software, and you have the right to modify it to suit your needs.
+Mastodon.py used to block three instances because these were particularly notorious for
+harassing trans people and I don't feel like I have an obligation to let software I 
+distribute help people who want my friends to die. I don't want to be associated with 
+that, at all. 
 
-While you take the extra step of removing the code, please take a moment to consider why reasonable people whose work you build and depend on every day thought it was necessary to put it in to begin with.
+Those instances are now all gone, any point that could have been has been made, and 
+there is no list anymore.
+
+Trans rights are human rights. 
 
 Return values
 -------------
diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py
index 7e9f06f..57fadb3 100644
--- a/mastodon/Mastodon.py
+++ b/mastodon/Mastodon.py
@@ -3666,16 +3666,6 @@ class Mastodon:
                 else:
                     kwargs['data'] = params
 
-                # Block list with exactly three entries, matching on hashes of the instance API domain
-                # For more information, have a look at the docs
-                if hashlib.sha256(",".join(base_url.split("//")[-1].split("/")[0].split(".")[-2:]).encode("utf-8")).hexdigest() in \
-                    [
-                        "f3b50af8594eaa91dc440357a92691ff65dbfc9555226e9545b8e083dc10d2e1",
-                        "b96d2de9784efb5af0af56965b8616afe5469c06e7188ad0ccaee5c7cb8a56b6",
-                        "2dc0cbc89fad4873f665b78cc2f8b6b80fae4af9ac43c0d693edfda27275f517"
-                ]:
-                    raise Exception("Access denied.")
-
                 response_object = self.session.request(
                     method, base_url + endpoint, **kwargs)
             except Exception as e: