1
mirror of https://github.com/streamlink/streamlink synced 2024-09-28 13:05:55 +02:00

Merge pull request #350 from javiercantero/v3-api

Upgrade Twitch plugin to use API v3
This commit is contained in:
Forrest 2017-01-06 12:27:52 -08:00 committed by GitHub
commit 719a051822

View File

@ -198,8 +198,11 @@ class TwitchAPI(object):
else:
url = "https://{0}.twitch.tv{1}".format(self.subdomain, path)
headers = { 'Accept': 'application/vnd.twitchtv.v3+json',
'Client-ID': TWITCH_CLIENT_ID }
# The certificate used by Twitch cannot be verified on some OpenSSL versions.
res = http.get(url, params=params, verify=False, headers={'Client-ID': TWITCH_CLIENT_ID})
res = http.get(url, params=params, verify=False, headers=headers)
if format == "json":
return http.json(res, schema=schema)
@ -217,7 +220,7 @@ class TwitchAPI(object):
return self.call("/api/{0}/{1}/access_token".format(endpoint, asset), **params)
def channel_info(self, channel, **params):
return self.call("/api/channels/{0}".format(channel), **params)
return self.call("/kraken/channels/{0}".format(channel), **params)
def channel_subscription(self, channel, **params):
return self.call("/api/channels/{0}/subscription".format(channel), **params)
@ -232,7 +235,7 @@ class TwitchAPI(object):
return self.call("/kraken/user", **params)
def videos(self, video_id, **params):
return self.call("/api/videos/{0}".format(video_id), **params)
return self.call("/kraken/videos/{0}".format(video_id), **params)
def viewer_info(self, **params):
return self.call("/api/viewer/info", **params)