From 46d26c0c6de4ae57c5508952a584f5d2b0ce3ea1 Mon Sep 17 00:00:00 2001
From: Larivact <larivact@users.noreply.github.com>
Date: Wed, 7 Mar 2018 07:04:47 +0100
Subject: [PATCH 01/14] Ditch googleApi.js, use request instead; refactor code

---
 package.json            |  3 +-
 src/index.html          |  2 +-
 src/js/channels.js      | 35 +++++++++-------------
 src/js/events.js        |  6 ++--
 src/js/googleApi.js     | 18 ------------
 src/js/history.js       | 12 ++++----
 src/js/init.js          |  2 +-
 src/js/layout.js        | 38 +++++++-----------------
 src/js/savedVideos.js   | 13 ++++-----
 src/js/settings.js      | 15 ++++------
 src/js/subscriptions.js | 33 +++++++--------------
 src/js/videos.js        | 64 ++++++++++++++++-------------------------
 src/js/youtubeApi.js    | 17 +++++++++++
 13 files changed, 97 insertions(+), 161 deletions(-)
 delete mode 100644 src/js/googleApi.js
 create mode 100644 src/js/youtubeApi.js

diff --git a/package.json b/package.json
index 0251bd2d5..8d2a12e0b 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
     "mustache": "^2.3.0",
     "nedb": "^1.8.0",
     "node-async-loop": "^1.2.2",
-    "opml-to-json": "0.0.3"
+    "opml-to-json": "0.0.3",
+    "requests": "^0.2.2"
   }
 }
diff --git a/src/index.html b/src/index.html
index 15852a2bf..33971f4af 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" href="style/loading.css">
   <link rel="stylesheet" href="style/fa-solid.min.css">
   <link rel="stylesheet" href="style/fontawesome-all.min.css">
-  <script src="js/googleApi.js"></script>
+  <script src="js/youtubeApi.js"></script>
   <script src="js/settings.js"></script>
   <script src="js/layout.js"></script>
   <script src="js/videos.js"></script>
diff --git a/src/js/channels.js b/src/js/channels.js
index dd7e44048..9db836c64 100644
--- a/src/js/channels.js
+++ b/src/js/channels.js
@@ -24,14 +24,11 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
 /*function getChannelThumbnail(channelId, callback) {
   let url = '';
 
-  let request = gapi.client.youtube.channels.list({
+  youtubeAPI('channels', {
     'id': channelId,
     'part': 'snippet',
-  });
-
-  request.execute((response) => {
-    url = response['items'][0]['snippet']['thumbnails']['high']['url'];
-    callback(url);
+  }, function (data){
+    callback(data.items[0].snippet.thumbnails.high.url);
   });
 }*/
 
@@ -45,7 +42,7 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
 function goToChannel(channelId) {
   event.stopPropagation();
   clearMainContainer();
-  toggleLoading();
+  startLoadingAnimation();
 
 
   // Check if the user is subscribed to the channel.  Display different text based on the information
@@ -62,17 +59,14 @@ function goToChannel(channelId) {
   });
 
   // Call YouTube API to grab channel information
-  let request = gapi.client.youtube.channels.list({
+  youtubeAPI('channels', {
     part: 'snippet, brandingSettings, statistics',
     id: channelId,
-  });
-
-  // Perform API Execution
-  request.execute((response) => {
+  }, function (data){
     // Set variables of extracted information
-    const brandingSettings = response['items'][0]['brandingSettings'];
-    const statistics = response['items'][0]['statistics'];
-    const snippet = response['items'][0]['snippet'];
+    const brandingSettings = data['items'][0]['brandingSettings'];
+    const statistics = data['items'][0]['statistics'];
+    const snippet = data['items'][0]['snippet'];
     const channelName = brandingSettings['channel']['title'];
     const channelBanner = brandingSettings['image']['bannerImageUrl'];
     const channelImage = snippet['thumbnails']['high']['url'];
@@ -97,22 +91,19 @@ function goToChannel(channelId) {
       });
       // Render the template on to #main
       $('#main').html(rendered);
-      toggleLoading();
+      stopLoadingAnimation();
     });
 
     // Grab the channel's latest upload.  API forces a max of 50.
-    let request = gapi.client.youtube.search.list({
+	youtubeAPI('search', {
       part: 'snippet',
       channelId: channelId,
       type: 'video',
       maxResults: 50,
       order: 'date',
-    });
-
-    // Execute API request
-    request.execute((response) => {
+    }, function (data) {
       // Display recent uploads to #main
-      response['items'].forEach((video) => {
+      data['items'].forEach((video) => {
         displayVideos(video);
       });
     });
diff --git a/src/js/events.js b/src/js/events.js
index b96b178c6..f15656208 100644
--- a/src/js/events.js
+++ b/src/js/events.js
@@ -35,13 +35,11 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
       let commentsTemplate = $.get('templates/comments.html');
 
       commentsTemplate.done((template) => {
-        let request = gapi.client.youtube.commentThreads.list({
+        youtubeAPI('commentThreads', {
           'videoId': $('#comments').attr('data-video-id'),
           'part': 'snippet,replies',
           'maxResults': 100,
-        });
-
-        request.execute((data) => {
+        }, function (data){
           let comments = [];
           let items = data.items;
 
diff --git a/src/js/googleApi.js b/src/js/googleApi.js
deleted file mode 100644
index 7d177d869..000000000
--- a/src/js/googleApi.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// File was downloaded to prevent dependency on website.
-// You can find this file at https://apis.google.com/js/api.js
-//
-// This file is not covered by GPL v3.  If the owners of this file would like to have
-// this file removed from FreeTube, please contact me at FreeTubeApp@protonmail.com
-
-var gapi=window.gapi=window.gapi||{};gapi._bs=new Date().getTime();(function(){/*
- gapi.loader.OBJECT_CREATE_TEST_OVERRIDE &&*/
-var g=window,h=document,m=g.location,n=function(){},q=/\[native code\]/,u=function(a,b,c){return a[b]=a[b]||c},aa=function(a){a=a.sort();for(var b=[],c=void 0,d=0;d<a.length;d++){var e=a[d];e!=c&&b.push(e);c=e}return b},w=function(){var a;if((a=Object.create)&&q.test(a))a=a(null);else{a={};for(var b in a)a[b]=void 0}return a},x=u(g,"gapi",{});var A;A=u(g,"___jsl",w());u(A,"I",0);u(A,"hel",10);var B=function(){var a=m.href;if(A.dpo)var b=A.h;else{b=A.h;var c=/([#].*&|[#])jsh=([^&#]*)/g,d=/([?#].*&|[?#])jsh=([^&#]*)/g;if(a=a&&(c.exec(a)||d.exec(a)))try{b=decodeURIComponent(a[2])}catch(e){}}return b},ba=function(a){var b=u(A,"PQ",[]);A.PQ=[];var c=b.length;if(0===c)a();else for(var d=0,e=function(){++d===c&&a()},f=0;f<c;f++)b[f](e)},C=function(a){return u(u(A,"H",w()),a,w())};var D=u(A,"perf",w()),F=u(D,"g",w()),ca=u(D,"i",w());u(D,"r",[]);w();w();var G=function(a,b,c){var d=D.r;"function"===typeof d?d(a,b,c):d.push([a,b,c])},K=function(a,b,c){b&&0<b.length&&(b=J(b),c&&0<c.length&&(b+="___"+J(c)),28<b.length&&(b=b.substr(0,28)+(b.length-28)),c=b,b=u(ca,"_p",w()),u(b,c,w())[a]=(new Date).getTime(),G(a,"_p",c))},J=function(a){return a.join("__").replace(/\./g,"_").replace(/\-/g,"_").replace(/,/g,"_")};var L=w(),M=[],N=function(a){throw Error("Bad hint"+(a?": "+a:""));};M.push(["jsl",function(a){for(var b in a)if(Object.prototype.hasOwnProperty.call(a,b)){var c=a[b];"object"==typeof c?A[b]=u(A,b,[]).concat(c):u(A,b,c)}if(b=a.u)a=u(A,"us",[]),a.push(b),(b=/^https:(.*)$/.exec(b))&&a.push("http:"+b[1])}]);var da=/^(\/[a-zA-Z0-9_\-]+)+$/,O=[/\/amp\//,/\/amp$/,/^\/amp$/],ea=/^[a-zA-Z0-9\-_\.,!]+$/,fa=/^gapi\.loaded_[0-9]+$/,ha=/^[a-zA-Z0-9,._-]+$/,la=function(a,b,c,d){var e=a.split(";"),f=e.shift(),l=L[f],k=null;l?k=l(e,b,c,d):N("no hint processor for: "+f);k||N("failed to generate load url");b=k;c=b.match(ia);(d=b.match(ja))&&1===d.length&&ka.test(b)&&c&&1===c.length||N("failed sanity: "+a);return k},na=function(a,b,c,d){a=ma(a);fa.test(c)||N("invalid_callback");b=P(b);d=d&&d.length?P(d):null;var e=
-function(a){return encodeURIComponent(a).replace(/%2C/g,",")};return[encodeURIComponent(a.pathPrefix).replace(/%2C/g,",").replace(/%2F/g,"/"),"/k=",e(a.version),"/m=",e(b),d?"/exm="+e(d):"","/rt=j/sv=1/d=1/ed=1",a.a?"/am="+e(a.a):"",a.c?"/rs="+e(a.c):"",a.f?"/t="+e(a.f):"","/cb=",e(c)].join("")},ma=function(a){"/"!==a.charAt(0)&&N("relative path");for(var b=a.substring(1).split("/"),c=[];b.length;){a=b.shift();if(!a.length||0==a.indexOf("."))N("empty/relative directory");else if(0<a.indexOf("=")){b.unshift(a);
-break}c.push(a)}a={};for(var d=0,e=b.length;d<e;++d){var f=b[d].split("="),l=decodeURIComponent(f[0]),k=decodeURIComponent(f[1]);2==f.length&&l&&k&&(a[l]=a[l]||k)}b="/"+c.join("/");da.test(b)||N("invalid_prefix");c=0;for(d=O.length;c<d;++c)O[c].test(b)&&N("invalid_prefix");c=Q(a,"k",!0);d=Q(a,"am");e=Q(a,"rs");a=Q(a,"t");return{pathPrefix:b,version:c,a:d,c:e,f:a}},P=function(a){for(var b=[],c=0,d=a.length;c<d;++c){var e=a[c].replace(/\./g,"_").replace(/-/g,"_");ha.test(e)&&b.push(e)}return b.join(",")},
-Q=function(a,b,c){a=a[b];!a&&c&&N("missing: "+b);if(a){if(ea.test(a))return a;N("invalid: "+b)}return null},ka=/^https?:\/\/[a-z0-9_.-]+\.google(rs)?\.com(:\d+)?\/[a-zA-Z0-9_.,!=\-\/]+$/,ja=/\/cb=/g,ia=/\/\//g,oa=function(){var a=B();if(!a)throw Error("Bad hint");return a};L.m=function(a,b,c,d){(a=a[0])||N("missing_hint");return"https://apis.google.com"+na(a,b,c,d)};var R=decodeURI("%73cript"),S=/^[-+_0-9\/A-Za-z]+={0,2}$/,T=function(a,b){for(var c=[],d=0;d<a.length;++d){var e=a[d],f;if(f=e){a:{for(f=0;f<b.length;f++)if(b[f]===e)break a;f=-1}f=0>f}f&&c.push(e)}return c},U=function(){var a=A.nonce;if(void 0!==a)return a&&a===String(a)&&a.match(S)?a:A.nonce=null;var b=u(A,"us",[]);if(!b||!b.length)return A.nonce=null;for(var c=h.getElementsByTagName(R),d=0,e=c.length;d<e;++d){var f=c[d];if(f.src&&(a=String(f.nonce||f.getAttribute("nonce")||"")||null)){for(var l=
-0,k=b.length;l<k&&b[l]!==f.src;++l);if(l!==k&&a&&a===String(a)&&a.match(S))return A.nonce=a}}return null},pa=function(a){if("loading"!=h.readyState)V(a);else{var b=U(),c="";null!==b&&(c=' nonce="'+b+'"');h.write("<"+R+' src="'+encodeURI(a)+'"'+c+"></"+R+">")}},V=function(a){var b=h.createElement(R);b.setAttribute("src",a);a=U();null!==a&&b.setAttribute("nonce",a);b.async="true";(a=h.getElementsByTagName(R)[0])?a.parentNode.insertBefore(b,a):(h.head||h.body||h.documentElement).appendChild(b)},qa=function(a,
-b){var c=b&&b._c;if(c)for(var d=0;d<M.length;d++){var e=M[d][0],f=M[d][1];f&&Object.prototype.hasOwnProperty.call(c,e)&&f(c[e],a,b)}},ra=function(a,b,c){X(function(){var c=b===B()?u(x,"_",w()):w();c=u(C(b),"_",c);a(c)},c)},Z=function(a,b){var c=b||{};"function"==typeof b&&(c={},c.callback=b);qa(a,c);b=a?a.split(":"):[];var d=c.h||oa(),e=u(A,"ah",w());if(e["::"]&&b.length){a=[];for(var f=null;f=b.shift();){var l=f.split(".");l=e[f]||e[l[1]&&"ns:"+l[0]||""]||d;var k=a.length&&a[a.length-1]||null,v=
-k;k&&k.hint==l||(v={hint:l,b:[]},a.push(v));v.b.push(f)}var y=a.length;if(1<y){var z=c.callback;z&&(c.callback=function(){0==--y&&z()})}for(;b=a.shift();)Y(b.b,c,b.hint)}else Y(b||[],c,d)},Y=function(a,b,c){a=aa(a)||[];var d=b.callback,e=b.config,f=b.timeout,l=b.ontimeout,k=b.onerror,v=void 0;"function"==typeof k&&(v=k);var y=null,z=!1;if(f&&!l||!f&&l)throw"Timeout requires both the timeout parameter and ontimeout parameter to be set";k=u(C(c),"r",[]).sort();var H=u(C(c),"L",[]).sort(),E=[].concat(k),
-W=function(a,b){if(z)return 0;g.clearTimeout(y);H.push.apply(H,p);var d=((x||{}).config||{}).update;d?d(e):e&&u(A,"cu",[]).push(e);if(b){K("me0",a,E);try{ra(b,c,v)}finally{K("me1",a,E)}}return 1};0<f&&(y=g.setTimeout(function(){z=!0;l()},f));var p=T(a,H);if(p.length){p=T(a,k);var r=u(A,"CP",[]),t=r.length;r[t]=function(a){if(!a)return 0;K("ml1",p,E);var b=function(b){r[t]=null;W(p,a)&&ba(function(){d&&d();b()})},c=function(){var a=r[t+1];a&&a()};0<t&&r[t-1]?r[t]=function(){b(c)}:b(c)};if(p.length){var I=
-"loaded_"+A.I++;x[I]=function(a){r[t](a);x[I]=null};a=la(c,p,"gapi."+I,k);k.push.apply(k,p);K("ml0",p,E);b.sync||g.___gapisync?pa(a):V(a)}else r[t](n)}else W(p)&&d&&d()};var X=function(a,b){if(A.hee&&0<A.hel)try{return a()}catch(c){b&&b(c),A.hel--,Z("debug_error",function(){try{window.___jsl.hefn(c)}catch(d){throw c;}})}else try{return a()}catch(c){throw b&&b(c),c;}};x.load=function(a,b){return X(function(){return Z(a,b)})};F.bs0=window.gapi._bs||(new Date).getTime();G("bs0");F.bs1=(new Date).getTime();G("bs1");delete window.gapi._bs;}).call(this);
-gapi.load("",{callback:window["gapi_onload"],_c:{"jsl":{"ci":{"deviceType":"desktop","oauth-flow":{"authUrl":"https://accounts.google.com/o/oauth2/auth","proxyUrl":"https://accounts.google.com/o/oauth2/postmessageRelay","disableOpt":true,"idpIframeUrl":"https://accounts.google.com/o/oauth2/iframe","usegapi":false},"debug":{"reportExceptionRate":0.05,"forceIm":false,"rethrowException":false,"host":"https://apis.google.com"},"enableMultilogin":true,"googleapis.config":{"auth":{"useFirstPartyAuthV2":false}},"isPlusUser":false,"inline":{"css":1},"disableRealtimeCallback":false,"drive_share":{"skipInitCommand":true},"csi":{"rate":0.01},"client":{"cors":false},"isLoggedIn":false,"signInDeprecation":{"rate":0.0},"include_granted_scopes":true,"llang":"en","iframes":{"ytsubscribe":{"url":"https://www.youtube.com/subscribe_embed?usegapi\u003d1"},"plus_share":{"params":{"url":""},"url":":socialhost:/:session_prefix::se:_/+1/sharebutton?plusShare\u003dtrue\u0026usegapi\u003d1"},":source:":"3p","playemm":{"url":"https://play.google.com/work/embedded/search?usegapi\u003d1\u0026usegapi\u003d1"},"partnersbadge":{"url":"https://www.gstatic.com/partners/badge/templates/badge.html?usegapi\u003d1"},"dataconnector":{"url":"https://dataconnector.corp.google.com/:session_prefix:ui/widgetview?usegapi\u003d1"},"shortlists":{"url":""},"plus_followers":{"params":{"url":""},"url":":socialhost:/_/im/_/widget/render/plus/followers?usegapi\u003d1"},"post":{"params":{"url":""},"url":":socialhost:/:session_prefix::im_prefix:_/widget/render/post?usegapi\u003d1"},"signin":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/render/signin?usegapi\u003d1","methods":["onauth"]},"donation":{"url":"https://onetoday.google.com/home/donationWidget?usegapi\u003d1"},"plusone":{"params":{"count":"","size":"","url":""},"url":":socialhost:/:session_prefix::se:_/+1/fastbutton?usegapi\u003d1"},":im_socialhost:":"https://plus.googleapis.com","backdrop":{"url":"https://clients3.google.com/cast/chromecast/home/widget/backdrop?usegapi\u003d1"},"visibility":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/render/visibility?usegapi\u003d1"},"additnow":{"url":"https://apis.google.com/additnow/additnow.html?usegapi\u003d1","methods":["launchurl"]},":signuphost:":"https://plus.google.com","community":{"url":":ctx_socialhost:/:session_prefix::im_prefix:_/widget/render/community?usegapi\u003d1"},"plus":{"url":":socialhost:/:session_prefix:_/widget/render/badge?usegapi\u003d1"},"commentcount":{"url":":socialhost:/:session_prefix:_/widget/render/commentcount?usegapi\u003d1"},"zoomableimage":{"url":"https://ssl.gstatic.com/microscope/embed/"},"appfinder":{"url":"https://gsuite.google.com/:session_prefix:marketplace/appfinder?usegapi\u003d1"},"person":{"url":":socialhost:/:session_prefix:_/widget/render/person?usegapi\u003d1"},"savetodrive":{"url":"https://drive.google.com/savetodrivebutton?usegapi\u003d1","methods":["save"]},"page":{"url":":socialhost:/:session_prefix:_/widget/render/page?usegapi\u003d1"},"card":{"url":":socialhost:/:session_prefix:_/hovercard/card"},"youtube":{"params":{"location":["search","hash"]},"url":":socialhost:/:session_prefix:_/widget/render/youtube?usegapi\u003d1","methods":["scroll","openwindow"]},"plus_circle":{"params":{"url":""},"url":":socialhost:/:session_prefix::se:_/widget/plus/circle?usegapi\u003d1"},"rbr_s":{"params":{"url":""},"url":":socialhost:/:session_prefix::se:_/widget/render/recobarsimplescroller"},"udc_webconsentflow":{"params":{"url":""},"url":"https://myaccount.google.com/webconsent?usegapi\u003d1"},"savetoandroidpay":{"url":"https://androidpay.google.com/a/widget/save"},"blogger":{"params":{"location":["search","hash"]},"url":":socialhost:/:session_prefix:_/widget/render/blogger?usegapi\u003d1","methods":["scroll","openwindow"]},"evwidget":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/events/widget?usegapi\u003d1"},"surveyoptin":{"url":"https://www.google.com/shopping/customerreviews/optin?usegapi\u003d1"},":socialhost:":"https://apis.google.com","hangout":{"url":"https://talkgadget.google.com/:session_prefix:talkgadget/_/widget"},":gplus_url:":"https://plus.google.com","rbr_i":{"params":{"url":""},"url":":socialhost:/:session_prefix::se:_/widget/render/recobarinvitation"},"share":{"url":":socialhost:/:session_prefix::im_prefix:_/widget/render/share?usegapi\u003d1"},"comments":{"params":{"location":["search","hash"]},"url":":socialhost:/:session_prefix:_/widget/render/comments?usegapi\u003d1","methods":["scroll","openwindow"]},"autocomplete":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/render/autocomplete"},"ratingbadge":{"url":"https://www.google.com/shopping/customerreviews/badge?usegapi\u003d1"},"appcirclepicker":{"url":":socialhost:/:session_prefix:_/widget/render/appcirclepicker"},"follow":{"url":":socialhost:/:session_prefix:_/widget/render/follow?usegapi\u003d1"},"sharetoclassroom":{"url":"https://www.gstatic.com/classroom/sharewidget/widget_stable.html?usegapi\u003d1"},"ytshare":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/render/ytshare?usegapi\u003d1"},"family_creation":{"params":{"url":""},"url":"https://families.google.com/webcreation?usegapi\u003d1\u0026usegapi\u003d1"},"configurator":{"url":":socialhost:/:session_prefix:_/plusbuttonconfigurator?usegapi\u003d1"},"savetowallet":{"url":"https://androidpay.google.com/a/widget/save"}}},"h":"m;/_/scs/apps-static/_/js/k\u003doz.gapi.en_US.3HZg_yZrZ6s.O/m\u003d__features__/am\u003dAQE/rt\u003dj/d\u003d1/rs\u003dAGLTcCMh5tGv8ugYOhxzmMzy5FFHCxFzwg","u":"https://apis.google.com/js/api.js","hee":true,"fp":"10ff85b3e618484d8f4daf3d80ff528580374230","dpo":false},"fp":"10ff85b3e618484d8f4daf3d80ff528580374230","annotation":["interactivepost","recobar","signin2","autocomplete","profile"],"bimodal":["signin","share"]}});
diff --git a/src/js/history.js b/src/js/history.js
index f6b76068e..411f19d9c 100644
--- a/src/js/history.js
+++ b/src/js/history.js
@@ -55,7 +55,7 @@ function removeFromHistory(videoId){
 */
 function showHistory(){
   clearMainContainer();
-  toggleLoading();
+  startLoadingAnimation();
   console.log('checking history');
 
   let videoList = '';
@@ -75,18 +75,16 @@ function showHistory(){
       });
     }
 
-    let request = gapi.client.youtube.videos.list({
+    youtubeAPI('videos', {
       part: 'snippet',
       id: videoList,
       maxResults: 50,
-    });
-
-    request.execute((response) => {
+    }, function (data) {
       createVideoListContainer('Watch History:');
-      response['items'].forEach((video) => {
+      data['items'].forEach((video) => {
         displayVideos(video, 'history');
       });
-      toggleLoading();
+      stopLoadingAnimation()
     });
   });
 }
diff --git a/src/js/init.js b/src/js/init.js
index 99a7a7696..8e5ef0e78 100644
--- a/src/js/init.js
+++ b/src/js/init.js
@@ -20,7 +20,7 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
 /*
 * File used to initializing the application
 */
-const {app, BrowserWindow} = require('electron');
+const {app, BrowserWindow, dialog} = require('electron');
 const path = require('path');
 const url = require('url');
 let win;
diff --git a/src/js/layout.js b/src/js/layout.js
index 7aa3058f5..cf9ed7eac 100644
--- a/src/js/layout.js
+++ b/src/js/layout.js
@@ -115,23 +115,6 @@ $(document).ready(() => {
   loadSubscriptions();
 });
 
-/**
-* Start the YouTube API.
-*
-* @return {Void}
-*/
-function start() {
-  // Initializes the client with the API key and the Translate API.
-  gapi.client.init({
-    'apiKey': apiKey,
-  })
-
-  gapi.client.load('youtube', 'v3', () => {
-    let isLoad = true;
-  });
-}
-
-
 /**
 * Toggle the ability to view the side navigation bar.
 *
@@ -161,28 +144,27 @@ function clearMainContainer() {
   hideConfirmFunction();
 }
 
-/**
-* Show the loading animation before / after a function runs.  Also disables / enables input
-*
-* @return {Void}
-*/
-function toggleLoading() {
+function startLoadingAnimation() {
   const loading = document.getElementById('loading');
   const sideNavDisabled = document.getElementById('sideNavDisabled');
   const searchBar = document.getElementById('search');
   const goToVideoInput = document.getElementById('jumpToInput');
 
-  if (loading.style.display === 'none' || loading.style.display === '') {
     loading.style.display = 'inherit';
     sideNavDisabled.style.display = 'inherit';
     searchBar.disabled = true;
     goToVideoInput.disabled = true;
-  } else {
+}
+function stopLoadingAnimation() {
+  const loading = document.getElementById('loading');
+  const sideNavDisabled = document.getElementById('sideNavDisabled');
+  const searchBar = document.getElementById('search');
+  const goToVideoInput = document.getElementById('jumpToInput');
+
     loading.style.display = 'none';
     sideNavDisabled.style.display = 'none';
     searchBar.disabled = false;
     goToVideoInput.disabled = false;
-  }
 }
 
 /**
@@ -214,7 +196,7 @@ function createVideoListContainer(headerLabel = '') {
 function showAbout(){
   // Remove current information and display loading animation
   clearMainContainer();
-  toggleLoading();
+  startLoadingAnimation();
 
   // Grab about.html to be used as a template
   $.get('templates/about.html', (template) => {
@@ -224,7 +206,7 @@ function showAbout(){
     });
     // Render to #main and remove loading animation
     $('#main').html(rendered);
-    toggleLoading();
+    stopLoadingAnimation();
   });
 }
 
diff --git a/src/js/savedVideos.js b/src/js/savedVideos.js
index 0b491a403..85f7535dc 100644
--- a/src/js/savedVideos.js
+++ b/src/js/savedVideos.js
@@ -113,7 +113,7 @@ function videoIsSaved(videoId) {
 */
 function showSavedVideos(){
   clearMainContainer();
-  toggleLoading();
+  startLoadingAnimation();
   console.log('checking saved videos');
 
   let videoList = '';
@@ -136,20 +136,17 @@ function showSavedVideos(){
     }
 
     // Call the YouTube API
-    let request = gapi.client.youtube.videos.list({
+	youtubeAPI('videos', {
       part: 'snippet',
       id: videoList,
       maxResults: 50,
-    });
-
-    // Execute the API request
-    request.execute((response) => {
+    }, function (data) {
       // Render the videos to the screen
       createVideoListContainer('Saved Videos:');
-      response['items'].forEach((video) => {
+      data['items'].forEach((video) => {
         displayVideos(video, 'history');
       });
-      toggleLoading();
+      stopLoadingAnimation();
     });
   });
 }
diff --git a/src/js/settings.js b/src/js/settings.js
index b818ac9e8..9ca1dc11b 100644
--- a/src/js/settings.js
+++ b/src/js/settings.js
@@ -21,6 +21,10 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
  * A file for functions used for settings.
  */
 
+// To any third party devs that fork the project, please be ethical and change the API keys.
+const apiKeyBank = ['AIzaSyDjszXMCw44W_k-pdNoOxUHFyKGtU_ejwE', 'AIzaSyA0CkT2lS1q9HHaFYGNGM4Ycjl1kmRy22s', 'AIzaSyAiKgR75e3XAznCcb1cj4NUJ5rR_y3uB8E', 'AIzaSyDPy5jq2l1Bgv3-MbpGdZd3W3ik1BMZeDc', 'AIzaSyBeQ-Jd0lyMmul-K1QMZ2S4GSlnGFdCd3M'];
+
+
 /**
  * Display the settings screen to the user.
  *
@@ -28,14 +32,11 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
  */
 function showSettings() {
   clearMainContainer();
-  toggleLoading();
+  startLoadingAnimation();
 
   let isChecked = '';
   let key = '';
 
-  // To any third party devs that fork the project, please be ethical and change the API keys.
-  const apiKeyBank = ['AIzaSyDjszXMCw44W_k-pdNoOxUHFyKGtU_ejwE', 'AIzaSyA0CkT2lS1q9HHaFYGNGM4Ycjl1kmRy22s', 'AIzaSyAiKgR75e3XAznCcb1cj4NUJ5rR_y3uB8E', 'AIzaSyDPy5jq2l1Bgv3-MbpGdZd3W3ik1BMZeDc', 'AIzaSyBeQ-Jd0lyMmul-K1QMZ2S4GSlnGFdCd3M'];
-
   /*
    * Check the settings database for the user's current settings.  This is so the
    * settings page has the correct toggles related when it is rendered.
@@ -64,7 +65,7 @@ function showSettings() {
       });
       // Render template to application
       $('#main').html(rendered);
-      toggleLoading();
+      stopLoadingAnimation();
 
       // Check / uncheck the switch depending on the user's settings.
       if (currentTheme === 'light') {
@@ -82,9 +83,6 @@ function showSettings() {
  * @return {Void}
  */
 function checkDefaultSettings() {
-  // To any third party devs that fork the project, please be ethical and change the API keys.
-  const apiKeyBank = ['AIzaSyDjszXMCw44W_k-pdNoOxUHFyKGtU_ejwE', 'AIzaSyA0CkT2lS1q9HHaFYGNGM4Ycjl1kmRy22s', 'AIzaSyAiKgR75e3XAznCcb1cj4NUJ5rR_y3uB8E', 'AIzaSyDPy5jq2l1Bgv3-MbpGdZd3W3ik1BMZeDc', 'AIzaSyBeQ-Jd0lyMmul-K1QMZ2S4GSlnGFdCd3M'];
-
   // Grab a random API Key.
   apiKey = apiKeyBank[Math.floor(Math.random() * apiKeyBank.length)];
 
@@ -129,7 +127,6 @@ function checkDefaultSettings() {
 
     console.log("Using API key: " + apiKey);
     // Loads the JavaScript client library and invokes `start` afterwards.
-    gapi.load('client', start);
   });
 }
 
diff --git a/src/js/subscriptions.js b/src/js/subscriptions.js
index cfcc589b2..78ef841a8 100644
--- a/src/js/subscriptions.js
+++ b/src/js/subscriptions.js
@@ -31,25 +31,22 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
 function addSubscription(channelId, useToast = true) {
   console.log(channelId);
   // Request YouTube API
-  let request = gapi.client.youtube.channels.list({
+  youtubeAPI('channels', {
     part: 'snippet',
     id: channelId,
-  });
-
-  // Execute API request
-  request.execute((response) => {
-    const channelInfo = response['items'][0]['snippet'];
+  }, function (data){
+    const channelInfo = data['items'][0]['snippet'];
     const channelName = channelInfo['title'];
     const thumbnail = channelInfo['thumbnails']['high']['url'];
 
-    const data = {
+    const channel = {
       channelId: channelId,
       channelName: channelName,
       channelThumbnail: thumbnail,
     };
 
     // Refresh the list of subscriptions on the side navigation bar.
-    subDb.insert(data, (err, newDoc) => {
+    subDb.insert(channel, (err, newDoc) => {
       if (useToast){
         showToast('Added ' + channelName + ' to subscriptions.');
         displaySubs();
@@ -84,13 +81,7 @@ function loadSubscriptions() {
   clearMainContainer();
   const loading = document.getElementById('loading');
 
-  /*
-  * It is possible for the function to be called several times. This prevents the loading
-  * from being turned off when the situation occurs.
-  */
-  if (loading.style.display !== 'inherit'){
-    toggleLoading();
-  }
+  startLoadingAnimation()
 
   let videoList = [];
 
@@ -118,16 +109,14 @@ function loadSubscriptions() {
         * This number can be changed if we feel necessary.
         */
         try {
-          let request = gapi.client.youtube.search.list({
+          youtubeAPI('search', {
             part: 'snippet',
             channelId: channelId,
             type: 'video',
             maxResults: 15,
             order: 'date',
-          });
-
-          request.execute((response) => {
-            videoList = videoList.concat(response['items']);
+          }, function (error, response, data){
+            videoList = videoList.concat(data['items']);
             // Iterate through the next object in the loop.
             next();
           });
@@ -165,12 +154,12 @@ function loadSubscriptions() {
             displayVideos(videoList[i]);
           }
         }
-        toggleLoading();
+        stopLoadingAnimation()
       });
     } else {
       // User has no subscriptions. Display message.
       const container = document.getElementById('main');
-      toggleLoading();
+      stopLoadingAnimation()
 
       container.innerHTML = `<h2 class="message">Your Subscription list is currently empty.  Start adding subscriptions
                              to see them here.<br /><br /><i class="far fa-frown" style="font-size: 200px"></i></h2>`;
diff --git a/src/js/videos.js b/src/js/videos.js
index 9ac84561e..5a55210de 100644
--- a/src/js/videos.js
+++ b/src/js/videos.js
@@ -39,31 +39,27 @@ function search(nextPageToken = '') {
 
   if (nextPageToken === '') {
     clearMainContainer();
-    toggleLoading();
+    startLoadingAnimation();
   } else {
     console.log(nextPageToken);
     showToast('Fetching results.  Please wait...');
   }
 
   // Start API request
-  let request = gapi.client.youtube.search.list({
+  youtubeAPI('search', {
     q: query,
     part: 'id, snippet',
     type: 'video',
     pageToken: nextPageToken,
     maxResults: 25,
-  });
-
-  // Execute API Request
-  request.execute((response) => {
-    console.log(response);
+  }, function (data){
     if (nextPageToken === '') {
       createVideoListContainer('Search Results:');
-      toggleLoading();
+      stopLoadingAnimation();
     }
-    response['items'].forEach(displayVideos);
-    addNextPage(response['result']['nextPageToken']);
-  });
+    data.items.forEach(displayVideos);
+    addNextPage(data.result.nextPageToken);
+  })
 }
 
 /**
@@ -162,7 +158,7 @@ function addNextPage(nextPageToken) {
 */
 function playVideo(videoId) {
   clearMainContainer();
-  toggleLoading();
+  startLoadingAnimation();
 
   let subscribeText = '';
   let savedText = '';
@@ -187,7 +183,7 @@ function playVideo(videoId) {
     });
   } catch (ex) {
     showToast('Video not found. ID may be invalid.');
-    toggleLoading();
+    stopLoadingAnimation();
     return;
   }
 
@@ -285,15 +281,11 @@ function playVideo(videoId) {
     description = autolinker.link(description);
 
     // API Request
-    let request = gapi.client.youtube.channels.list({
+    youtubeAPI('channels', {
       'id': channelId,
       'part': 'snippet,contentDetails,statistics'
-    });
-
-    // Execute request
-    request.execute((response) => {
-      console.log(response);
-      const channelThumbnail = response['items'][0]['snippet']['thumbnails']['high']['url'];
+    }, function (data){
+      const channelThumbnail = data['items'][0]['snippet']['thumbnails']['high']['url'];
 
       $.get('templates/player.html', (template) => {
         mustache.parse(template);
@@ -321,7 +313,7 @@ function playVideo(videoId) {
           embedPlayer: embedPlayer,
         });
         $('#main').html(rendered);
-        toggleLoading();
+        stopLoadingAnimation();
         showVideoRecommendations(videoId);
         console.log('done');
       });
@@ -343,15 +335,13 @@ function playVideo(videoId) {
 * @param {string} videoId - The video ID of the video to get recommendations from.
 */
 function showVideoRecommendations(videoId) {
-  let request = gapi.client.youtube.search.list({
+  youtubeAPI('search', {
     part: 'snippet',
     type: 'video',
     relatedToVideoId: videoId,
     maxResults: 15,
-  });
-
-  request.execute((response) => {
-    const recommendations = response['items'];
+  }, function (data){
+    const recommendations = data.items;
     recommendations.forEach((data) => {
       const snippet = data['snippet'];
       const videoId = data['id']['videoId'];
@@ -454,7 +444,7 @@ function parseVideoLink() {
 */
 function showMostPopular() {
   clearMainContainer();
-  toggleLoading();
+  startLoadingAnimation();
 
   // Get the date of 2 days ago.
   var d = new Date();
@@ -465,19 +455,16 @@ function showMostPopular() {
   // These are the videos that are considered as 'most popular' and is how similar
   // Applications grab these.  Videos in the 'Trending' tab on YouTube will be different.
   // And there is no way to grab those videos.
-  let request = gapi.client.youtube.search.list({
+  youtubeAPI('search', {
     part: 'snippet',
     order: 'viewCount',
     type: 'video',
     publishedAfter: d.toISOString(),
     maxResults: 50,
-  });
-
-  request.execute((response) => {
-    console.log(response);
+  }, function (data){
     createVideoListContainer('Most Popular:');
-    toggleLoading();
-    response['items'].forEach(displayVideos);
+    stopLoadingAnimation();
+    data['items'].forEach(displayVideos);
   });
 }
 
@@ -506,14 +493,11 @@ function copyLink(website, videoId) {
 function getEmbedPlayer(videoId) {
   console.log(videoId);
   return new Promise((resolve, reject) => {
-    let request = gapi.client.youtube.videos.list({
+    youtubeAPI('videos', {
       part: 'player',
       id: videoId,
-    });
-
-    request.execute((response) => {
-      console.log(response);
-      let embedHtml = response['items'][0]['player']['embedHtml'];
+    }, function (data){
+      let embedHtml = data.items[0].player.embedHtml;
       embedHtml = embedHtml.replace('src="', 'src="https:');
       embedHtml = embedHtml.replace('width="480px"', '');
       embedHtml = embedHtml.replace('height="270px"', '');
diff --git a/src/js/youtubeApi.js b/src/js/youtubeApi.js
new file mode 100644
index 000000000..add2b4130
--- /dev/null
+++ b/src/js/youtubeApi.js
@@ -0,0 +1,17 @@
+var request = require("request");
+function youtubeAPI (path, qs, callback) {
+    qs.key = apiKey;
+    request({'url': "https://www.googleapis.com/youtube/v3/"+path, 'qs': qs, 'json': true},
+	function (error, response, body){
+		console.log([error, response, body]);
+		if (error){
+			dialog.showErrorBox('YouTube API HTTP error', JSON.stringify(error))
+			stopLoadingAnimation()
+		} else if (response.statusCode != 200){
+			dialog.showErrorBox('YouTube API error', JSON.stringify(body))
+			stopLoadingAnimation()
+		} else {
+			callback(body);
+		}
+	});
+}

From bb36906583a5eab9ab8704876f21669410f755d6 Mon Sep 17 00:00:00 2001
From: Larivact <larivact@users.noreply.github.com>
Date: Wed, 7 Mar 2018 07:15:02 +0100
Subject: [PATCH 02/14] Update README.md, the Google API script is no longer
 used

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9696416b3..d602e090b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # FreeTube
 FreeTube is an Open Source Desktop YouTube player built with privacy in mind.  Watch your favorite YouTube videos ad free as well as prevent Google from tracking what you watch.  Available for Windows / Mac / Linux
 
-Please note that FreeTube is currently in Beta and using the proprietary and obfuscated [Google API script](https://apis.google.com/js/api.js) (bundled as `src/js/googleApi.js`), which is planned to be ditched in the future. Video URLs are resolved using the [HookTube](https://hooktube.com/) HTTP API.
+Please note that FreeTube is currently in Beta and uses the proprietary [YouTube HTTP API](https://developers.google.com/youtube/v3/). Video URLs are resolved using the [HookTube](https://hooktube.com/) HTTP API.
 
 <a href='https://github.com/FreeTubeApp/FreeTube/releases' >Download</a>
 

From cde9175d54f3c36eadac22071b0ee36e492dfeb1 Mon Sep 17 00:00:00 2001
From: Larivact <larivact@users.noreply.github.com>
Date: Wed, 7 Mar 2018 07:35:08 +0100
Subject: [PATCH 03/14] Cleanup leftovers

---
 src/js/settings.js      | 2 --
 src/js/subscriptions.js | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/js/settings.js b/src/js/settings.js
index 9ca1dc11b..375132d78 100644
--- a/src/js/settings.js
+++ b/src/js/settings.js
@@ -24,7 +24,6 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
 // To any third party devs that fork the project, please be ethical and change the API keys.
 const apiKeyBank = ['AIzaSyDjszXMCw44W_k-pdNoOxUHFyKGtU_ejwE', 'AIzaSyA0CkT2lS1q9HHaFYGNGM4Ycjl1kmRy22s', 'AIzaSyAiKgR75e3XAznCcb1cj4NUJ5rR_y3uB8E', 'AIzaSyDPy5jq2l1Bgv3-MbpGdZd3W3ik1BMZeDc', 'AIzaSyBeQ-Jd0lyMmul-K1QMZ2S4GSlnGFdCd3M'];
 
-
 /**
  * Display the settings screen to the user.
  *
@@ -126,7 +125,6 @@ function checkDefaultSettings() {
     }
 
     console.log("Using API key: " + apiKey);
-    // Loads the JavaScript client library and invokes `start` afterwards.
   });
 }
 
diff --git a/src/js/subscriptions.js b/src/js/subscriptions.js
index 78ef841a8..988d7ee10 100644
--- a/src/js/subscriptions.js
+++ b/src/js/subscriptions.js
@@ -115,7 +115,7 @@ function loadSubscriptions() {
             type: 'video',
             maxResults: 15,
             order: 'date',
-          }, function (error, response, data){
+          }, function (data){
             videoList = videoList.concat(data['items']);
             // Iterate through the next object in the loop.
             next();

From 4cb4871f34cdfeef075a6412600784fd82d24318 Mon Sep 17 00:00:00 2001
From: Larivact <larivact@users.noreply.github.com>
Date: Wed, 7 Mar 2018 07:58:08 +0100
Subject: [PATCH 04/14] Fix request dependency in package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8d2a12e0b..f5624abeb 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,6 @@
     "nedb": "^1.8.0",
     "node-async-loop": "^1.2.2",
     "opml-to-json": "0.0.3",
-    "requests": "^0.2.2"
+    "request": "^2.83.0"
   }
 }

From 1e3a505b4e9ccf27f74a1ab9cc500c1455e37de4 Mon Sep 17 00:00:00 2001
From: Larivact <larivact@users.noreply.github.com>
Date: Thu, 8 Mar 2018 06:22:12 +0100
Subject: [PATCH 05/14] Update API keys

---
 src/js/settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/settings.js b/src/js/settings.js
index 375132d78..5c16caff1 100644
--- a/src/js/settings.js
+++ b/src/js/settings.js
@@ -22,7 +22,7 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 // To any third party devs that fork the project, please be ethical and change the API keys.
-const apiKeyBank = ['AIzaSyDjszXMCw44W_k-pdNoOxUHFyKGtU_ejwE', 'AIzaSyA0CkT2lS1q9HHaFYGNGM4Ycjl1kmRy22s', 'AIzaSyAiKgR75e3XAznCcb1cj4NUJ5rR_y3uB8E', 'AIzaSyDPy5jq2l1Bgv3-MbpGdZd3W3ik1BMZeDc', 'AIzaSyBeQ-Jd0lyMmul-K1QMZ2S4GSlnGFdCd3M'];
+const apiKeyBank = ['AIzaSyC9E579nh_qqxg6BH4xIce3k_7a9mT4uQc', 'AIzaSyCKplYT6hZIlm2O9FbWTi1G7rkpsLNTq78', 'AIzaSyAE5xzh5GcA_tEDhXmMFd1pEzrL-W7z51E', 'AIzaSyDoFzqwuO9l386eF6BmNkVapjiTJ93CBy4', 'AIzaSyBljfZFPioB0TRJAj-0LS4tlIKl2iucyY4'];
 
 /**
  * Display the settings screen to the user.

From ec4fb19f243a23e36687329c08481ceeacc31e9e Mon Sep 17 00:00:00 2001
From: Larivact <larivact@users.noreply.github.com>
Date: Thu, 8 Mar 2018 06:23:09 +0100
Subject: [PATCH 06/14] Update youtubeApi.js to use HTTP keep-alive for
 performance

---
 src/js/youtubeApi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/youtubeApi.js b/src/js/youtubeApi.js
index add2b4130..82b2047f3 100644
--- a/src/js/youtubeApi.js
+++ b/src/js/youtubeApi.js
@@ -1,7 +1,7 @@
 var request = require("request");
 function youtubeAPI (path, qs, callback) {
     qs.key = apiKey;
-    request({'url': "https://www.googleapis.com/youtube/v3/"+path, 'qs': qs, 'json': true},
+    request({'url': "https://www.googleapis.com/youtube/v3/"+path, 'qs': qs, 'json': true, 'forever': true},
 	function (error, response, body){
 		console.log([error, response, body]);
 		if (error){

From 2b2fe4016e131531117b14b14df330d1567b8bd3 Mon Sep 17 00:00:00 2001
From: Larivact <larivact@users.noreply.github.com>
Date: Sat, 10 Mar 2018 08:46:58 +0100
Subject: [PATCH 07/14] Fix indentation to two spaces

---
 src/js/channels.js    |  2 +-
 src/js/savedVideos.js |  2 +-
 src/js/youtubeApi.js  | 28 ++++++++++++++--------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/js/channels.js b/src/js/channels.js
index 9db836c64..c2bfd0bd3 100644
--- a/src/js/channels.js
+++ b/src/js/channels.js
@@ -95,7 +95,7 @@ function goToChannel(channelId) {
     });
 
     // Grab the channel's latest upload.  API forces a max of 50.
-	youtubeAPI('search', {
+    youtubeAPI('search', {
       part: 'snippet',
       channelId: channelId,
       type: 'video',
diff --git a/src/js/savedVideos.js b/src/js/savedVideos.js
index 85f7535dc..d99c5c496 100644
--- a/src/js/savedVideos.js
+++ b/src/js/savedVideos.js
@@ -136,7 +136,7 @@ function showSavedVideos(){
     }
 
     // Call the YouTube API
-	youtubeAPI('videos', {
+    youtubeAPI('videos', {
       part: 'snippet',
       id: videoList,
       maxResults: 50,
diff --git a/src/js/youtubeApi.js b/src/js/youtubeApi.js
index 82b2047f3..81945e8b5 100644
--- a/src/js/youtubeApi.js
+++ b/src/js/youtubeApi.js
@@ -1,17 +1,17 @@
 var request = require("request");
 function youtubeAPI (path, qs, callback) {
-    qs.key = apiKey;
-    request({'url': "https://www.googleapis.com/youtube/v3/"+path, 'qs': qs, 'json': true, 'forever': true},
-	function (error, response, body){
-		console.log([error, response, body]);
-		if (error){
-			dialog.showErrorBox('YouTube API HTTP error', JSON.stringify(error))
-			stopLoadingAnimation()
-		} else if (response.statusCode != 200){
-			dialog.showErrorBox('YouTube API error', JSON.stringify(body))
-			stopLoadingAnimation()
-		} else {
-			callback(body);
-		}
-	});
+  qs.key = apiKey;
+  request({'url': "https://www.googleapis.com/youtube/v3/"+path, 'qs': qs, 'json': true, 'forever': true},
+  function (error, response, body){
+    console.log([error, response, body]);
+    if (error){
+      dialog.showErrorBox('YouTube API HTTP error', JSON.stringify(error))
+      stopLoadingAnimation()
+    } else if (response.statusCode != 200){
+      dialog.showErrorBox('YouTube API error', JSON.stringify(body))
+      stopLoadingAnimation()
+    } else {
+      callback(body);
+    }
+  });
 }

From 76d98500f6f8196e5f369d0af6e07402cafc9c3c Mon Sep 17 00:00:00 2001
From: Larivact <larivact@users.noreply.github.com>
Date: Sat, 10 Mar 2018 11:06:34 +0100
Subject: [PATCH 08/14] Fix endless loop in subscriptions.js:
 loadSubscriptions()

---
 src/js/subscriptions.js | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/js/subscriptions.js b/src/js/subscriptions.js
index c1fb16ce8..30ccc51f3 100644
--- a/src/js/subscriptions.js
+++ b/src/js/subscriptions.js
@@ -108,26 +108,17 @@ function loadSubscriptions() {
         * Grab the channels 15 most recent uploads.  Typically this should be enough.
         * This number can be changed if we feel necessary.
         */
-        try {
-          youtubeAPI('search', {
-            part: 'snippet', // Try getting content details for video duration in the near future.
-            channelId: channelId,
-            type: 'video',
-            maxResults: 15,
-            order: 'date',
-          }, function (data){
-            videoList = videoList.concat(data['items']);
-            // Iterate through the next object in the loop.
-            next();
-          });
-        } catch (err) {
-          /*
-          * The above API requests sometimes forces an error for some reason. Restart
-          * the function to prevent this.  This should be changed if possible.
-          */
-          loadSubscriptions();
-          return;
-        }
+        youtubeAPI('search', {
+          part: 'snippet', // Try getting content details for video duration in the near future.
+          channelId: channelId,
+          type: 'video',
+          maxResults: 15,
+          order: 'date',
+        }, function (data){
+          videoList = videoList.concat(data['items']);
+          // Iterate through the next object in the loop.
+          next();
+        });
       }, (err) => {
         // Sort the videos by date
         videoList.sort((a, b) => {

From 8733cec79cdd1941e48a3d25a898602e273e2799 Mon Sep 17 00:00:00 2001
From: Larivact <larivact@users.noreply.github.com>
Date: Sat, 10 Mar 2018 11:08:06 +0100
Subject: [PATCH 09/14] Use jquery.getJSON() instead of request module

---
 package.json         |  3 +--
 src/js/youtubeApi.js | 35 ++++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 1a6af9c05..dc66f3123 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,6 @@
     "mustache": "^2.3.0",
     "nedb": "^1.8.0",
     "node-async-loop": "^1.2.2",
-    "opml-to-json": "0.0.3",
-    "request": "^2.83.0"
+    "opml-to-json": "0.0.3"
   }
 }
diff --git a/src/js/youtubeApi.js b/src/js/youtubeApi.js
index 81945e8b5..96c845c01 100644
--- a/src/js/youtubeApi.js
+++ b/src/js/youtubeApi.js
@@ -1,17 +1,22 @@
-var request = require("request");
-function youtubeAPI (path, qs, callback) {
-  qs.key = apiKey;
-  request({'url': "https://www.googleapis.com/youtube/v3/"+path, 'qs': qs, 'json': true, 'forever': true},
-  function (error, response, body){
-    console.log([error, response, body]);
-    if (error){
-      dialog.showErrorBox('YouTube API HTTP error', JSON.stringify(error))
-      stopLoadingAnimation()
-    } else if (response.statusCode != 200){
-      dialog.showErrorBox('YouTube API error', JSON.stringify(body))
-      stopLoadingAnimation()
-    } else {
-      callback(body);
-    }
+/**
+* List a YouTube HTTP API resource.
+*
+* @param {string} resource - The path of the resource.
+* @param {object} params - The API parameters.
+* @param {function} success - The function to be called on success.
+*
+* @return {Void}
+*/
+function youtubeAPI(resource, params, success) {
+  params.key = apiKey;
+  console.log(resource, params, success)
+  $.getJSON(
+    'https://www.googleapis.com/youtube/v3/' + resource,
+    params,
+    success
+  ).fail((xhr, textStatus, error) => {
+    showToast('There was an error calling the YouTube API.');
+    console.log(error);
+    stopLoadingAnimation();
   });
 }

From 2c161f040485b7b7d1a33a926b47bae7598a27c3 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sat, 10 Mar 2018 16:33:33 +0000
Subject: [PATCH 10/14] Create CONTRIBUTING.md

---
 CONTRIBUTING.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..139823c67
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,21 @@
+# API Keys
+
+When you are testing and working on FreeTube, PLEASE use your own API Key.  The keys included in the project are in use by the userbase and testing can cause these keys to max out.  Please do not risk degrading the experience for other users and use your own key if at all possible.  Thank you for your cooperation.
+
+# Code Contributions
+
+Please follow these guidlines before sending your pull request and making contributions.
+
+* When you submit a pull request, you agree that your code is published under the [GNU General Public License](https://www.gnu.org/licenses/gpl.html)
+* Do not include non-free software or modules with your code.
+* Make sure your pull request is setup to merge your branch to FreeTube's development branch.
+* Make sure your branch is up to date with the development branch before submitting your pull request.
+* Stick to a similar style of code already in the project.  Please look at current code to get an idea on how to do this.
+* Follow [ES6](http://es6-features.org/) standards in your code. Ex: Use `let` and `const` instead of `var`. Do not use `function(response){//code}` for callbacks, use `(response) => {//code}`.
+* Comment your code when necessary.  Follow the [JavaScript Documentation and Comments Standard](https://www.drupal.org/docs/develop/standards/javascript/javascript-api-documentation-and-comment-standards) for functions.
+* Please test your code.  Make sure new features work as well as core features such as watching videos or loading subscriptions.
+* Please limit the amount of Node Modules that you introduce into the project.  Only include them when absolutely necessary for your code to work (Ex: Using nedb for databases) or if a module provides similar functionality to what you are trying to achieve (Ex: Using autolinker to create links to outside URLs instead of writing the functionality myself).
+* If using a new Node Module, please include the `require` statement in `layout.js` to keep them together.
+* Please try to stay involved with the community and maintain your code.  I am only one person and I work on FreeTube only in my spare time.  I do not have time to work on everything and it would be nice if you can maintain your code when necessary.
+
+I will update this document when necessary.  Anyone who has questions or suggestions on this document are welcome to create an issue or pull request.

From 888bb30b434fd0da45d7f625a0daaa2d328ccccb Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sat, 10 Mar 2018 16:44:18 +0000
Subject: [PATCH 11/14] Create PULL_REQUEST_TEMPLATE.md

---
 PULL_REQUEST_TEMPLATE.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 PULL_REQUEST_TEMPLATE.md

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..a2fd36065
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+- [ ] I have read and agree to the [Contribution Guidelines](https://github.com/FreeTubeApp/FreeTube/blob/master/CONTRIBUTING.md)
+- [ ] I can maintain / support my code if issues arise.
+
+**Does your change relate to a current issue? Please list it here if applicable.**
+
+
+**Please list out the changes you've made**
+
+
+**Does your change include any new Node Modules?  If yes, what modules and what are they licensed under?**
+
+
+**Other Comments**

From a62d3e9fc44b30569cb9f354576c0ad7bf368808 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sat, 10 Mar 2018 16:50:27 +0000
Subject: [PATCH 12/14] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 139823c67..0e69c35c9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,4 +18,40 @@ Please follow these guidlines before sending your pull request and making contri
 * If using a new Node Module, please include the `require` statement in `layout.js` to keep them together.
 * Please try to stay involved with the community and maintain your code.  I am only one person and I work on FreeTube only in my spare time.  I do not have time to work on everything and it would be nice if you can maintain your code when necessary.
 
+# Setting up Your Environment
+
+Here's how to get your environment setup.  You will need Git and NPM installed on your system.
+
+Clone down the repositoy:
+```
+git clone https://github.com/FreeTubeApp/FreeTube.git
+```
+
+Install Dependencies:
+```
+npm install
+```
+
+Run the application:
+```
+npm start
+```
+
+Make / Package application:
+
+Windows (Requires Wine on Linux):
+```
+npm run make:win32
+```
+
+Mac:
+```
+npm run make:darwin
+```
+
+Linux (Requires deb and rpm to be installed):
+```
+npm run make:linux
+```
+
 I will update this document when necessary.  Anyone who has questions or suggestions on this document are welcome to create an issue or pull request.

From 8a605b4458944bd1be6b5c22ac84c46cece30e07 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sat, 10 Mar 2018 16:51:38 +0000
Subject: [PATCH 13/14] Update README.md

---
 README.md | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/README.md b/README.md
index 509e69a33..f890530e3 100644
--- a/README.md
+++ b/README.md
@@ -30,38 +30,7 @@ While I believe that FreeTube should work well for most users, there will probab
 # I'd like to help!
 If you have an idea or if you found a bug, please create an issue so that we can track it.  Please check the current issues and make sure that someone else hasn't mentioned it already before submitting an issue.
 
-If you like to get your hands dirty and want to contribute, we would love to have your help.  Send a pull request and someone will review your code. Proper contribution guidelines will be included soon, but in the meantime here's how to get start:
-
-After you pull down the code:
-
-Install Dependencies:
-```
-npm install
-```
-
-Run the application:
-```
-npm start
-```
-
-Make / Package application:
-
-Windows (Requires Wine on Linux):
-```
-npm run make:win32
-```
-
-Mac:
-```
-npm run make:darwin
-```
-
-Linux (Requires deb and rpm):
-```
-npm run make:linux
-```
-
-The bundled application will then be located in the "/out" folder in your project directory.
+If you like to get your hands dirty and want to contribute, we would love to have your help.  Send a pull request and someone will review your code. Please follow the [Contribution Guidelines](https://github.com/FreeTubeApp/FreeTube/blob/master/CONTRIBUTING.md) before sending your pull request.
 
 # License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  

From a73b82429532bf9c28a07d09cf749770f27f86ba Mon Sep 17 00:00:00 2001
From: Larivact <Larivact@users.noreply.github.com>
Date: Sat, 10 Mar 2018 22:03:32 +0100
Subject: [PATCH 14/14] Replace proprietary googleApi.js with HTTP Requests
 (#21)

* Ditch googleApi.js, use request instead; refactor code

* Update README.md, the Google API script is no longer used

* Cleanup leftovers

* Fix request dependency in package.json

* Update API keys

* Update youtubeApi.js to use HTTP keep-alive for performance

* Fix indentation to two spaces

* Fix endless loop in subscriptions.js: loadSubscriptions()

* Use jquery.getJSON() instead of request module
---
 README.md               |  2 +-
 src/index.html          |  2 +-
 src/js/channels.js      | 35 ++++++++-----------
 src/js/events.js        |  6 ++--
 src/js/googleApi.js     | 18 ----------
 src/js/history.js       | 12 +++----
 src/js/init.js          |  2 +-
 src/js/layout.js        | 38 ++++++---------------
 src/js/savedVideos.js   | 13 +++-----
 src/js/settings.js      | 15 +++------
 src/js/subscriptions.js | 58 +++++++++++---------------------
 src/js/videos.js        | 74 +++++++++++++++--------------------------
 src/js/youtubeApi.js    | 22 ++++++++++++
 13 files changed, 110 insertions(+), 187 deletions(-)
 delete mode 100644 src/js/googleApi.js
 create mode 100644 src/js/youtubeApi.js

diff --git a/README.md b/README.md
index f890530e3..f75f357fa 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # FreeTube
 FreeTube is an Open Source Desktop YouTube player built with privacy in mind.  Watch your favorite YouTube videos ad free as well as prevent Google from tracking what you watch.  Available for Windows / Mac / Linux
 
-Please note that FreeTube is currently in Beta and using the proprietary and obfuscated [Google API script](https://apis.google.com/js/api.js) (bundled as `src/js/googleApi.js`), which is planned to be ditched in the future. Video URLs are resolved using the [youtube-dl](https://github.com/jaimeMF/youtube-dl-api-server) HTTP API.
+Please note that FreeTube is currently in Beta and uses the proprietary [YouTube HTTP API](https://developers.google.com/youtube/v3/). Video URLs are resolved using a [youtube-dl-api-server](https://github.com/jaimeMF/youtube-dl-api-server).
 
 <a href='https://github.com/FreeTubeApp/FreeTube/releases' >Download</a>
 
diff --git a/src/index.html b/src/index.html
index 15852a2bf..33971f4af 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" href="style/loading.css">
   <link rel="stylesheet" href="style/fa-solid.min.css">
   <link rel="stylesheet" href="style/fontawesome-all.min.css">
-  <script src="js/googleApi.js"></script>
+  <script src="js/youtubeApi.js"></script>
   <script src="js/settings.js"></script>
   <script src="js/layout.js"></script>
   <script src="js/videos.js"></script>
diff --git a/src/js/channels.js b/src/js/channels.js
index dd7e44048..c2bfd0bd3 100644
--- a/src/js/channels.js
+++ b/src/js/channels.js
@@ -24,14 +24,11 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
 /*function getChannelThumbnail(channelId, callback) {
   let url = '';
 
-  let request = gapi.client.youtube.channels.list({
+  youtubeAPI('channels', {
     'id': channelId,
     'part': 'snippet',
-  });
-
-  request.execute((response) => {
-    url = response['items'][0]['snippet']['thumbnails']['high']['url'];
-    callback(url);
+  }, function (data){
+    callback(data.items[0].snippet.thumbnails.high.url);
   });
 }*/
 
@@ -45,7 +42,7 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
 function goToChannel(channelId) {
   event.stopPropagation();
   clearMainContainer();
-  toggleLoading();
+  startLoadingAnimation();
 
 
   // Check if the user is subscribed to the channel.  Display different text based on the information
@@ -62,17 +59,14 @@ function goToChannel(channelId) {
   });
 
   // Call YouTube API to grab channel information
-  let request = gapi.client.youtube.channels.list({
+  youtubeAPI('channels', {
     part: 'snippet, brandingSettings, statistics',
     id: channelId,
-  });
-
-  // Perform API Execution
-  request.execute((response) => {
+  }, function (data){
     // Set variables of extracted information
-    const brandingSettings = response['items'][0]['brandingSettings'];
-    const statistics = response['items'][0]['statistics'];
-    const snippet = response['items'][0]['snippet'];
+    const brandingSettings = data['items'][0]['brandingSettings'];
+    const statistics = data['items'][0]['statistics'];
+    const snippet = data['items'][0]['snippet'];
     const channelName = brandingSettings['channel']['title'];
     const channelBanner = brandingSettings['image']['bannerImageUrl'];
     const channelImage = snippet['thumbnails']['high']['url'];
@@ -97,22 +91,19 @@ function goToChannel(channelId) {
       });
       // Render the template on to #main
       $('#main').html(rendered);
-      toggleLoading();
+      stopLoadingAnimation();
     });
 
     // Grab the channel's latest upload.  API forces a max of 50.
-    let request = gapi.client.youtube.search.list({
+    youtubeAPI('search', {
       part: 'snippet',
       channelId: channelId,
       type: 'video',
       maxResults: 50,
       order: 'date',
-    });
-
-    // Execute API request
-    request.execute((response) => {
+    }, function (data) {
       // Display recent uploads to #main
-      response['items'].forEach((video) => {
+      data['items'].forEach((video) => {
         displayVideos(video);
       });
     });
diff --git a/src/js/events.js b/src/js/events.js
index b96b178c6..f15656208 100644
--- a/src/js/events.js
+++ b/src/js/events.js
@@ -35,13 +35,11 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
       let commentsTemplate = $.get('templates/comments.html');
 
       commentsTemplate.done((template) => {
-        let request = gapi.client.youtube.commentThreads.list({
+        youtubeAPI('commentThreads', {
           'videoId': $('#comments').attr('data-video-id'),
           'part': 'snippet,replies',
           'maxResults': 100,
-        });
-
-        request.execute((data) => {
+        }, function (data){
           let comments = [];
           let items = data.items;
 
diff --git a/src/js/googleApi.js b/src/js/googleApi.js
deleted file mode 100644
index 7d177d869..000000000
--- a/src/js/googleApi.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// File was downloaded to prevent dependency on website.
-// You can find this file at https://apis.google.com/js/api.js
-//
-// This file is not covered by GPL v3.  If the owners of this file would like to have
-// this file removed from FreeTube, please contact me at FreeTubeApp@protonmail.com
-
-var gapi=window.gapi=window.gapi||{};gapi._bs=new Date().getTime();(function(){/*
- gapi.loader.OBJECT_CREATE_TEST_OVERRIDE &&*/
-var g=window,h=document,m=g.location,n=function(){},q=/\[native code\]/,u=function(a,b,c){return a[b]=a[b]||c},aa=function(a){a=a.sort();for(var b=[],c=void 0,d=0;d<a.length;d++){var e=a[d];e!=c&&b.push(e);c=e}return b},w=function(){var a;if((a=Object.create)&&q.test(a))a=a(null);else{a={};for(var b in a)a[b]=void 0}return a},x=u(g,"gapi",{});var A;A=u(g,"___jsl",w());u(A,"I",0);u(A,"hel",10);var B=function(){var a=m.href;if(A.dpo)var b=A.h;else{b=A.h;var c=/([#].*&|[#])jsh=([^&#]*)/g,d=/([?#].*&|[?#])jsh=([^&#]*)/g;if(a=a&&(c.exec(a)||d.exec(a)))try{b=decodeURIComponent(a[2])}catch(e){}}return b},ba=function(a){var b=u(A,"PQ",[]);A.PQ=[];var c=b.length;if(0===c)a();else for(var d=0,e=function(){++d===c&&a()},f=0;f<c;f++)b[f](e)},C=function(a){return u(u(A,"H",w()),a,w())};var D=u(A,"perf",w()),F=u(D,"g",w()),ca=u(D,"i",w());u(D,"r",[]);w();w();var G=function(a,b,c){var d=D.r;"function"===typeof d?d(a,b,c):d.push([a,b,c])},K=function(a,b,c){b&&0<b.length&&(b=J(b),c&&0<c.length&&(b+="___"+J(c)),28<b.length&&(b=b.substr(0,28)+(b.length-28)),c=b,b=u(ca,"_p",w()),u(b,c,w())[a]=(new Date).getTime(),G(a,"_p",c))},J=function(a){return a.join("__").replace(/\./g,"_").replace(/\-/g,"_").replace(/,/g,"_")};var L=w(),M=[],N=function(a){throw Error("Bad hint"+(a?": "+a:""));};M.push(["jsl",function(a){for(var b in a)if(Object.prototype.hasOwnProperty.call(a,b)){var c=a[b];"object"==typeof c?A[b]=u(A,b,[]).concat(c):u(A,b,c)}if(b=a.u)a=u(A,"us",[]),a.push(b),(b=/^https:(.*)$/.exec(b))&&a.push("http:"+b[1])}]);var da=/^(\/[a-zA-Z0-9_\-]+)+$/,O=[/\/amp\//,/\/amp$/,/^\/amp$/],ea=/^[a-zA-Z0-9\-_\.,!]+$/,fa=/^gapi\.loaded_[0-9]+$/,ha=/^[a-zA-Z0-9,._-]+$/,la=function(a,b,c,d){var e=a.split(";"),f=e.shift(),l=L[f],k=null;l?k=l(e,b,c,d):N("no hint processor for: "+f);k||N("failed to generate load url");b=k;c=b.match(ia);(d=b.match(ja))&&1===d.length&&ka.test(b)&&c&&1===c.length||N("failed sanity: "+a);return k},na=function(a,b,c,d){a=ma(a);fa.test(c)||N("invalid_callback");b=P(b);d=d&&d.length?P(d):null;var e=
-function(a){return encodeURIComponent(a).replace(/%2C/g,",")};return[encodeURIComponent(a.pathPrefix).replace(/%2C/g,",").replace(/%2F/g,"/"),"/k=",e(a.version),"/m=",e(b),d?"/exm="+e(d):"","/rt=j/sv=1/d=1/ed=1",a.a?"/am="+e(a.a):"",a.c?"/rs="+e(a.c):"",a.f?"/t="+e(a.f):"","/cb=",e(c)].join("")},ma=function(a){"/"!==a.charAt(0)&&N("relative path");for(var b=a.substring(1).split("/"),c=[];b.length;){a=b.shift();if(!a.length||0==a.indexOf("."))N("empty/relative directory");else if(0<a.indexOf("=")){b.unshift(a);
-break}c.push(a)}a={};for(var d=0,e=b.length;d<e;++d){var f=b[d].split("="),l=decodeURIComponent(f[0]),k=decodeURIComponent(f[1]);2==f.length&&l&&k&&(a[l]=a[l]||k)}b="/"+c.join("/");da.test(b)||N("invalid_prefix");c=0;for(d=O.length;c<d;++c)O[c].test(b)&&N("invalid_prefix");c=Q(a,"k",!0);d=Q(a,"am");e=Q(a,"rs");a=Q(a,"t");return{pathPrefix:b,version:c,a:d,c:e,f:a}},P=function(a){for(var b=[],c=0,d=a.length;c<d;++c){var e=a[c].replace(/\./g,"_").replace(/-/g,"_");ha.test(e)&&b.push(e)}return b.join(",")},
-Q=function(a,b,c){a=a[b];!a&&c&&N("missing: "+b);if(a){if(ea.test(a))return a;N("invalid: "+b)}return null},ka=/^https?:\/\/[a-z0-9_.-]+\.google(rs)?\.com(:\d+)?\/[a-zA-Z0-9_.,!=\-\/]+$/,ja=/\/cb=/g,ia=/\/\//g,oa=function(){var a=B();if(!a)throw Error("Bad hint");return a};L.m=function(a,b,c,d){(a=a[0])||N("missing_hint");return"https://apis.google.com"+na(a,b,c,d)};var R=decodeURI("%73cript"),S=/^[-+_0-9\/A-Za-z]+={0,2}$/,T=function(a,b){for(var c=[],d=0;d<a.length;++d){var e=a[d],f;if(f=e){a:{for(f=0;f<b.length;f++)if(b[f]===e)break a;f=-1}f=0>f}f&&c.push(e)}return c},U=function(){var a=A.nonce;if(void 0!==a)return a&&a===String(a)&&a.match(S)?a:A.nonce=null;var b=u(A,"us",[]);if(!b||!b.length)return A.nonce=null;for(var c=h.getElementsByTagName(R),d=0,e=c.length;d<e;++d){var f=c[d];if(f.src&&(a=String(f.nonce||f.getAttribute("nonce")||"")||null)){for(var l=
-0,k=b.length;l<k&&b[l]!==f.src;++l);if(l!==k&&a&&a===String(a)&&a.match(S))return A.nonce=a}}return null},pa=function(a){if("loading"!=h.readyState)V(a);else{var b=U(),c="";null!==b&&(c=' nonce="'+b+'"');h.write("<"+R+' src="'+encodeURI(a)+'"'+c+"></"+R+">")}},V=function(a){var b=h.createElement(R);b.setAttribute("src",a);a=U();null!==a&&b.setAttribute("nonce",a);b.async="true";(a=h.getElementsByTagName(R)[0])?a.parentNode.insertBefore(b,a):(h.head||h.body||h.documentElement).appendChild(b)},qa=function(a,
-b){var c=b&&b._c;if(c)for(var d=0;d<M.length;d++){var e=M[d][0],f=M[d][1];f&&Object.prototype.hasOwnProperty.call(c,e)&&f(c[e],a,b)}},ra=function(a,b,c){X(function(){var c=b===B()?u(x,"_",w()):w();c=u(C(b),"_",c);a(c)},c)},Z=function(a,b){var c=b||{};"function"==typeof b&&(c={},c.callback=b);qa(a,c);b=a?a.split(":"):[];var d=c.h||oa(),e=u(A,"ah",w());if(e["::"]&&b.length){a=[];for(var f=null;f=b.shift();){var l=f.split(".");l=e[f]||e[l[1]&&"ns:"+l[0]||""]||d;var k=a.length&&a[a.length-1]||null,v=
-k;k&&k.hint==l||(v={hint:l,b:[]},a.push(v));v.b.push(f)}var y=a.length;if(1<y){var z=c.callback;z&&(c.callback=function(){0==--y&&z()})}for(;b=a.shift();)Y(b.b,c,b.hint)}else Y(b||[],c,d)},Y=function(a,b,c){a=aa(a)||[];var d=b.callback,e=b.config,f=b.timeout,l=b.ontimeout,k=b.onerror,v=void 0;"function"==typeof k&&(v=k);var y=null,z=!1;if(f&&!l||!f&&l)throw"Timeout requires both the timeout parameter and ontimeout parameter to be set";k=u(C(c),"r",[]).sort();var H=u(C(c),"L",[]).sort(),E=[].concat(k),
-W=function(a,b){if(z)return 0;g.clearTimeout(y);H.push.apply(H,p);var d=((x||{}).config||{}).update;d?d(e):e&&u(A,"cu",[]).push(e);if(b){K("me0",a,E);try{ra(b,c,v)}finally{K("me1",a,E)}}return 1};0<f&&(y=g.setTimeout(function(){z=!0;l()},f));var p=T(a,H);if(p.length){p=T(a,k);var r=u(A,"CP",[]),t=r.length;r[t]=function(a){if(!a)return 0;K("ml1",p,E);var b=function(b){r[t]=null;W(p,a)&&ba(function(){d&&d();b()})},c=function(){var a=r[t+1];a&&a()};0<t&&r[t-1]?r[t]=function(){b(c)}:b(c)};if(p.length){var I=
-"loaded_"+A.I++;x[I]=function(a){r[t](a);x[I]=null};a=la(c,p,"gapi."+I,k);k.push.apply(k,p);K("ml0",p,E);b.sync||g.___gapisync?pa(a):V(a)}else r[t](n)}else W(p)&&d&&d()};var X=function(a,b){if(A.hee&&0<A.hel)try{return a()}catch(c){b&&b(c),A.hel--,Z("debug_error",function(){try{window.___jsl.hefn(c)}catch(d){throw c;}})}else try{return a()}catch(c){throw b&&b(c),c;}};x.load=function(a,b){return X(function(){return Z(a,b)})};F.bs0=window.gapi._bs||(new Date).getTime();G("bs0");F.bs1=(new Date).getTime();G("bs1");delete window.gapi._bs;}).call(this);
-gapi.load("",{callback:window["gapi_onload"],_c:{"jsl":{"ci":{"deviceType":"desktop","oauth-flow":{"authUrl":"https://accounts.google.com/o/oauth2/auth","proxyUrl":"https://accounts.google.com/o/oauth2/postmessageRelay","disableOpt":true,"idpIframeUrl":"https://accounts.google.com/o/oauth2/iframe","usegapi":false},"debug":{"reportExceptionRate":0.05,"forceIm":false,"rethrowException":false,"host":"https://apis.google.com"},"enableMultilogin":true,"googleapis.config":{"auth":{"useFirstPartyAuthV2":false}},"isPlusUser":false,"inline":{"css":1},"disableRealtimeCallback":false,"drive_share":{"skipInitCommand":true},"csi":{"rate":0.01},"client":{"cors":false},"isLoggedIn":false,"signInDeprecation":{"rate":0.0},"include_granted_scopes":true,"llang":"en","iframes":{"ytsubscribe":{"url":"https://www.youtube.com/subscribe_embed?usegapi\u003d1"},"plus_share":{"params":{"url":""},"url":":socialhost:/:session_prefix::se:_/+1/sharebutton?plusShare\u003dtrue\u0026usegapi\u003d1"},":source:":"3p","playemm":{"url":"https://play.google.com/work/embedded/search?usegapi\u003d1\u0026usegapi\u003d1"},"partnersbadge":{"url":"https://www.gstatic.com/partners/badge/templates/badge.html?usegapi\u003d1"},"dataconnector":{"url":"https://dataconnector.corp.google.com/:session_prefix:ui/widgetview?usegapi\u003d1"},"shortlists":{"url":""},"plus_followers":{"params":{"url":""},"url":":socialhost:/_/im/_/widget/render/plus/followers?usegapi\u003d1"},"post":{"params":{"url":""},"url":":socialhost:/:session_prefix::im_prefix:_/widget/render/post?usegapi\u003d1"},"signin":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/render/signin?usegapi\u003d1","methods":["onauth"]},"donation":{"url":"https://onetoday.google.com/home/donationWidget?usegapi\u003d1"},"plusone":{"params":{"count":"","size":"","url":""},"url":":socialhost:/:session_prefix::se:_/+1/fastbutton?usegapi\u003d1"},":im_socialhost:":"https://plus.googleapis.com","backdrop":{"url":"https://clients3.google.com/cast/chromecast/home/widget/backdrop?usegapi\u003d1"},"visibility":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/render/visibility?usegapi\u003d1"},"additnow":{"url":"https://apis.google.com/additnow/additnow.html?usegapi\u003d1","methods":["launchurl"]},":signuphost:":"https://plus.google.com","community":{"url":":ctx_socialhost:/:session_prefix::im_prefix:_/widget/render/community?usegapi\u003d1"},"plus":{"url":":socialhost:/:session_prefix:_/widget/render/badge?usegapi\u003d1"},"commentcount":{"url":":socialhost:/:session_prefix:_/widget/render/commentcount?usegapi\u003d1"},"zoomableimage":{"url":"https://ssl.gstatic.com/microscope/embed/"},"appfinder":{"url":"https://gsuite.google.com/:session_prefix:marketplace/appfinder?usegapi\u003d1"},"person":{"url":":socialhost:/:session_prefix:_/widget/render/person?usegapi\u003d1"},"savetodrive":{"url":"https://drive.google.com/savetodrivebutton?usegapi\u003d1","methods":["save"]},"page":{"url":":socialhost:/:session_prefix:_/widget/render/page?usegapi\u003d1"},"card":{"url":":socialhost:/:session_prefix:_/hovercard/card"},"youtube":{"params":{"location":["search","hash"]},"url":":socialhost:/:session_prefix:_/widget/render/youtube?usegapi\u003d1","methods":["scroll","openwindow"]},"plus_circle":{"params":{"url":""},"url":":socialhost:/:session_prefix::se:_/widget/plus/circle?usegapi\u003d1"},"rbr_s":{"params":{"url":""},"url":":socialhost:/:session_prefix::se:_/widget/render/recobarsimplescroller"},"udc_webconsentflow":{"params":{"url":""},"url":"https://myaccount.google.com/webconsent?usegapi\u003d1"},"savetoandroidpay":{"url":"https://androidpay.google.com/a/widget/save"},"blogger":{"params":{"location":["search","hash"]},"url":":socialhost:/:session_prefix:_/widget/render/blogger?usegapi\u003d1","methods":["scroll","openwindow"]},"evwidget":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/events/widget?usegapi\u003d1"},"surveyoptin":{"url":"https://www.google.com/shopping/customerreviews/optin?usegapi\u003d1"},":socialhost:":"https://apis.google.com","hangout":{"url":"https://talkgadget.google.com/:session_prefix:talkgadget/_/widget"},":gplus_url:":"https://plus.google.com","rbr_i":{"params":{"url":""},"url":":socialhost:/:session_prefix::se:_/widget/render/recobarinvitation"},"share":{"url":":socialhost:/:session_prefix::im_prefix:_/widget/render/share?usegapi\u003d1"},"comments":{"params":{"location":["search","hash"]},"url":":socialhost:/:session_prefix:_/widget/render/comments?usegapi\u003d1","methods":["scroll","openwindow"]},"autocomplete":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/render/autocomplete"},"ratingbadge":{"url":"https://www.google.com/shopping/customerreviews/badge?usegapi\u003d1"},"appcirclepicker":{"url":":socialhost:/:session_prefix:_/widget/render/appcirclepicker"},"follow":{"url":":socialhost:/:session_prefix:_/widget/render/follow?usegapi\u003d1"},"sharetoclassroom":{"url":"https://www.gstatic.com/classroom/sharewidget/widget_stable.html?usegapi\u003d1"},"ytshare":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/render/ytshare?usegapi\u003d1"},"family_creation":{"params":{"url":""},"url":"https://families.google.com/webcreation?usegapi\u003d1\u0026usegapi\u003d1"},"configurator":{"url":":socialhost:/:session_prefix:_/plusbuttonconfigurator?usegapi\u003d1"},"savetowallet":{"url":"https://androidpay.google.com/a/widget/save"}}},"h":"m;/_/scs/apps-static/_/js/k\u003doz.gapi.en_US.3HZg_yZrZ6s.O/m\u003d__features__/am\u003dAQE/rt\u003dj/d\u003d1/rs\u003dAGLTcCMh5tGv8ugYOhxzmMzy5FFHCxFzwg","u":"https://apis.google.com/js/api.js","hee":true,"fp":"10ff85b3e618484d8f4daf3d80ff528580374230","dpo":false},"fp":"10ff85b3e618484d8f4daf3d80ff528580374230","annotation":["interactivepost","recobar","signin2","autocomplete","profile"],"bimodal":["signin","share"]}});
diff --git a/src/js/history.js b/src/js/history.js
index f6b76068e..411f19d9c 100644
--- a/src/js/history.js
+++ b/src/js/history.js
@@ -55,7 +55,7 @@ function removeFromHistory(videoId){
 */
 function showHistory(){
   clearMainContainer();
-  toggleLoading();
+  startLoadingAnimation();
   console.log('checking history');
 
   let videoList = '';
@@ -75,18 +75,16 @@ function showHistory(){
       });
     }
 
-    let request = gapi.client.youtube.videos.list({
+    youtubeAPI('videos', {
       part: 'snippet',
       id: videoList,
       maxResults: 50,
-    });
-
-    request.execute((response) => {
+    }, function (data) {
       createVideoListContainer('Watch History:');
-      response['items'].forEach((video) => {
+      data['items'].forEach((video) => {
         displayVideos(video, 'history');
       });
-      toggleLoading();
+      stopLoadingAnimation()
     });
   });
 }
diff --git a/src/js/init.js b/src/js/init.js
index 3e35f6218..c549a9a05 100644
--- a/src/js/init.js
+++ b/src/js/init.js
@@ -20,7 +20,7 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
 /*
 * File used to initializing the application
 */
-const {app, BrowserWindow} = require('electron');
+const {app, BrowserWindow, dialog} = require('electron');
 const path = require('path');
 const url = require('url');
 let win;
diff --git a/src/js/layout.js b/src/js/layout.js
index 7aa3058f5..cf9ed7eac 100644
--- a/src/js/layout.js
+++ b/src/js/layout.js
@@ -115,23 +115,6 @@ $(document).ready(() => {
   loadSubscriptions();
 });
 
-/**
-* Start the YouTube API.
-*
-* @return {Void}
-*/
-function start() {
-  // Initializes the client with the API key and the Translate API.
-  gapi.client.init({
-    'apiKey': apiKey,
-  })
-
-  gapi.client.load('youtube', 'v3', () => {
-    let isLoad = true;
-  });
-}
-
-
 /**
 * Toggle the ability to view the side navigation bar.
 *
@@ -161,28 +144,27 @@ function clearMainContainer() {
   hideConfirmFunction();
 }
 
-/**
-* Show the loading animation before / after a function runs.  Also disables / enables input
-*
-* @return {Void}
-*/
-function toggleLoading() {
+function startLoadingAnimation() {
   const loading = document.getElementById('loading');
   const sideNavDisabled = document.getElementById('sideNavDisabled');
   const searchBar = document.getElementById('search');
   const goToVideoInput = document.getElementById('jumpToInput');
 
-  if (loading.style.display === 'none' || loading.style.display === '') {
     loading.style.display = 'inherit';
     sideNavDisabled.style.display = 'inherit';
     searchBar.disabled = true;
     goToVideoInput.disabled = true;
-  } else {
+}
+function stopLoadingAnimation() {
+  const loading = document.getElementById('loading');
+  const sideNavDisabled = document.getElementById('sideNavDisabled');
+  const searchBar = document.getElementById('search');
+  const goToVideoInput = document.getElementById('jumpToInput');
+
     loading.style.display = 'none';
     sideNavDisabled.style.display = 'none';
     searchBar.disabled = false;
     goToVideoInput.disabled = false;
-  }
 }
 
 /**
@@ -214,7 +196,7 @@ function createVideoListContainer(headerLabel = '') {
 function showAbout(){
   // Remove current information and display loading animation
   clearMainContainer();
-  toggleLoading();
+  startLoadingAnimation();
 
   // Grab about.html to be used as a template
   $.get('templates/about.html', (template) => {
@@ -224,7 +206,7 @@ function showAbout(){
     });
     // Render to #main and remove loading animation
     $('#main').html(rendered);
-    toggleLoading();
+    stopLoadingAnimation();
   });
 }
 
diff --git a/src/js/savedVideos.js b/src/js/savedVideos.js
index 0b491a403..d99c5c496 100644
--- a/src/js/savedVideos.js
+++ b/src/js/savedVideos.js
@@ -113,7 +113,7 @@ function videoIsSaved(videoId) {
 */
 function showSavedVideos(){
   clearMainContainer();
-  toggleLoading();
+  startLoadingAnimation();
   console.log('checking saved videos');
 
   let videoList = '';
@@ -136,20 +136,17 @@ function showSavedVideos(){
     }
 
     // Call the YouTube API
-    let request = gapi.client.youtube.videos.list({
+    youtubeAPI('videos', {
       part: 'snippet',
       id: videoList,
       maxResults: 50,
-    });
-
-    // Execute the API request
-    request.execute((response) => {
+    }, function (data) {
       // Render the videos to the screen
       createVideoListContainer('Saved Videos:');
-      response['items'].forEach((video) => {
+      data['items'].forEach((video) => {
         displayVideos(video, 'history');
       });
-      toggleLoading();
+      stopLoadingAnimation();
     });
   });
 }
diff --git a/src/js/settings.js b/src/js/settings.js
index da89966b2..17dbaa098 100644
--- a/src/js/settings.js
+++ b/src/js/settings.js
@@ -21,6 +21,9 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
  * A file for functions used for settings.
  */
 
+// To any third party devs that fork the project, please be ethical and change the API keys.
+const apiKeyBank = ['AIzaSyC9E579nh_qqxg6BH4xIce3k_7a9mT4uQc', 'AIzaSyCKplYT6hZIlm2O9FbWTi1G7rkpsLNTq78', 'AIzaSyAE5xzh5GcA_tEDhXmMFd1pEzrL-W7z51E', 'AIzaSyDoFzqwuO9l386eF6BmNkVapjiTJ93CBy4', 'AIzaSyBljfZFPioB0TRJAj-0LS4tlIKl2iucyY4'];
+
 /**
  * Display the settings screen to the user.
  *
@@ -28,14 +31,11 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
  */
 function showSettings() {
   clearMainContainer();
-  toggleLoading();
+  startLoadingAnimation();
 
   let isChecked = '';
   let key = '';
 
-  // To any third party devs that fork the project, please be ethical and change the API keys.
-  const apiKeyBank = ['AIzaSyC9E579nh_qqxg6BH4xIce3k_7a9mT4uQc', 'AIzaSyCKplYT6hZIlm2O9FbWTi1G7rkpsLNTq78', 'AIzaSyAE5xzh5GcA_tEDhXmMFd1pEzrL-W7z51E', 'AIzaSyDoFzqwuO9l386eF6BmNkVapjiTJ93CBy4', 'AIzaSyBljfZFPioB0TRJAj-0LS4tlIKl2iucyY4'];
-
   /*
    * Check the settings database for the user's current settings.  This is so the
    * settings page has the correct toggles related when it is rendered.
@@ -64,7 +64,7 @@ function showSettings() {
       });
       // Render template to application
       $('#main').html(rendered);
-      toggleLoading();
+      stopLoadingAnimation();
 
       // Check / uncheck the switch depending on the user's settings.
       if (currentTheme === 'light') {
@@ -82,8 +82,6 @@ function showSettings() {
  * @return {Void}
  */
 function checkDefaultSettings() {
-  // To any third party devs that fork the project, please be ethical and change the API keys.
-  const apiKeyBank = ['AIzaSyC9E579nh_qqxg6BH4xIce3k_7a9mT4uQc', 'AIzaSyCKplYT6hZIlm2O9FbWTi1G7rkpsLNTq78', 'AIzaSyAE5xzh5GcA_tEDhXmMFd1pEzrL-W7z51E', 'AIzaSyDoFzqwuO9l386eF6BmNkVapjiTJ93CBy4', 'AIzaSyBljfZFPioB0TRJAj-0LS4tlIKl2iucyY4'];
 
   // Grab a random API Key.
   apiKey = apiKeyBank[Math.floor(Math.random() * apiKeyBank.length)];
@@ -126,9 +124,6 @@ function checkDefaultSettings() {
         }
       });
     }
-
-    // Loads the JavaScript client library and invokes `start` afterwards.
-    gapi.load('client', start);
   });
 }
 
diff --git a/src/js/subscriptions.js b/src/js/subscriptions.js
index a164c4fc0..30ccc51f3 100644
--- a/src/js/subscriptions.js
+++ b/src/js/subscriptions.js
@@ -31,25 +31,22 @@ along with FreeTube.  If not, see <http://www.gnu.org/licenses/>.
 function addSubscription(channelId, useToast = true) {
   console.log(channelId);
   // Request YouTube API
-  let request = gapi.client.youtube.channels.list({
+  youtubeAPI('channels', {
     part: 'snippet',
     id: channelId,
-  });
-
-  // Execute API request
-  request.execute((response) => {
-    const channelInfo = response['items'][0]['snippet'];
+  }, function (data){
+    const channelInfo = data['items'][0]['snippet'];
     const channelName = channelInfo['title'];
     const thumbnail = channelInfo['thumbnails']['high']['url'];
 
-    const data = {
+    const channel = {
       channelId: channelId,
       channelName: channelName,
       channelThumbnail: thumbnail,
     };
 
     // Refresh the list of subscriptions on the side navigation bar.
-    subDb.insert(data, (err, newDoc) => {
+    subDb.insert(channel, (err, newDoc) => {
       if (useToast){
         showToast('Added ' + channelName + ' to subscriptions.');
         displaySubs();
@@ -84,13 +81,7 @@ function loadSubscriptions() {
   clearMainContainer();
   const loading = document.getElementById('loading');
 
-  /*
-  * It is possible for the function to be called several times. This prevents the loading
-  * from being turned off when the situation occurs.
-  */
-  if (loading.style.display !== 'inherit'){
-    toggleLoading();
-  }
+  startLoadingAnimation()
 
   let videoList = [];
 
@@ -117,28 +108,17 @@ function loadSubscriptions() {
         * Grab the channels 15 most recent uploads.  Typically this should be enough.
         * This number can be changed if we feel necessary.
         */
-        try {
-          let request = gapi.client.youtube.search.list({
-            part: 'snippet', // Try getting content details for video duration in the near future.
-            channelId: channelId,
-            type: 'video',
-            maxResults: 15,
-            order: 'date',
-          });
-
-          request.execute((response) => {
-            videoList = videoList.concat(response['items']);
-            // Iterate through the next object in the loop.
-            next();
-          });
-        } catch (err) {
-          /*
-          * The above API requests sometimes forces an error for some reason. Restart
-          * the function to prevent this.  This should be changed if possible.
-          */
-          loadSubscriptions();
-          return;
-        }
+        youtubeAPI('search', {
+          part: 'snippet', // Try getting content details for video duration in the near future.
+          channelId: channelId,
+          type: 'video',
+          maxResults: 15,
+          order: 'date',
+        }, function (data){
+          videoList = videoList.concat(data['items']);
+          // Iterate through the next object in the loop.
+          next();
+        });
       }, (err) => {
         // Sort the videos by date
         videoList.sort((a, b) => {
@@ -165,12 +145,12 @@ function loadSubscriptions() {
             displayVideos(videoList[i]);
           }
         }
-        toggleLoading();
+        stopLoadingAnimation()
       });
     } else {
       // User has no subscriptions. Display message.
       const container = document.getElementById('main');
-      toggleLoading();
+      stopLoadingAnimation()
 
       container.innerHTML = `<h2 class="message">Your Subscription list is currently empty.  Start adding subscriptions
                              to see them here.<br /><br /><i class="far fa-frown" style="font-size: 200px"></i></h2>`;
diff --git a/src/js/videos.js b/src/js/videos.js
index 042ef98b5..50b881610 100644
--- a/src/js/videos.js
+++ b/src/js/videos.js
@@ -39,31 +39,27 @@ function search(nextPageToken = '') {
 
   if (nextPageToken === '') {
     clearMainContainer();
-    toggleLoading();
+    startLoadingAnimation();
   } else {
     console.log(nextPageToken);
     showToast('Fetching results.  Please wait...');
   }
 
   // Start API request
-  let request = gapi.client.youtube.search.list({
+  youtubeAPI('search', {
     q: query,
     part: 'id, snippet',
     type: 'video',
     pageToken: nextPageToken,
     maxResults: 25,
-  });
-
-  // Execute API Request
-  request.execute((response) => {
-    console.log(response);
+  }, function (data){
     if (nextPageToken === '') {
       createVideoListContainer('Search Results:');
-      toggleLoading();
+      stopLoadingAnimation();
     }
-    response['items'].forEach(displayVideos);
-    addNextPage(response['result']['nextPageToken']);
-  });
+    data.items.forEach(displayVideos);
+    addNextPage(data.result.nextPageToken);
+  })
 }
 
 /**
@@ -162,7 +158,7 @@ function addNextPage(nextPageToken) {
 */
 function playVideo(videoId) {
   clearMainContainer();
-  toggleLoading();
+  startLoadingAnimation();
 
   let subscribeText = '';
   let savedText = '';
@@ -191,7 +187,7 @@ function playVideo(videoId) {
     });
   } catch (ex) {
     showToast('Video not found. ID may be invalid.');
-    toggleLoading();
+    stopLoadingAnimation();
     return;
   }
 
@@ -282,15 +278,11 @@ function playVideo(videoId) {
     }
 
     // API Request
-    let request = gapi.client.youtube.channels.list({
+    youtubeAPI('channels', {
       'id': channelId,
       'part': 'snippet'
-    });
-
-    // Execute request
-    request.execute((response) => {
-      console.log(response);
-      const channelThumbnail = response['items'][0]['snippet']['thumbnails']['high']['url'];
+    }, function (data){
+      const channelThumbnail = data['items'][0]['snippet']['thumbnails']['high']['url'];
 
       $.get('templates/player.html', (template) => {
         mustache.parse(template);
@@ -318,7 +310,7 @@ function playVideo(videoId) {
           embedPlayer: embedPlayer,
         });
         $('#main').html(rendered);
-        toggleLoading();
+        stopLoadingAnimation();
         showVideoRecommendations(videoId);
         console.log('done');
       });
@@ -340,15 +332,13 @@ function playVideo(videoId) {
 * @param {string} videoId - The video ID of the video to get recommendations from.
 */
 function showVideoRecommendations(videoId) {
-  let request = gapi.client.youtube.search.list({
+  youtubeAPI('search', {
     part: 'snippet',
     type: 'video',
     relatedToVideoId: videoId,
     maxResults: 15,
-  });
-
-  request.execute((response) => {
-    const recommendations = response['items'];
+  }, function (data){
+    const recommendations = data.items;
     recommendations.forEach((data) => {
       const snippet = data['snippet'];
       const videoId = data['id']['videoId'];
@@ -451,7 +441,7 @@ function parseVideoLink() {
 */
 function showMostPopular() {
   clearMainContainer();
-  toggleLoading();
+  startLoadingAnimation();
 
   // Get the date of 2 days ago.
   var d = new Date();
@@ -462,19 +452,16 @@ function showMostPopular() {
   // These are the videos that are considered as 'most popular' and is how similar
   // Applications grab these.  Videos in the 'Trending' tab on YouTube will be different.
   // And there is no way to grab those videos.
-  let request = gapi.client.youtube.search.list({
+  youtubeAPI('search', {
     part: 'snippet',
     order: 'viewCount',
     type: 'video',
     publishedAfter: d.toISOString(),
     maxResults: 50,
-  });
-
-  request.execute((response) => {
-    console.log(response);
+  }, function (data){
     createVideoListContainer('Most Popular:');
-    toggleLoading();
-    response['items'].forEach(displayVideos);
+    stopLoadingAnimation();
+    data['items'].forEach(displayVideos);
   });
 }
 
@@ -503,25 +490,16 @@ function copyLink(website, videoId) {
 function getChannelAndPlayer(videoId) {
   console.log(videoId);
   return new Promise((resolve, reject) => {
-    let data = [];
-
-    let request = gapi.client.youtube.videos.list({
-      part: 'snippet, player',
+    youtubeAPI('videos', {
+      part: 'snippet,player',
       id: videoId,
-    });
-
-    request.execute((response) => {
-      console.log(response);
-      let embedHtml = response['items'][0]['player']['embedHtml'];
+    }, function (data){
+      let embedHtml = data.items[0].player.embedHtml;
       embedHtml = embedHtml.replace('src="', 'src="https:');
       embedHtml = embedHtml.replace('width="480px"', '');
       embedHtml = embedHtml.replace('height="270px"', '');
       embedHtml = embedHtml.replace(/\"/g, '&quot;');
-      data[0] = embedHtml;
-      data[1] = response['items'][0]['snippet']['channelId'];
-
-
-      resolve(data);
+      resolve([embedHtml, data.items[0].snippet.channelId]);
     });
   });
 
diff --git a/src/js/youtubeApi.js b/src/js/youtubeApi.js
new file mode 100644
index 000000000..96c845c01
--- /dev/null
+++ b/src/js/youtubeApi.js
@@ -0,0 +1,22 @@
+/**
+* List a YouTube HTTP API resource.
+*
+* @param {string} resource - The path of the resource.
+* @param {object} params - The API parameters.
+* @param {function} success - The function to be called on success.
+*
+* @return {Void}
+*/
+function youtubeAPI(resource, params, success) {
+  params.key = apiKey;
+  console.log(resource, params, success)
+  $.getJSON(
+    'https://www.googleapis.com/youtube/v3/' + resource,
+    params,
+    success
+  ).fail((xhr, textStatus, error) => {
+    showToast('There was an error calling the YouTube API.');
+    console.log(error);
+    stopLoadingAnimation();
+  });
+}