2 files changed, 350 insertions, 236 deletions

diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py
index 8dcdf1b..a2986cb 100644
--- a/mastodon/Mastodon.py
+++ b/mastodon/Mastodon.py
@@ -229,30 +229,25 @@ class Mastodon:
     __DICT_VERSION_HASHTAG = "2.3.4"
     __DICT_VERSION_EMOJI = "3.0.0"
     __DICT_VERSION_RELATIONSHIP = "3.3.0"
-    __DICT_VERSION_NOTIFICATION = bigger_version(bigger_version(
-        "1.0.0",  __DICT_VERSION_ACCOUNT), __DICT_VERSION_STATUS)
+    __DICT_VERSION_NOTIFICATION = bigger_version(bigger_version("1.0.0",  __DICT_VERSION_ACCOUNT), __DICT_VERSION_STATUS)
     __DICT_VERSION_CONTEXT = bigger_version("1.0.0",  __DICT_VERSION_STATUS)
     __DICT_VERSION_LIST = "2.1.0"
     __DICT_VERSION_CARD = "3.2.0"
-    __DICT_VERSION_SEARCHRESULT = bigger_version(bigger_version(bigger_version(
-        "1.0.0", __DICT_VERSION_ACCOUNT), __DICT_VERSION_STATUS), __DICT_VERSION_HASHTAG)
+    __DICT_VERSION_SEARCHRESULT = bigger_version(bigger_version(bigger_version("1.0.0", __DICT_VERSION_ACCOUNT), __DICT_VERSION_STATUS), __DICT_VERSION_HASHTAG)
     __DICT_VERSION_ACTIVITY = "2.1.2"
     __DICT_VERSION_REPORT = "2.9.1"
     __DICT_VERSION_PUSH = "2.4.0"
     __DICT_VERSION_PUSH_NOTIF = "2.4.0"
     __DICT_VERSION_FILTER = "2.4.3"
-    __DICT_VERSION_CONVERSATION = bigger_version(bigger_version(
-        "2.6.0", __DICT_VERSION_ACCOUNT), __DICT_VERSION_STATUS)
-    __DICT_VERSION_SCHEDULED_STATUS = bigger_version(
-        "2.7.0", __DICT_VERSION_STATUS)
+    __DICT_VERSION_CONVERSATION = bigger_version(bigger_version("2.6.0", __DICT_VERSION_ACCOUNT), __DICT_VERSION_STATUS)
+    __DICT_VERSION_SCHEDULED_STATUS = bigger_version("2.7.0", __DICT_VERSION_STATUS)
     __DICT_VERSION_PREFERENCES = "2.8.0"
-    __DICT_VERSION_ADMIN_ACCOUNT = bigger_version(
-        "2.9.1", __DICT_VERSION_ACCOUNT)
+    __DICT_VERSION_ADMIN_ACCOUNT = bigger_version("2.9.1", __DICT_VERSION_ACCOUNT)
     __DICT_VERSION_FEATURED_TAG = "3.0.0"
     __DICT_VERSION_MARKER = "3.0.0"
     __DICT_VERSION_REACTION = "3.1.0"
-    __DICT_VERSION_ANNOUNCEMENT = bigger_version(
-        "3.1.0", __DICT_VERSION_REACTION)
+    __DICT_VERSION_ANNOUNCEMENT = bigger_version("3.1.0", __DICT_VERSION_REACTION)
+    __DICT_VERSION_STATUS_EDIT = "3.5.0"
 
     ###
     # Registering apps
@@ -378,7 +373,7 @@ class Mastodon:
         If no other `User-Agent` is specified, "mastodonpy" will be used.
         """
         self.api_base_url = None
-        if not api_base_url is None:
+        if api_base_url is not None:
             self.api_base_url = Mastodon.__protocolize(api_base_url)
 
         self.client_id = client_id
@@ -419,7 +414,7 @@ class Mastodon:
                     self.client_secret = secret_file.readline().rstrip()
 
                     try_base_url = secret_file.readline().rstrip()
-                    if (not try_base_url is None) and len(try_base_url) != 0:
+                    if try_base_url is not None and len(try_base_url) != 0:
                         try_base_url = Mastodon.__protocolize(try_base_url)
                         if not (self.api_base_url is None or try_base_url == self.api_base_url):
                             raise MastodonIllegalArgumentError(
@@ -440,7 +435,7 @@ class Mastodon:
                 self.access_token = token_file.readline().rstrip()
 
                 try_base_url = token_file.readline().rstrip()
-                if (not try_base_url is None) and len(try_base_url) != 0:
+                if try_base_url is not None and len(try_base_url) != 0:
                     try_base_url = Mastodon.__protocolize(try_base_url)
                     if not (self.api_base_url is None or try_base_url == self.api_base_url):
                         raise MastodonIllegalArgumentError(
@@ -457,7 +452,7 @@ class Mastodon:
         self.version_check_worked = None
 
         # Versioning
-        if mastodon_version == None and self.version_check_mode != 'none':
+        if mastodon_version is None and self.version_check_mode != 'none':
             self.retrieve_mastodon_version()
         elif self.version_check_mode != 'none':
             try:
@@ -632,7 +627,7 @@ class Mastodon:
         self.__logged_in_id = None
 
         # Retry version check if needed (might be required in limited federation mode)
-        if self.version_check_worked == False:
+        if not self.version_check_worked:
             self.retrieve_mastodon_version()
 
         return response['access_token']
@@ -698,7 +693,7 @@ class Mastodon:
         params['client_id'] = self.client_id
         params['client_secret'] = self.client_secret
 
-        if agreement == False:
+        if not agreement:
             del params['agreement']
 
         # Step 1: Get a user-free token via oauth
@@ -865,24 +860,24 @@ class Mastodon:
 
         Returns a list of `toot dicts`_.
         """
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
         params_initial = locals()
 
-        if local == False:
+        if not local:
             del params_initial['local']
 
-        if remote == False:
+        if not remote:
             del params_initial['remote']
 
-        if only_media == False:
+        if not only_media:
             del params_initial['only_media']
 
         if timeline == "local":
@@ -950,13 +945,13 @@ class Mastodon:
 
         Returns a list of `conversation dicts`_.
         """
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
         params = self.__generate_params(locals())
@@ -1093,8 +1088,8 @@ class Mastodon:
 
         Returns a list of `notification dicts`_.
         """
-        if not mentions_only is None:
-            if not exclude_types is None:
+        if mentions_only is not None:
+            if exclude_types is not None:
                 if mentions_only:
                     exclude_types = ["follow", "favourite",
                                      "reblog", "poll", "follow_request"]
@@ -1103,16 +1098,16 @@ class Mastodon:
                     'Cannot specify exclude_types when mentions_only is present')
             del mentions_only
 
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
-        if account_id != None:
+        if account_id is not None:
             account_id = self.__unpack_id(account_id)
 
         if id is None:
@@ -1178,23 +1173,23 @@ class Mastodon:
         Returns a list of `toot dicts`_.
         """
         id = self.__unpack_id(id)
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
         params = self.__generate_params(locals(), ['id'])
-        if pinned == False:
+        if not pinned:
             del params["pinned"]
-        if only_media == False:
+        if not only_media:
             del params["only_media"]
-        if exclude_replies == False:
+        if not exclude_replies:
             del params["exclude_replies"]
-        if exclude_reblogs == False:
+        if not exclude_reblogs:
             del params["exclude_reblogs"]
 
         url = '/api/v1/accounts/{0}/statuses'.format(str(id))
@@ -1208,13 +1203,13 @@ class Mastodon:
         Returns a list of `user dicts`_.
         """
         id = self.__unpack_id(id)
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
         params = self.__generate_params(locals(), ['id'])
@@ -1229,13 +1224,13 @@ class Mastodon:
         Returns a list of `user dicts`_.
         """
         id = self.__unpack_id(id)
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
         params = self.__generate_params(locals(), ['id'])
@@ -1359,7 +1354,7 @@ class Mastodon:
                 continue
 
             filter_string = re.escape(keyword_filter["phrase"])
-            if keyword_filter["whole_word"] == True:
+            if keyword_filter["whole_word"]:
                 filter_string = "\\b" + filter_string + "\\b"
             filter_strings.append(filter_string)
         filter_re = re.compile("|".join(filter_strings), flags=re.IGNORECASE)
@@ -1435,8 +1430,8 @@ class Mastodon:
         Internal Helper: Throw a MastodonVersionError if version is < 2.8.0 but parameters
         for search that are available only starting with 2.8.0 are specified.
         """
-        if not account_id is None or not offset is None or not min_id is None or not max_id is None:
-            if self.verify_minimum_version("2.8.0", cached=True) == False:
+        if any(item is not None for item in (account_id, offset, min_id, max_id)):
+            if not self.verify_minimum_version("2.8.0", cached=True):
                 raise MastodonVersionError("Advanced search parameters require Mastodon 2.8.0+")
 
     @api_version("1.1.0", "2.8.0", __DICT_VERSION_SEARCHRESULT)
@@ -1465,7 +1460,7 @@ class Mastodon:
 
         Returns a `search result dict`_, with tags as `hashtag dicts`_.
         """
-        if self.verify_minimum_version("2.4.1", cached=True) == True:
+        if self.verify_minimum_version("2.4.1", cached=True):
             return self.search_v2(q, resolve=resolve, result_type=result_type, account_id=account_id, offset=offset, min_id=min_id, max_id=max_id)
         else:
             self.__ensure_search_params_acceptable(
@@ -1481,7 +1476,7 @@ class Mastodon:
         Returns a `search result dict`_.
         """
         params = self.__generate_params(locals())
-        if resolve == False:
+        if not resolve:
             del params['resolve']
         return self.__api_request('GET', '/api/v1/search', params)
 
@@ -1499,10 +1494,10 @@ class Mastodon:
             account_id, offset, min_id, max_id)
         params = self.__generate_params(locals())
 
-        if resolve == False:
+        if not resolve:
             del params["resolve"]
 
-        if exclude_unreviewed == False or not self.verify_minimum_version("3.0.0", cached=True):
+        if not exclude_unreviewed or not self.verify_minimum_version("3.0.0", cached=True):
             del params["exclude_unreviewed"]
 
         if "result_type" in params:
@@ -1564,13 +1559,13 @@ class Mastodon:
         """
         id = self.__unpack_id(id)
 
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
         params = self.__generate_params(locals(), ['id'])
@@ -1586,13 +1581,13 @@ class Mastodon:
 
         Returns a list of `user dicts`_.
         """
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
         params = self.__generate_params(locals())
@@ -1605,13 +1600,13 @@ class Mastodon:
 
         Returns a list of `user dicts`_.
         """
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
         params = self.__generate_params(locals())
@@ -1642,13 +1637,13 @@ class Mastodon:
 
         Returns a list of `toot dicts`_.
         """
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
         params = self.__generate_params(locals())
@@ -1664,13 +1659,13 @@ class Mastodon:
 
         Returns a list of `user dicts`_.
         """
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
         params = self.__generate_params(locals())
@@ -1686,13 +1681,13 @@ class Mastodon:
 
         Returns a list of blocked domain URLs (as strings, without protocol specifier).
         """
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
         params = self.__generate_params(locals())
@@ -1792,13 +1787,13 @@ class Mastodon:
 
         Returns a list of `toot dicts`_.
         """
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
         params = self.__generate_params(locals())
@@ -1807,6 +1802,82 @@ class Mastodon:
     ###
     # Writing data: Statuses
     ###
+    def __status_internal(self, status, in_reply_to_id=None, media_ids=None,
+                    sensitive=False, visibility=None, spoiler_text=None,
+                    language=None, idempotency_key=None, content_type=None,
+                    scheduled_at=None, poll=None, quote_id=None, edit=False):
+        if quote_id is not None:
+            if self.feature_set != "fedibird":
+                raise MastodonIllegalArgumentError('quote_id is only available with feature set fedibird')
+            quote_id = self.__unpack_id(quote_id)
+
+        if content_type is not None:
+            if self.feature_set != "pleroma":
+                raise MastodonIllegalArgumentError('content_type is only available with feature set pleroma')
+            # It would be better to read this from nodeinfo and cache, but this is easier
+            if not content_type in ["text/plain", "text/html", "text/markdown", "text/bbcode"]:
+                raise MastodonIllegalArgumentError('Invalid content type specified')
+
+        if in_reply_to_id is not None:
+            in_reply_to_id = self.__unpack_id(in_reply_to_id)
+
+        if scheduled_at is not None:
+            scheduled_at = self.__consistent_isoformat_utc(scheduled_at)
+
+        params_initial = locals()
+
+        # Validate poll/media exclusivity
+        if poll is not None:
+            if media_ids is not None and len(media_ids) != 0:
+                raise ValueError(
+                    'Status can have media or poll attached - not both.')
+
+        # Validate visibility parameter
+        valid_visibilities = ['private', 'public', 'unlisted', 'direct']
+        if params_initial['visibility'] is None:
+            del params_initial['visibility']
+        else:
+            params_initial['visibility'] = params_initial['visibility'].lower()
+            if params_initial['visibility'] not in valid_visibilities:
+                raise ValueError('Invalid visibility value! Acceptable values are %s' % valid_visibilities)
+
+        if params_initial['language'] is None:
+            del params_initial['language']
+
+        if params_initial['sensitive'] is False:
+            del [params_initial['sensitive']]
+
+        headers = {}
+        if idempotency_key is not None:
+            headers['Idempotency-Key'] = idempotency_key
+
+        if media_ids is not None:
+            try:
+                media_ids_proper = []
+                if not isinstance(media_ids, (list, tuple)):
+                    media_ids = [media_ids]
+                for media_id in media_ids:
+                    media_ids_proper.append(self.__unpack_id(media_id))
+            except Exception as e:
+                raise MastodonIllegalArgumentError("Invalid media dict: %s" % e)
+
+            params_initial["media_ids"] = media_ids_proper
+
+        if params_initial['content_type'] is None:
+            del params_initial['content_type']
+
+        use_json = False
+        if poll is not None:
+            use_json = True
+
+        params = self.__generate_params(params_initial, ['idempotency_key', 'edit'])
+        if edit is None:
+            # Post
+            return self.__api_request('POST', '/api/v1/statuses', params, headers=headers, use_json=use_json)
+        else:
+            # Edit
+            return self.__api_request('PUT', '/api/v1/statuses/{0}'.format(str(self.__unpack_id(edit))), params, headers=headers, use_json=use_json)
+
     @api_version("1.0.0", "2.8.0", __DICT_VERSION_STATUS)
     def status_post(self, status, in_reply_to_id=None, media_ids=None,
                     sensitive=False, visibility=None, spoiler_text=None,
@@ -1867,77 +1938,21 @@ class Mastodon:
 
         Returns a `toot dict`_ with the new status.
         """
-        if quote_id != None:
-            if self.feature_set != "fedibird":
-                raise MastodonIllegalArgumentError(
-                    'quote_id is only available with feature set fedibird')
-            quote_id = self.__unpack_id(quote_id)
-
-        if content_type != None:
-            if self.feature_set != "pleroma":
-                raise MastodonIllegalArgumentError(
-                    'content_type is only available with feature set pleroma')
-            # It would be better to read this from nodeinfo and cache, but this is easier
-            if not content_type in ["text/plain", "text/html", "text/markdown", "text/bbcode"]:
-                raise MastodonIllegalArgumentError(
-                    'Invalid content type specified')
-
-        if in_reply_to_id != None:
-            in_reply_to_id = self.__unpack_id(in_reply_to_id)
-
-        if scheduled_at != None:
-            scheduled_at = self.__consistent_isoformat_utc(scheduled_at)
-
-        params_initial = locals()
-
-        # Validate poll/media exclusivity
-        if not poll is None:
-            if (not media_ids is None) and len(media_ids) != 0:
-                raise ValueError(
-                    'Status can have media or poll attached - not both.')
-
-        # Validate visibility parameter
-        valid_visibilities = ['private', 'public', 'unlisted', 'direct']
-        if params_initial['visibility'] == None:
-            del params_initial['visibility']
-        else:
-            params_initial['visibility'] = params_initial['visibility'].lower()
-            if params_initial['visibility'] not in valid_visibilities:
-                raise ValueError('Invalid visibility value! Acceptable '
-                                 'values are %s' % valid_visibilities)
-
-        if params_initial['language'] == None:
-            del params_initial['language']
-
-        if params_initial['sensitive'] is False:
-            del [params_initial['sensitive']]
-
-        headers = {}
-        if idempotency_key != None:
-            headers['Idempotency-Key'] = idempotency_key
-
-        if media_ids is not None:
-            try:
-                media_ids_proper = []
-                if not isinstance(media_ids, (list, tuple)):
-                    media_ids = [media_ids]
-                for media_id in media_ids:
-                    media_ids_proper.append(self.__unpack_id(media_id))
-            except Exception as e:
-                raise MastodonIllegalArgumentError("Invalid media "
-                                                   "dict: %s" % e)
-
-            params_initial["media_ids"] = media_ids_proper
-
-        if params_initial['content_type'] == None:
-            del params_initial['content_type']
-
-        use_json = False
-        if not poll is None:
-            use_json = True
-
-        params = self.__generate_params(params_initial, ['idempotency_key'])
-        return self.__api_request('POST', '/api/v1/statuses', params, headers=headers, use_json=use_json)
+        return self.__status_internal( 
+            status, 
+            in_reply_to_id, 
+            media_ids, 
+            sensitive, 
+            visibility, 
+            spoiler_text, 
+            language, 
+            idempotency_key, 
+            content_type, 
+            scheduled_at, 
+            poll, 
+            quote_id, 
+            edit=None
+        )
 
     @api_version("1.0.0", "2.8.0", __DICT_VERSION_STATUS)
     def toot(self, status):
@@ -1950,6 +1965,45 @@ class Mastodon:
         """
         return self.status_post(status)
 
+    @api_version("3.5.0", "3.5.0", __DICT_VERSION_STATUS)
+    def status_update(self, id, status = None, spoiler_text = None, sensitive = None, media_ids = None, poll = None):
+        """
+        Edit a status. The meanings of the fields are largely the same as in `status_post()`_,
+        though not every field can be edited.
+
+        Note that editing a poll will reset the votes.
+        """
+        return self.__status_internal(
+            status = status, 
+            media_ids = media_ids, 
+            sensitive = sensitive, 
+            spoiler_text = spoiler_text, 
+            poll = poll, 
+            edit = id
+        ) 
+
+    @api_version("3.5.0", "3.5.0", __DICT_VERSION_STATUS_EDIT)
+    def status_history(self, id):
+        """
+        Returns the edit history of a status as a list of `status edit dicts`_, starting
+        from the original form. Note that this means that a status that has been edited
+        once will have *two* entries in this list, a status that has been edited twice
+        will have three, and so on.
+        """
+        id = self.__unpack_id(id)
+        return self.__api_request('GET', "/api/v1/statuses/{0}/history".format(str(id)))
+
+    def status_source(self, id):
+        """
+        Returns the source of a status for editing.
+
+        Return value is a dictionary containing exactly the parameters you could pass to
+        `status_update()`_ to change nothing about the status, except `status` is `text`
+        instead.
+        """
+        id = self.__unpack_id(id)
+        return self.__api_request('GET', "/api/v1/statuses/{0}/source".format(str(id)))
+
     @api_version("1.0.0", "2.8.0", __DICT_VERSION_STATUS)
     def status_reply(self, to_status, status, in_reply_to_id=None, media_ids=None,
                      sensitive=False, visibility=None, spoiler_text=None,
@@ -1985,9 +2039,9 @@ class Mastodon:
                          mentioned_accounts.values())) + status
 
         # Retain visibility / cw
-        if visibility == None and 'visibility' in to_status:
+        if visibility is None and 'visibility' in to_status:
             visibility = to_status.visibility
-        if spoiler_text == None and 'spoiler_text' in to_status:
+        if spoiler_text is None and 'spoiler_text' in to_status:
             spoiler_text = to_status.spoiler_text
 
         keyword_args["status"] = status
@@ -2251,9 +2305,9 @@ class Mastodon:
         Returns a `relationship dict`_ containing the updated relationship to the user.
         """
         id = self.__unpack_id(id)
-        params = self.__generate_params(locals())
+        params = self.__generate_params(locals(), ["id"])
 
-        if params["reblogs"] == None:
+        if params["reblogs"] is None:
             del params["reblogs"]
 
         url = '/api/v1/accounts/{0}/follow'.format(str(id))
@@ -2357,7 +2411,7 @@ class Mastodon:
         params_initial = collections.OrderedDict(locals())
 
         # Convert fields
-        if fields != None:
+        if fields is not None:
             if len(fields) > 4:
                 raise MastodonIllegalArgumentError(
                     'A maximum of four fields are allowed.')
@@ -2376,9 +2430,9 @@ class Mastodon:
 
         # Create file info
         files = {}
-        if not avatar is None:
+        if avatar is not None:
             files["avatar"] = self.__load_media_file(avatar, avatar_mime_type)
-        if not header is None:
+        if header is not None:
             files["header"] = self.__load_media_file(header, header_mime_type)
 
         params = self.__generate_params(params_initial)
@@ -2591,13 +2645,13 @@ class Mastodon:
         """
         account_id = self.__unpack_id(account_id)
 
-        if not status_ids is None:
+        if status_ids is not None:
             if not isinstance(status_ids, list):
                 status_ids = [status_ids]
             status_ids = list(map(lambda x: self.__unpack_id(x), status_ids))
 
         params_initial = locals()
-        if forward == False:
+        if not forward:
             del params_initial['forward']
 
         params = self.__generate_params(params_initial)
@@ -2663,10 +2717,10 @@ class Mastodon:
         files = {'file': self.__load_media_file(
             media_file, mime_type, file_name)}
 
-        if focus != None:
+        if focus is not None:
             focus = str(focus[0]) + "," + str(focus[1])
 
-        if not thumbnail is None:
+        if thumbnail is not None:
             if not self.verify_minimum_version("3.2.0", cached=True):
                 raise MastodonVersionError(
                     'Thumbnail requires version > 3.2.0')
@@ -2684,7 +2738,7 @@ class Mastodon:
         # Wait for processing?
         if synchronous:
             if self.verify_minimum_version("3.1.4"):
-                while not "url" in ret_dict or ret_dict.url == None:
+                while not "url" in ret_dict or ret_dict.url is None:
                     try:
                         ret_dict = self.media(ret_dict)
                         time.sleep(1.0)
@@ -2707,13 +2761,13 @@ class Mastodon:
         """
         id = self.__unpack_id(id)
 
-        if focus != None:
+        if focus is not None:
             focus = str(focus[0]) + "," + str(focus[1])
 
         params = self.__generate_params(
             locals(), ['id', 'thumbnail', 'thumbnail_mime_type'])
 
-        if not thumbnail is None:
+        if thumbnail is not None:
             if not self.verify_minimum_version("3.2.0", cached=True):
                 raise MastodonVersionError(
                     'Thumbnail requires version > 3.2.0')
@@ -2819,25 +2873,25 @@ class Mastodon:
             'policy': policy
         }
 
-        if follow_events != None:
+        if follow_events is not None:
             params['data[alerts][follow]'] = follow_events
 
-        if favourite_events != None:
+        if favourite_events is not None:
             params['data[alerts][favourite]'] = favourite_events
 
-        if reblog_events != None:
+        if reblog_events is not None:
             params['data[alerts][reblog]'] = reblog_events
 
-        if mention_events != None:
+        if mention_events is not None:
             params['data[alerts][mention]'] = mention_events
 
-        if poll_events != None:
+        if poll_events is not None:
             params['data[alerts][poll]'] = poll_events
 
-        if follow_request_events != None:
+        if follow_request_events is not None:
             params['data[alerts][follow_request]'] = follow_request_events
 
-        if follow_request_events != None:
+        if follow_request_events is not None:
             params['data[alerts][status]'] = status_events
 
         # Canonicalize booleans
@@ -2857,22 +2911,22 @@ class Mastodon:
         """
         params = {}
 
-        if follow_events != None:
+        if follow_events is not None:
             params['data[alerts][follow]'] = follow_events
 
-        if favourite_events != None:
+        if favourite_events is not None:
             params['data[alerts][favourite]'] = favourite_events
 
-        if reblog_events != None:
+        if reblog_events is not None:
             params['data[alerts][reblog]'] = reblog_events
 
-        if mention_events != None:
+        if mention_events is not None:
             params['data[alerts][mention]'] = mention_events
 
-        if poll_events != None:
+        if poll_events is not None:
             params['data[alerts][poll]'] = poll_events
 
-        if follow_request_events != None:
+        if follow_request_events is not None:
             params['data[alerts][follow_request]'] = follow_request_events
 
         # Canonicalize booleans
@@ -2951,19 +3005,19 @@ class Mastodon:
 
         Returns a list of `admin account dicts`_.
         """
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
         params = self.__generate_params(
             locals(), ['remote', 'status', 'staff_only'])
 
-        if remote == True:
+        if remote:
             params["remote"] = True
 
         mod_statuses = ["active", "pending",
@@ -2971,7 +3025,7 @@ class Mastodon:
         if not status in mod_statuses:
             raise ValueError("Invalid moderation status requested.")
 
-        if staff_only == True:
+        if staff_only:
             params["staff"] = True
 
         for mod_status in mod_statuses:
@@ -3083,11 +3137,11 @@ class Mastodon:
         if action is None:
             action = "none"
 
-        if send_email_notification == False:
+        if not send_email_notification:
             send_email_notification = None
 
         id = self.__unpack_id(id)
-        if not report_id is None:
+        if report_id is not None:
             report_id = self.__unpack_id(report_id)
 
         params = self.__generate_params(locals(), ['id', 'action'])
@@ -3107,22 +3161,22 @@ class Mastodon:
 
         Returns a list of `report dicts`_.
         """
-        if max_id != None:
+        if max_id is not None:
             max_id = self.__unpack_id(max_id, dateconv=True)
 
-        if min_id != None:
+        if min_id is not None:
             min_id = self.__unpack_id(min_id, dateconv=True)
 
-        if since_id != None:
+        if since_id is not None:
             since_id = self.__unpack_id(since_id, dateconv=True)
 
-        if not account_id is None:
+        if account_id is not None:
             account_id = self.__unpack_id(account_id)
 
-        if not target_account_id is None:
+        if target_account_id is not None:
             target_account_id = self.__unpack_id(target_account_id)
 
-        if resolved == False:
+        if not resolved:
             resolved = None
 
         params = self.__generate_params(locals())
@@ -3279,12 +3333,12 @@ class Mastodon:
         # Figure out what size to decode to
         decode_components_x, decode_components_y = blurhash.components(
             media_dict["blurhash"])
-        if size_per_component == False:
-            decode_size_x = out_size[0]
-            decode_size_y = out_size[1]
-        else:
+        if size_per_component:
             decode_size_x = decode_components_x * out_size[0]
             decode_size_y = decode_components_y * out_size[1]
+        else:
+            decode_size_x = out_size[0]
+            decode_size_y = out_size[1]
 
         # Decode
         decoded_image = blurhash.decode(
@@ -3454,7 +3508,7 @@ class Mastodon:
         """
         Fetch the logged in user's ID, with caching. ID is reset on calls to log_in.
         """
-        if self.__logged_in_id == None:
+        if self.__logged_in_id is None:
             self.__logged_in_id = self.account_verify_credentials().id
         return self.__logged_in_id
 
@@ -3477,7 +3531,7 @@ class Mastodon:
                              "updated_at", "last_status_at", "starts_at", "ends_at", "published_at", "edited_at"]
         for k, v in json_object.items():
             if k in known_date_fields:
-                if v != None:
+                if v is not None:
                     try:
                         if isinstance(v, int):
                             json_object[k] = datetime.datetime.fromtimestamp(v, pytz.utc)
@@ -3565,9 +3619,9 @@ class Mastodon:
 
         # Generate request headers
         headers = copy.deepcopy(headers)
-        if not self.access_token is None:
+        if self.access_token is not None:
             headers['Authorization'] = 'Bearer ' + self.access_token
-        if not access_token_override is None:
+        if access_token_override is not None:
             headers['Authorization'] = 'Bearer ' + access_token_override
 
         # Add user-agent
@@ -3576,7 +3630,7 @@ class Mastodon:
 
         # Determine base URL
         base_url = self.api_base_url
-        if not base_url_override is None:
+        if base_url_override is not None:
             base_url = base_url_override
 
         if self.debug_requests:
@@ -3594,13 +3648,12 @@ class Mastodon:
             response_object = None
             try:
                 kwargs = dict(headers=headers, files=files, timeout=self.request_timeout)
-                if use_json == False:
-                    if method == 'GET':
-                        kwargs['params'] = params
-                    else:
-                        kwargs['data'] = params
-                else:
+                if use_json:
                     kwargs['json'] = params
+                elif method == 'GET':
+                    kwargs['params'] = params
+                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
@@ -3636,7 +3689,7 @@ class Mastodon:
                     ratelimit_intrep = None
 
                 try:
-                    if not ratelimit_intrep is None and ratelimit_intrep == response_object.headers['X-RateLimit-Reset']:
+                    if ratelimit_intrep is not None and ratelimit_intrep == response_object.headers['X-RateLimit-Reset']:
                         self.ratelimit_reset = int(
                             response_object.headers['X-RateLimit-Reset'])
                     else:
@@ -3689,7 +3742,7 @@ class Mastodon:
                             request_complete = False
                             continue
                 
-                if skip_error_check == False:
+                if not skip_error_check:
                     if response_object.status_code == 404:
                         ex_type = MastodonNotFoundError
                         if not error_msg:
@@ -3718,7 +3771,7 @@ class Mastodon:
             if return_response_object:
                 return response_object
 
-            if parse == True:
+            if parse:
                 try:
                     response = response_object.json(
                         object_hook=self.__json_hooks)
@@ -3881,7 +3934,7 @@ class Mastodon:
 
             def close(self):
                 self.closed = True
-                if not self.connection is None:
+                if self.connection is not None:
                     self.connection.close()
 
             def is_alive(self):
@@ -3907,7 +3960,7 @@ class Mastodon:
 
                 # Run until closed or until error if not autoreconnecting
                 while self.running:
-                    if not self.connection is None:
+                    if self.connection is not None:
                         with closing(self.connection) as r:
                             try:
                                 listener.handle_stream(r)
@@ -3978,10 +4031,8 @@ class Mastodon:
 
         param_keys = list(params.keys())
         for key in param_keys:
-            if isinstance(params[key], bool) and params[key] == False:
-                params[key] = '0'
-            if isinstance(params[key], bool) and params[key] == True:
-                params[key] = '1'
+            if isinstance(params[key], bool):
+                params[key] = '1' if params[key] else '0'
 
         for key in param_keys:
             if params[key] is None or key in exclude:
diff --git a/mastodon/streaming.py b/mastodon/streaming.py
index e43d7d6..ed09705 100644
--- a/mastodon/streaming.py
+++ b/mastodon/streaming.py
@@ -22,18 +22,50 @@ class StreamListener(object):
     Mastodon.hashtag_stream()."""
 
     def on_update(self, status):
-        """A new status has appeared. 'status' is the parsed JSON dictionary
+        """A new status has appeared. `status` is the parsed `status dict`
         describing the status."""
         pass
 
+    def on_delete(self, status_id):
+        """A status has been deleted. `status_id` is the status' integer ID."""
+        pass
+
+    def on_notification(self, notification):
+        """A new notification. `notification` is the parsed `notification dict`
+        describing the notification."""
+        pass
+
+    def on_filters_changed(self):
+        """Filters have changed. Does not contain a payload, you will have to
+           refetch filters yourself."""
+        pass
+
+    def on_conversation(self, conversation):
+        """A direct message (in the direct stream) has been received. `conversation`
+        is the parsed `conversation dict` dictionary describing the conversation"""
+        pass
+
+    def on_announcement(self, annoucement):
+        """A new announcement has been published. `announcement` is the parsed
+        `announcement dict` describing the newly posted announcement."""
+        pass
+
+    def on_announcement_reaction(self, TODO):
+        """Someone has reacted to an announcement. TODO: what is payload lol"""
+        pass
+
+    def on_announcement_delete(self, annoucement_id):
+        """An announcement has been deleted. `annoucement_id` is the id of the
+        deleted announcement."""
+        pass
+
     def on_status_update(self, status):
         """A status has been edited. 'status' is the parsed JSON dictionary
         describing the updated status."""
         pass
 
-    def on_notification(self, notification):
-        """A new notification. 'notification' is the parsed JSON dictionary
-        describing the notification."""
+    def on_encrypted_message(self, unclear):
+        """An encrypted message has been received. Currently unused."""
         pass
 
     def on_abort(self, err):
@@ -47,15 +79,6 @@ class StreamListener(object):
         """
         pass
 
-    def on_delete(self, status_id):
-        """A status has been deleted. status_id is the status' integer ID."""
-        pass
-
-    def on_conversation(self, conversation):
-        """A direct message (in the direct stream) has been received. conversation
-        contains the resulting conversation dict."""
-        pass
-
     def on_unknown_event(self, name, unknown_event=None):
         """An unknown mastodon API event has been received. The name contains the event-name and unknown_event
         contains the content of the unknown event.
@@ -148,8 +171,7 @@ class StreamListener(object):
                 for_stream = json.loads(event['stream'])
             except:
                 for_stream = None
-            payload = json.loads(
-                data, object_hook=Mastodon._Mastodon__json_hooks)
+            payload = json.loads(data, object_hook=Mastodon._Mastodon__json_hooks)
         except KeyError as err:
             exception = MastodonMalformedEventError(
                 'Missing field', err.args[0], event)
@@ -188,11 +210,13 @@ class StreamListener(object):
                 handler(name, payload, for_stream)
         else:
             if handler != self.on_unknown_event:
-                handler(payload)
+                if handler == self.on_filters_changed:
+                    handler()
+                else:
+                    handler(payload)
             else:
                 handler(name, payload)
 
-
 class CallbackStreamListener(StreamListener):
     """
     Simple callback stream handler class.
@@ -202,22 +226,41 @@ class CallbackStreamListener(StreamListener):
     for diagnostics.
     """
 
-    def __init__(self, update_handler=None, local_update_handler=None, delete_handler=None, notification_handler=None, conversation_handler=None, unknown_event_handler=None, status_update_handler=None):
+    def __init__(self, 
+        update_handler=None, 
+        local_update_handler=None, 
+        delete_handler=None, 
+        notification_handler=None, 
+        conversation_handler=None, 
+        unknown_event_handler=None, 
+        status_update_handler=None,
+        filters_changed_handler=None,
+        announcement_handler=None,
+        announcement_reaction_handler=None,
+        announcement_delete_handler=None,
+        encryted_message_handler=None
+
+    ):
         super(CallbackStreamListener, self).__init__()
         self.update_handler = update_handler
         self.local_update_handler = local_update_handler
         self.delete_handler = delete_handler
         self.notification_handler = notification_handler
+        self.filters_changed_handler = filters_changed_handler
         self.conversation_handler = conversation_handler
         self.unknown_event_handler = unknown_event_handler
         self.status_update_handler = status_update_handler
+        self.announcement_handler = announcement_handler
+        self.announcement_reaction_handler = announcement_reaction_handler
+        self.announcement_delete_handler = announcement_delete_handler
+        self.encryted_message_handler = encryted_message_handler
 
     def on_update(self, status):
-        if self.update_handler != None:
+        if self.update_handler is not None:
             self.update_handler(status)
 
         try:
-            if self.local_update_handler != None and not "@" in status["account"]["acct"]:
+            if self.local_update_handler is not None and not "@" in status["account"]["acct"]:
                 self.local_update_handler(status)
         except Exception as err:
             six.raise_from(
@@ -226,21 +269,41 @@ class CallbackStreamListener(StreamListener):
             )
 
     def on_delete(self, deleted_id):
-        if self.delete_handler != None:
+        if self.delete_handler is not None:
             self.delete_handler(deleted_id)
 
     def on_notification(self, notification):
-        if self.notification_handler != None:
+        if self.notification_handler is not None:
             self.notification_handler(notification)
 
+    def on_filters_changed(self):
+        if self.filters_changed_handler is not None:
+            self.filters_changed_handler()
+
     def on_conversation(self, conversation):
-        if self.conversation_handler != None:
+        if self.conversation_handler is not None:
             self.conversation_handler(conversation)
 
-    def on_unknown_event(self, name, unknown_event=None):
-        if self.unknown_event_handler != None:
-            self.unknown_event_handler(name, unknown_event)
+    def on_announcement(self, annoucement):
+        if self.announcement_handler is not None:
+            self.announcement_handler(annoucement)
+
+    def on_announcement_reaction(self, TODO):
+        if self.announcement_reaction_handler is not None:
+            self.announcement_reaction_handler(TODO)
+
+    def on_announcement_delete(self, annoucement_id):
+        if self.announcement_delete_handler is not None:
+            self.announcement_delete_handler(annoucement_id)
 
     def on_status_update(self, status):
-        if self.status_update_handler != None:
+        if self.status_update_handler is not None:
             self.status_update_handler(status)
+
+    def on_encrypted_message(self, unclear):
+        if self.encryted_message_handler is not None:
+            self.encryted_message_handler(unclear)
+
+    def on_unknown_event(self, name, unknown_event=None):
+        if self.unknown_event_handler is not None:
+            self.unknown_event_handler(name, unknown_event)        
\ No newline at end of file