fix(sources): Twitch videos work again!

fixes #1

Author: fent

background/background.js

@@ -48,7 +48,7 @@ const checkForUpdates = async () => {
 };
 
 const mergeMatch = (source, username, video) => {
-  return video.source === source && video.user.name === username;
+  return video.source === source && video.user && video.user.name === username;
 };
 
 const updateVideos = () => {

background/sources/index.js

@@ -145,7 +145,7 @@ const sources = {
       if (!meta) { return false; }
     } catch (err) {
       console.warn('Failed to get meta for video: ' + video.url);
-      return;
+      return false;
     }
     video.url = meta.url;
     video.thumbnail = meta.thumbnail;

background/sources/videos/twitch.js

@@ -5,11 +5,11 @@ let twitchToken = null;
 const getTwitchToken = () => {
   return new Promise((resolve) => {
     if (twitchToken) {
-      return twitchToken;
+      resolve(twitchToken);
     } else {
       chrome.cookies.get({
-        url: 'https://www.twitch.tv/directory/following/videos',
-        name: 'api_token',
+        url: 'https://www.twitch.tv',
+        name: 'auth-token',
       }, (cookie) => {
         twitchToken = cookie && cookie.value;
         resolve(twitchToken);
@@ -22,48 +22,46 @@ export default {
   patterns: [
     '*://*.twitch.tv/*/v/*',
     '*://twitch.tv/*/v/*',
+    '*://*.twitch.tv/videos/*',
+    '*://twitch.tv/videos/*',
   ],
   getVideo: async (url) => {
     const token = await getTwitchToken();
     const parsed = new URL(url);
     const s = parsed.pathname.split(/\//);
     const id = s[s.length - 1];
-    const meta = await util.ajax('https://api.twitch.tv/kraken/videos/v' + id, {
+    return util.ajax('https://api.twitch.tv/kraken/videos/' + id, {
       cache: {
         transform: (response) => ({
+          url       : response.url,
           thumbnail : response.preview,
           length    : response.length,
           title     : response.title,
           game      : response.game,
           views     : response.views,
+          user      : {
+            url: 'https://www.twitch.tv/' + response.channel.name,
+            name: response.channel.display_name,
+          },
         }),
         ttl: 1800000,
       },
-      headers: { 'Twitch-Api-Token': token },
+      headers: { 'Authorization': `OAuth ${token}` },
     });
-    const username = /twitch\.tv\/([^/]+)\//.exec(url)[1];
-    return {
-      url: 'https://www.twitch.tv/' + username + '/v/' + id,
-      user: {
-        url: 'https://www.twitch.tv/' + username,
-        name: username,
-      },
-      ...meta,
-    };
   },
   getAllVideos: async () => {
     const token = await getTwitchToken();
     const result = await util.ajax('https://api.twitch.tv/kraken/videos/followed?' +
-    'limit=40&broadcast_type=highlight&offset=0&on_site=1', {
-      headers: { 'Twitch-Api-Token': token },
+    'limit=50&broadcast_type=highlight&offset=0&on_site=1', {
+      headers: { 'Authorization': `OAuth ${token}` },
     });
     return result.videos.map((video) => {
       return {
         user: {
           url: 'https://www.twitch.tv/' + video.channel.name,
           name: video.channel.display_name,
         },
-        url: video.url.replace(/^https:\/\/secure\./, 'https://www.'),
+        url: video.url,
         thumbnail: video.preview,
         length: video.length,
         title: video.title,