Skip to content

Commit 51d65c3

Browse files
authored
Allow group feeds to be subscribed to
`IO_MQTT#subscribe` always checks `feed_key` even though it is not required. When `group_key` is provided instead of `feed_key`, `feed_key` should not be required to be valid. This change only validates `feed_key` when one is provided and adds validation for `group_key` when it is provided.
1 parent 5efcef4 commit 51d65c3

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

adafruit_io/adafruit_io.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,12 +253,14 @@ def subscribe(self, feed_key=None, group_key=None, shared_user=None):
253253
254254
client.subscribe([('temperature'), ('humidity')])
255255
"""
256-
validate_feed_key(feed_key)
257256
if shared_user is not None and feed_key is not None:
257+
validate_feed_key(feed_key)
258258
self._client.subscribe("{0}/f/{1}".format(shared_user, feed_key))
259259
elif group_key is not None:
260+
validate_feed_key(group_key)
260261
self._client.subscribe("{0}/g/{1}".format(self._user, group_key))
261262
elif feed_key is not None:
263+
validate_feed_key(feed_key)
262264
self._client.subscribe("{0}/f/{1}".format(self._user, feed_key))
263265
else:
264266
raise AdafruitIO_MQTTError("Must provide a feed_key or group_key.")

0 commit comments

Comments
 (0)