aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.rst1
-rw-r--r--docs/index.rst10
-rw-r--r--mastodon/Mastodon.py10
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
12* 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 12* 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
13* Fixed search ignoring `exclude_unreviewed` (Thanks acidghost) 13* Fixed search ignoring `exclude_unreviewed` (Thanks acidghost)
14* Add support for using pathlib paths when loading media files (Thanks reagle) 14* Add support for using pathlib paths when loading media files (Thanks reagle)
15* Remove blocklist with long dead instances
15* 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. 16* 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.
16 17
17v1.6.3 18v1.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.
218 218
219A brief note on block lists 219A brief note on block lists
220--------------------------- 220---------------------------
221The 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. 221Mastodon.py used to block three instances because these were particularly notorious for
222harassing trans people and I don't feel like I have an obligation to let software I
223distribute help people who want my friends to die. I don't want to be associated with
224that, at all.
222 225
223While 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. 226Those instances are now all gone, any point that could have been has been made, and
227there is no list anymore.
228
229Trans rights are human rights.
224 230
225Return values 231Return values
226------------- 232-------------
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:
3666 else: 3666 else:
3667 kwargs['data'] = params 3667 kwargs['data'] = params
3668 3668
3669 # Block list with exactly three entries, matching on hashes of the instance API domain
3670 # For more information, have a look at the docs
3671 if hashlib.sha256(",".join(base_url.split("//")[-1].split("/")[0].split(".")[-2:]).encode("utf-8")).hexdigest() in \
3672 [
3673 "f3b50af8594eaa91dc440357a92691ff65dbfc9555226e9545b8e083dc10d2e1",
3674 "b96d2de9784efb5af0af56965b8616afe5469c06e7188ad0ccaee5c7cb8a56b6",
3675 "2dc0cbc89fad4873f665b78cc2f8b6b80fae4af9ac43c0d693edfda27275f517"
3676 ]:
3677 raise Exception("Access denied.")
3678
3679 response_object = self.session.request( 3669 response_object = self.session.request(
3680 method, base_url + endpoint, **kwargs) 3670 method, base_url + endpoint, **kwargs)
3681 except Exception as e: 3671 except Exception as e:
Powered by cgit v1.2.3 (git 2.41.0)