aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Diener <[email protected]>2017-11-24 15:25:38 +0100
committerLorenz Diener <[email protected]>2017-11-24 15:25:38 +0100
commit9e97fce2d6f350c45603f200d5cda0962b63cb86 (patch)
tree25ed6bb3e5323b1d52ee6c15676af0a91f6baf3c /mastodon/Mastodon.py
parente220e7cc60839ee1e3b27781b3b1cb609e593f85 (diff)
downloadmastodon.py-9e97fce2d6f350c45603f200d5cda0962b63cb86.tar.gz
Break streaming entirely, update docs
Diffstat (limited to 'mastodon/Mastodon.py')
-rw-r--r--mastodon/Mastodon.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py
index 9b28861..011d731 100644
--- a/mastodon/Mastodon.py
+++ b/mastodon/Mastodon.py
@@ -1010,7 +1010,7 @@ class Mastodon:
1010 ### 1010 ###
1011 # Streaming 1011 # Streaming
1012 ### 1012 ###
1013 def user_stream(self, listener, async=False): 1013 def stream_user(self, listener, async=False):
1014 """ 1014 """
1015 Streams events that are relevant to the authorized user, i.e. home 1015 Streams events that are relevant to the authorized user, i.e. home
1016 timeline and notifications. 'listener' should be a subclass of 1016 timeline and notifications. 'listener' should be a subclass of
@@ -1018,14 +1018,14 @@ class Mastodon:
1018 """ 1018 """
1019 return self.__stream('/api/v1/streaming/user', listener, async=async) 1019 return self.__stream('/api/v1/streaming/user', listener, async=async)
1020 1020
1021 def public_stream(self, listener, async=False): 1021 def stream_public(self, listener, async=False):
1022 """ 1022 """
1023 Streams public events. 'listener' should be a subclass of StreamListener 1023 Streams public events. 'listener' should be a subclass of StreamListener
1024 which will receive callbacks for incoming events. 1024 which will receive callbacks for incoming events.
1025 """ 1025 """
1026 return self.__stream('/api/v1/streaming/public', listener, async=async) 1026 return self.__stream('/api/v1/streaming/public', listener, async=async)
1027 1027
1028 def local_stream(self, listener, async=False): 1028 def stream_local(self, listener, async=False):
1029 """ 1029 """
1030 Streams local events. 'listener' should be a subclass of StreamListener 1030 Streams local events. 'listener' should be a subclass of StreamListener
1031 which will receive callbacks for incoming events. 1031 which will receive callbacks for incoming events.
@@ -1033,7 +1033,7 @@ class Mastodon:
1033 """ 1033 """
1034 return self.__stream('/api/v1/streaming/public/local', listener, async=async) 1034 return self.__stream('/api/v1/streaming/public/local', listener, async=async)
1035 1035
1036 def hashtag_stream(self, tag, listener, async=False): 1036 def stream_hashtag(self, tag, listener, async=False):
1037 """ 1037 """
1038 Returns all public statuses for the hashtag 'tag'. 'listener' should be 1038 Returns all public statuses for the hashtag 'tag'. 'listener' should be
1039 a subclass of StreamListener which will receive callbacks for incoming 1039 a subclass of StreamListener which will receive callbacks for incoming
Powered by cgit v1.2.3 (git 2.41.0)