Merge pull request #77 from anxdpanic/pr_isengard

change followed, following, and unfollowing games to use gql endpoints

Author: anxdpanic

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.module.python.twitch" name="python-twitch for Kodi" version="2.0.15" provider-name="anxdpanic, A Talented Community">
+<addon id="script.module.python.twitch" name="python-twitch for Kodi" version="2.0.16~beta1" provider-name="anxdpanic, A Talented Community">
     <requires>
         <import addon="xbmc.python" version="2.20.0"/>
         <import addon="script.module.six" version="1.11.0"/>
@@ -9,7 +9,7 @@
     <extension point="xbmc.addon.metadata">
         <platform>all</platform>
         <news>
-[upd] Update material to reflect repository changes
+[chg] change followed, following, and unfollowing games to use gql endpoints
         </news>
         <assets>
             <icon>icon.png</icon>

changelog.txt

@@ -1,3 +1,6 @@
+2.0.16
+[chg] change followed, following, and unfollowing games to use gql endpoints
+
 2.0.15
 [upd] Update material to reflect repository changes
 

resources/language/resource.language.en_gb/strings.po

@@ -0,0 +1,17 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-09-18 00:54+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+# msgctxt "#30000"
+# msgid ""
+# msgstr ""

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

@@ -13,6 +13,7 @@
 from ... import keys, methods
 from ...queries import V5Query as Qry
 from ...queries import HiddenApiQuery as HQry
+from ...queries import GQLQuery as GQLQry
 from ...queries import query
 
 
@@ -38,29 +39,63 @@ def _check_follows(username, name, headers={}):
 # required scope: none
 # undocumented / unsupported
 @query
-def _get_followed(username, limit=25, offset=0, headers={}):
-    q = HQry('users/{username}/follows/games', headers=headers, use_token=False)
-    q.add_urlkw(keys.USERNAME, username)
-    q.add_param(keys.LIMIT, limit, 25)
-    q.add_param(keys.OFFSET, offset, 0)
+def _get_followed(limit=100, headers={}):
+    data = [{
+        "operationName": "FollowingGames_CurrentUser",
+        "variables": {
+            "limit": limit,
+            "type": "LIVE"
+        },
+        "extensions": {
+            "persistedQuery": {
+                "version": 1,
+                "sha256Hash": "8446d4d234005813dc1f024f487ce95434c3e4202f451dd42777935b5ed035ce"
+            }
+        }
+    }]
+    q = GQLQry('', headers=headers, data=data, use_token=False)
     return q
 
 
 # required scope: user_follows_edit
 # undocumented / unsupported
 @query
-def _follow(username, name, headers={}):
-    q = HQry('users/{username}/follows/games/follow', headers=headers, method=methods.PUT)
-    q.add_urlkw(keys.USERNAME, username)
-    q.add_data(keys.NAME, name)
+def _follow(game_id, headers={}):
+    data = [{
+        "operationName": "FollowGameButton_FollowGame",
+        "variables": {
+            "input": {
+                "gameID": str(game_id)
+            }
+        },
+        "extensions": {
+            "persistedQuery": {
+                "version": 1,
+                "sha256Hash": "b846b65ba4bc9a3561dbe2d069d95deed9b9e031bcfda2482d1bedd84a1c2eb3"
+            }
+        }
+    }]
+    q = GQLQry('', headers=headers, data=data, use_token=False)
     return q
 
 
 # required scope: user_follows_edit
 # undocumented / unsupported
 @query
-def _unfollow(username, name, headers={}):
-    q = HQry('users/{username}/follows/games/unfollow', headers=headers, method=methods.DELETE)
-    q.add_urlkw(keys.USERNAME, username)
-    q.add_data(keys.NAME, name)
+def _unfollow(game_id, headers={}):
+    data = [{
+        "operationName": "FollowGameButton_UnfollowGame",
+        "variables": {
+            "input": {
+                "gameID": str(game_id)
+            }
+        },
+        "extensions": {
+            "persistedQuery": {
+                "version": 1,
+                "sha256Hash": "811e02e396ebba0664f21ff002f2eff3c6f57e8af9aedb4f4dfa77cefd0db43d"
+            }
+        }
+    }]
+    q = GQLQry('', headers=headers, data=data, use_token=False)
     return q

resources/lib/twitch/queries.py

@@ -26,6 +26,7 @@
 _usher_baseurl = 'https://usher.ttvnw.net/'
 _clips_baseurl = 'https://gql.twitch.tv/gql'
 _uploads_baseurl = 'https://uploads.twitch.tv/'
+_gql_baseurl = 'https://gql.twitch.tv/gql'
 _oauth_baseurl = 'https://api.twitch.tv/kraken/oauth2/'
 
 
@@ -221,6 +222,16 @@ def __init__(self, path, use_app_token=False, method=methods.GET):
         super(HelixQuery, self).__init__(path, use_app_token=use_app_token, method=method)
 
 
+class GQLQuery(JsonQuery):
+    def __init__(self, path, headers={}, data={}, use_token=True, method=methods.POST):
+        _headers = deepcopy(headers)
+        _headers.setdefault('Client-ID', CLIENT_ID)
+        if use_token and OAUTH_TOKEN:
+            _headers.setdefault('Authorization', 'OAuth {access_token}'.format(access_token=OAUTH_TOKEN))
+        super(GQLQuery, self).__init__(_gql_baseurl, _headers, data, method)
+        self.add_path(path)
+
+
 def assert_new(d, k):
     if k in d:
         v = d.get(k)

resources/lib/twitch/scraper.py

@@ -95,7 +95,13 @@ def download(baseurl, parameters={}, headers={}, data={}, method=methods.GET, re
     for _ in range(MAX_RETRIES):
         try:
             headers.update({USER_AGENT: USER_AGENT_STRING})
-            response = requests.request(method=method, url=url, headers=headers, data=data, verify=SSL_VERIFICATION)
+            if isinstance(data, list):
+                json_body = data
+                data = None
+            else:
+                json_body = None
+            response = requests.request(method=method, url=url, headers=headers,
+                                        json=json_body, data=data, verify=SSL_VERIFICATION)
             content = response.content
             if not content:
                 content = '{{"status": {0}}}'.format(response.status_code)