Skip to content

Fix issues #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rishabhja wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix issues #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42492c5
Fix name of get members api for channels
rishabhja Aug 17, 2017
5e1b754
Convert post params to camel case
rishabhja Aug 17, 2017
65e8436
Update README
rishabhja Aug 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ print channels.get_info(token,channel_id)

#### Get channel members
```python
print channels.get_members(token,channel_id,show_public_profile)
print channels.list_members(token,channel_id,show_public_profile)
```

#### Get channels list of which user is member of
Expand Down
3 changes: 2 additions & 1 deletion flockos/api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# coding: utf-8

from __future__ import absolute_import
from utils import to_camel_case
import requests
import json
import flockos
Expand All @@ -9,5 +10,5 @@
def call_api(resource_path, params=None):
base_url = flockos.base_url
url = base_url + resource_path
response_data = requests.post(url, data=str(params))
response_data = requests.post(url, data=str({k:to_camel_case(v) for k,v in params.items()}))
Copy link
Copy Markdown

@chaitanyagupta chaitanyagupta Aug 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to do the camel case conversion recursively for nested objects.

return json.loads(response_data.text)
4 changes: 2 additions & 2 deletions flockos/apis/channels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def get_info(token, channel_id, **kwargs):
return response


def get_members(token, channel_id, show_public_profile, **kwargs):
def list_members(token, channel_id, show_public_profile, **kwargs):
Copy link
Copy Markdown

@chaitanyagupta chaitanyagupta Aug 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am assuming this was auto generated?

Copy link
Copy Markdown
Contributor Author

@rishabhja rishabhja Aug 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. The name was incorrect in swagger.json earlier

"""


Expand All @@ -41,7 +41,7 @@ def get_members(token, channel_id, show_public_profile, **kwargs):
for key, val in iteritems(params['kwargs']):
params[key] = val
del params['kwargs']
resource_path = '/channels.getMembers'.replace('{format}', 'json')
resource_path = '/channels.listMembers'.replace('{format}', 'json')
response = call_api(resource_path, params=params)
return response

Expand Down