aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Diener <[email protected]>2017-04-19 09:53:43 +0200
committerGitHub <[email protected]>2017-04-19 09:53:43 +0200
commit2dfa8d3a37e88f76a4e53a1117e71382389a1e64 (patch)
tree1415c4f03b93f7a385aa20e5be0e7cb44cca1bbf /mastodon
parentcd2165131a3dcc1d044dbaefde1cfcd1c5b78dcf (diff)
parent8f0d872119cfe25664fbad868808715012c464b5 (diff)
downloadmastodon.py-2dfa8d3a37e88f76a4e53a1117e71382389a1e64.tar.gz
Merge pull request #32 from tootworks/remove_mentions_timeline
Remove the mentions timeline because it doesn't exist
Diffstat (limited to 'mastodon')
-rw-r--r--mastodon/Mastodon.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py
index ef6cb1f..310dc68 100644
--- a/mastodon/Mastodon.py
+++ b/mastodon/Mastodon.py
@@ -244,8 +244,8 @@ class Mastodon:
244 ## 244 ##
245 def timeline(self, timeline = "home", max_id = None, since_id = None, limit = None): 245 def timeline(self, timeline = "home", max_id = None, since_id = None, limit = None):
246 """ 246 """
247 Fetch statuses, most recent ones first. Timeline can be home, mentions, local, 247 Fetch statuses, most recent ones first. Timeline can be home, local, public,
248 public, or tag/hashtag. See the following functions documentation for what those do. 248 or tag/hashtag. See the following functions documentation for what those do.
249 249
250 The default timeline is the "home" timeline. 250 The default timeline is the "home" timeline.
251 251
@@ -268,14 +268,6 @@ class Mastodon:
268 """ 268 """
269 return self.timeline('home', max_id = max_id, since_id = since_id, limit = limit) 269 return self.timeline('home', max_id = max_id, since_id = since_id, limit = limit)
270 270
271 def timeline_mentions(self, max_id = None, since_id = None, limit = None):
272 """
273 Fetches the authenticated users mentions.
274
275 Returns a list of toot dicts.
276 """
277 return self.timeline('mentions', max_id = max_id, since_id = since_id, limit = limit)
278
279 def timeline_local(self, max_id = None, since_id = None, limit = None): 271 def timeline_local(self, max_id = None, since_id = None, limit = None):
280 """ 272 """
281 Fetches the local / instance-wide timeline. 273 Fetches the local / instance-wide timeline.
Powered by cgit v1.2.3 (git 2.41.0)