diff options
| author | Lorenz Diener <[email protected]> | 2017-04-10 10:29:55 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-04-10 10:29:55 +0200 |
| commit | 7db6b4c02ee361d1e54b5c69d747918b1c193e42 (patch) | |
| tree | 46bc1dfec6121a204d2ca2c9d026b039dc15f9f9 /mastodon | |
| parent | 98f636f581d21b6ba44b3b313e1bc9b527cb4440 (diff) | |
| parent | 7ebc48c50e4b5dc6e7e32be1fca3096a2bc71a1c (diff) | |
| download | mastodon.py-7db6b4c02ee361d1e54b5c69d747918b1c193e42.tar.gz | |
Merge pull request #26 from phryk/master
added content_search, probably.
Diffstat (limited to 'mastodon')
| -rw-r--r-- | mastodon/Mastodon.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py index def3859..f3861c2 100644 --- a/mastodon/Mastodon.py +++ b/mastodon/Mastodon.py | |||
| @@ -401,6 +401,17 @@ class Mastodon: | |||
| 401 | """ | 401 | """ |
| 402 | params = self.__generate_params(locals()) | 402 | params = self.__generate_params(locals()) |
| 403 | return self.__api_request('GET', '/api/v1/accounts/search', params) | 403 | return self.__api_request('GET', '/api/v1/accounts/search', params) |
| 404 | |||
| 405 | |||
| 406 | def content_search(self, q, resolve = False): | ||
| 407 | """ | ||
| 408 | Fetch matching hashtags, accounts and statuses. Will search federated | ||
| 409 | instances if resolve is True. | ||
| 410 | |||
| 411 | Returns a dict of lists. | ||
| 412 | """ | ||
| 413 | params = self.__generate_params(locals()) | ||
| 414 | return self.__api_request('GET', '/api/v1/search', params) | ||
| 404 | 415 | ||
| 405 | ### | 416 | ### |
| 406 | # Reading data: Mutes and Blocks | 417 | # Reading data: Mutes and Blocks |