add Cursor to parameters for validation

Author: anxdpanic

resources/lib/twitch/api/parameters.py

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+from base64 import b64decode
 
 
 class _Parameter(object):
@@ -62,3 +63,13 @@ class StreamType(_Parameter):
     ALL = 'all'
 
     _valid = [LIVE, PLAYLIST, ALL]
+
+
+class Cursor(_Parameter):
+    @classmethod
+    def validate(cls, value):
+        try:
+            decoded = int(b64decode(value))
+            return value
+        except ValueError:
+            raise ValueError(value)

resources/lib/twitch/api/v5/channel_feed.py

@@ -2,18 +2,18 @@
 # https://dev.twitch.tv/docs/v5/reference/channel-feed/
 
 from twitch import keys
-from twitch.api.parameters import Boolean
+from twitch.api.parameters import Boolean, Cursor
 from twitch import methods
 from twitch.queries import V5Query as Qry
 from twitch.queries import query
 
 
 @query
-def get_posts(channel_id, limit=10, cursor=0, comments=5):
+def get_posts(channel_id, limit=10, cursor='MA==', comments=5):
     q = Qry('feed/{channel_id}/posts')
     q.add_urlkw(keys.CHANNEL_ID, channel_id)
     q.add_param(keys.LIMIT, limit, 10)
-    q.add_param(keys.CURSOR, cursor, 0)
+    q.add_param(keys.CURSOR, Cursor.validate(cursor), 'MA==')
     q.add_param(keys.COMMENTS, comments, 5)
     return q
 
@@ -63,12 +63,12 @@ def delete_post_reaction(channel_id, post_id, emote_id):
 
 
 @query
-def get_comments(channel_id, post_id, limit=10, cursor=0):
+def get_comments(channel_id, post_id, limit=10, cursor='MA=='):
     q = Qry('feed/{channel_id}/posts/{post_id}/comments')
     q.add_urlkw(keys.CHANNEL_ID, channel_id)
     q.add_urlkw(keys.POST_ID, post_id)
     q.add_param(keys.LIMIT, limit, 10)
-    q.add_param(keys.CURSOR, cursor, 0)
+    q.add_param(keys.CURSOR, Cursor.validate(cursor), 'MA==')
     return q
 
 

resources/lib/twitch/api/v5/collections.py

@@ -4,7 +4,7 @@
 from twitch import keys
 from twitch.queries import V5Query as Qry
 from twitch.queries import query
-from twitch.api.parameters import Boolean
+from twitch.api.parameters import Boolean, Cursor
 from twitch import methods
 
 
@@ -24,11 +24,11 @@ def get_collection(collection_id, include_all=Boolean.FALSE):
 
 
 @query
-def get_collections(channel_id, limit=10, cursor=0, containing_item=None):
+def get_collections(channel_id, limit=10, cursor='MA==', containing_item=None):
     q = Qry('channels/{channel_id}/collections')
     q.add_urlkw(keys.CHANNEL_ID, channel_id)
     q.add_param(keys.LIMIT, limit, 10)
-    q.add_param(keys.CURSOR, cursor, 0)
+    q.add_param(keys.CURSOR, Cursor.validate(cursor), 'MA==')
     q.add_param(keys.CONTAINING_ITEM, containing_item, None)  # 'video:<video_id>'
     return q
 

resources/lib/twitch/api/v5/communities.py

@@ -2,15 +2,16 @@
 # https://dev.twitch.tv/docs/v5/reference/communities/
 
 from twitch import keys
+from twitch.api.parameters import Cursor
 from twitch.queries import V5Query as Qry
 from twitch.queries import query
 
 
 @query
-def top(limit=10, cursor=0):
+def top(limit=10, cursor='MA=='):
     q = Qry('communities/top')
     q.add_param(keys.LIMIT, limit, 10)
-    q.add_param(keys.CURSOR, cursor, 0)
+    q.add_param(keys.CURSOR, Cursor.validate(cursor), 'MA==')
     return q