Skip to content

Allow group feeds to be subscribed to and unsubscribed from #78

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

Merged
merged 2 commits into from
Jul 19, 2021
Merged

Allow group feeds to be subscribed to and unsubscribed from #78

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51d65c3
Allow group feeds to be subscribed to
ryanplusplus Jul 17, 2021
8749175
Allow groups to be unsubscribed from
ryanplusplus Jul 17, 2021
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
8 changes: 6 additions & 2 deletions adafruit_io/adafruit_io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,12 +253,14 @@ def subscribe(self, feed_key=None, group_key=None, shared_user=None):

client.subscribe([('temperature'), ('humidity')])
"""
validate_feed_key(feed_key)
if shared_user is not None and feed_key is not None:
validate_feed_key(feed_key)
self._client.subscribe("{0}/f/{1}".format(shared_user, feed_key))
elif group_key is not None:
validate_feed_key(group_key)
self._client.subscribe("{0}/g/{1}".format(self._user, group_key))
elif feed_key is not None:
validate_feed_key(feed_key)
self._client.subscribe("{0}/f/{1}".format(self._user, feed_key))
else:
raise AdafruitIO_MQTTError("Must provide a feed_key or group_key.")
Expand Down Expand Up @@ -333,12 +335,14 @@ def unsubscribe(self, feed_key=None, group_key=None, shared_user=None):
client.unsubscribe('temperature', shared_user='adabot')

"""
validate_feed_key(feed_key)
if shared_user is not None and feed_key is not None:
validate_feed_key(feed_key)
self._client.unsubscribe("{0}/f/{1}".format(shared_user, feed_key))
elif group_key is not None:
validate_feed_key(group_key)
self._client.unsubscribe("{0}/g/{1}".format(self._user, feed_key))
elif feed_key is not None:
validate_feed_key(feed_key)
self._client.unsubscribe("{0}/f/{1}".format(self._user, feed_key))
else:
raise AdafruitIO_MQTTError("Must provide a feed_key or group_key.")
Expand Down