diff options
Diffstat (limited to 'mastodon/timeline.py')
-rw-r--r-- | mastodon/timeline.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mastodon/timeline.py b/mastodon/timeline.py index 04406ed..37790c8 100644 --- a/mastodon/timeline.py +++ b/mastodon/timeline.py | |||
@@ -50,8 +50,7 @@ class Mastodon(Internals): | |||
50 | params_initial['local'] = True | 50 | params_initial['local'] = True |
51 | 51 | ||
52 | params = self.__generate_params(params_initial, ['timeline']) | 52 | params = self.__generate_params(params_initial, ['timeline']) |
53 | url = '/api/v1/timelines/{0}'.format(timeline) | 53 | return self.__api_request('GET', f'/api/v1/timelines/{timeline}', params) |
54 | return self.__api_request('GET', url, params) | ||
55 | 54 | ||
56 | @api_version("1.0.0", "3.1.4", _DICT_VERSION_STATUS) | 55 | @api_version("1.0.0", "3.1.4", _DICT_VERSION_STATUS) |
57 | def timeline_home(self, max_id=None, min_id=None, since_id=None, limit=None, only_media=False, local=False, remote=False): | 56 | def timeline_home(self, max_id=None, min_id=None, since_id=None, limit=None, only_media=False, local=False, remote=False): |
@@ -91,7 +90,7 @@ class Mastodon(Internals): | |||
91 | if hashtag.startswith("#"): | 90 | if hashtag.startswith("#"): |
92 | raise MastodonIllegalArgumentError( | 91 | raise MastodonIllegalArgumentError( |
93 | "Hashtag parameter should omit leading #") | 92 | "Hashtag parameter should omit leading #") |
94 | return self.timeline('tag/{0}'.format(hashtag), max_id=max_id, min_id=min_id, since_id=since_id, limit=limit, only_media=only_media, local=local, remote=remote) | 93 | return self.timeline(f'tag/{hashtag}', max_id=max_id, min_id=min_id, since_id=since_id, limit=limit, only_media=only_media, local=local, remote=remote) |
95 | 94 | ||
96 | @api_version("2.1.0", "3.1.4", _DICT_VERSION_STATUS) | 95 | @api_version("2.1.0", "3.1.4", _DICT_VERSION_STATUS) |
97 | def timeline_list(self, id, max_id=None, min_id=None, since_id=None, limit=None, only_media=False, local=False, remote=False): | 96 | def timeline_list(self, id, max_id=None, min_id=None, since_id=None, limit=None, only_media=False, local=False, remote=False): |
@@ -101,5 +100,5 @@ class Mastodon(Internals): | |||
101 | Returns a list of :ref:`status dicts <status dicts>`. | 100 | Returns a list of :ref:`status dicts <status dicts>`. |
102 | """ | 101 | """ |
103 | id = self.__unpack_id(id) | 102 | id = self.__unpack_id(id) |
104 | return self.timeline('list/{0}'.format(id), max_id=max_id, min_id=min_id, since_id=since_id, limit=limit, only_media=only_media, local=local, remote=remote) | 103 | return self.timeline(f'list/{id}', max_id=max_id, min_id=min_id, since_id=since_id, limit=limit, only_media=only_media, local=local, remote=remote) |
105 | 104 | ||