Skip to content

Commit

Permalink
Fixed a bug in account_statuses
Browse files Browse the repository at this point in the history
  • Loading branch information
Lorenz Diener committed Nov 24, 2016
1 parent 7a60387 commit 2267e51
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions mastodon/Mastodon.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ class Mastodon:
Presently, only username-password login is supported, somebody please
patch in Real Proper OAuth if desired.
KNOWN BUGS: Media api does not work, reason unclear.
"""
__DEFAULT_BASE_URL = 'https://mastodon.social'
__DEBUG_REQUESTS = False

###
# Registering apps
Expand Down Expand Up @@ -178,7 +177,7 @@ def account_statuses(self, id, max_id = None, since_id = None, limit = None):
Returns statuses by user. Same options as timeline are permitted.
"""
params = self.__generate_params(locals(), ['id'])
return self.__api_request('GET', '/api/v1/accounts/' + str(id) + '/statuses')
return self.__api_request('GET', '/api/v1/accounts/' + str(id) + '/statuses', params)

def account_following(self, id):
"""
Expand Down Expand Up @@ -342,9 +341,16 @@ def __api_request(self, method, endpoint, params = {}, files = {}):
response = None
headers = None


if self.access_token != None:
headers = {'Authorization': 'Bearer ' + self.access_token}

if __DEBUG_REQUESTS = True:
print('Mastodon: Request to endpoint "' + endpoint + '" using method "' + method + '".')
print('Parameters: ' + str(params))
print('Headers: ' + str(headers))
print('Files: ' + str(files))

if method == 'GET':
response = requests.get(self.api_base_url + endpoint, data = params, headers = headers, files = files)

Expand Down

0 comments on commit 2267e51

Please sign in to comment.