From 342faddd0023d73413f85a8706930393aea66830 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Mon, 26 Sep 2016 22:00:10 +0100
Subject: [PATCH] Autolink spotify links with the Spotify Play button

---
 gulpfile.js                        |  12 +++++-------
 package.json                       |   1 -
 public/assets/js/links.js          |   2 +-
 public/assets/js/links.js.br       | Bin 294 -> 401 bytes
 public/assets/js/links.js.gz       | Bin 372 -> 492 bytes
 public/assets/js/maps/links.js.map |   2 +-
 resources/assets/js/links.js       |  27 ++++++++++++++++++++-------
 7 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 484de8d6..b4517563 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -21,13 +21,11 @@ gulp.task('sass', function () {
 gulp.task('js-assets', function () {
     //return gulp.src(['resources/assets/js/**/*'])
     //    .pipe(gulp.dest('./public/assets/js'));
-    pump([
-        gulp.src(['resources/assets/js/**/*']),
-        sourcemaps.init(),
-        uglify(),
-        sourcemaps.write('./maps'),
-        gulp.dest('./public/assets/js')
-    ]);
+    return gulp.src(['resources/assets/js/**/*'])
+        .pipe(sourcemaps.init())
+        .pipe(uglify())
+        .pipe(sourcemaps.write('./maps'))
+        .pipe(gulp.dest('./public/assets/js'));
 });
 
 gulp.task('bower', function () {
diff --git a/package.json b/package.json
index 31ba3f44..e06d86b4 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,6 @@
     "gulp-zopfli": "^1.0.0",
     "lint-staged": "^1.0.1",
     "pre-commit": "^1.1.3",
-    "pump": "^1.0.1",
     "stylelint": "^6.6.0",
     "stylelint-config-standard": "^9.0.0"
   },
diff --git a/public/assets/js/links.js b/public/assets/js/links.js
index 1b49fbaf..84468c6d 100644
--- a/public/assets/js/links.js
+++ b/public/assets/js/links.js
@@ -1,2 +1,2 @@
-for(var autolinker=new Autolinker,ytidregex=/watch\?v=([A-Za-z0-9\-_]+)/,notes=document.querySelectorAll(".e-content"),i=0;i<notes.length;i++){var ytid=notes[i].textContent.match(ytidregex);if(null!==ytid){var id=ytid[1],iframe=document.createElement("iframe");iframe.classList.add("youtube"),iframe.setAttribute("src","//www.youtube.com/embed/"+id),iframe.setAttribute("frameborder",0),iframe.setAttribute("allowfullscreen","true"),notes[i].appendChild(iframe)}var orig=notes[i].innerHTML,linked=autolinker.link(orig);notes[i].innerHTML=linked}
+for(var autolinker=new Autolinker,ytidregex=/watch\?v=([A-Za-z0-9\-_]+)/,spotifyregex=/https\:\/\/play\.spotify\.com\/(.*)\b/,notes=document.querySelectorAll(".e-content"),i=0;i<notes.length;i++){var ytid=notes[i].textContent.match(ytidregex);if(null!==ytid){var yid=ytid[1],yiframe=document.createElement("iframe");yiframe.classList.add("youtube"),yiframe.setAttribute("src","//www.youtube.com/embed/"+yid),yiframe.setAttribute("frameborder",0),yiframe.setAttribute("allowfullscreen","true"),notes[i].appendChild(yiframe)}var spotifyid=notes[i].textContent.match(spotifyregex);if(null!==spotifyid){var sid=spotifyid[1].replace("/",":"),siframe=document.createElement("iframe");siframe.classList.add("spotify"),siframe.setAttribute("src","https://embed.spotify.com/?uri=spotify:"+sid),siframe.setAttribute("frameborder",0),siframe.setAttribute("allowtransparency","true"),notes[i].appendChild(siframe)}var orig=notes[i].innerHTML,linked=autolinker.link(orig);notes[i].innerHTML=linked}
 //# sourceMappingURL=maps/links.js.map
diff --git a/public/assets/js/links.js.br b/public/assets/js/links.js.br
index b6288fc6e159beba5544301f1f0be59d16f5e055..a2df10b9c95a41e816f4b924acc39627df50ceed 100644
GIT binary patch
literal 401
zcmb1UU}2D9FFSl)^48JmxiUdUPLs~*J};Z*nVh+ke_evk?$yGL|C*MvZAtg;3tPUy
zW8=sF^?9Yz6Pm9bsQo1PvB!NX-|}Fklg`R%NgH==i&__7E8@y`Av{FO-=lHf`Wx2s
z-)`P|YyYF&_e9I1Z;1<^k5B#hAaO&{tH)kP9;UdgxPL6~_p*CGHaByAY-!mceq@3R
z>w0}BXJa`}HxB=<sZLtSwfFYl3AblSzCYcJ_1%rH<(sS6LO<!8Xqb0whr~bjKvwHQ
zXJyWt_Gk9oO4FO5R<v7bxwwyW&FXS}{**~<4}_2Rgl!C{e!4~D*uCk?@-{s=sQbdd
z`ChR=2T$CKlP&*F&NGS@@VU2p(XXnW1FK6kPu@#pTJuGULobBI@RkWvrn>d7WW`lh
z4E~CD>bz$@%367nZHF4){lx+b6$VbO)(oP23v~nT{x}tJD56*Jc!Sv4+UsZ6u?w@>
zSMUa$e{K13!e#G#z3;J=Gc~pQ7C)1;))bRq3DxWQ^W@pR`--n@eky-_zH9b18>M3!
N(=t-mtEs<Y003(<zcK&-

literal 294
zcmb34U}BiVzU^$q>oxO_=JfH+G>o1RUGJH;`>F8~mP@X@n^fIbSIzM1%6$~0z&v%u
zqPrVR4=>l8@ULOLmAJ`|Dh=tLGTWmpIX)R;0Z*ou9MZdc^882Pb4z`enfUWxIsWH*
zWv<38`F1^LzWbpnvT3K3_Zj@+FunixOXQNRU#_QXa(bDp`Sh@znWdYBi(P8Uu`~~_
zfGZk2D;9lN@F1kk=-Q$H=1Z&<j@#2`>wUQ5?bXrg?0t=S?MCL@9rFa$JU!?9-L)o=
zbph)U6I*{n-Yx5%>t^w#H%-{~T(#3rJM~eF_%A6b9%qYmMJd5YIZ_#t8A1)0RfJx;
zP5LJ>=hw<JibuBF@dn=KIoW2min%Cq!Wym*|6A4>$4^-BddALp&F*X0mzb=MtacUz
E0Gs26IRF3v

diff --git a/public/assets/js/links.js.gz b/public/assets/js/links.js.gz
index 79134dd6dfcb9c0647bfc830d3e948ffbbc4c23d..2397968a412614316dbb20fe4a1a4fa0ae3b3678 100644
GIT binary patch
literal 492
zcmb2|=3oE;Cg$GB*PEmiMI7#b*FF<=jOkf!bk+O4tF;e>dP>YVFn8Lg_l+Bus_S2g
zJ|~l!C9An3`=iX-uxHFWxY<r!oBDNI^x{c;X#uebs_usJF<N>P%EPPjE8hq2FE@EH
zm)Dx}^{+FFW?egd!ZPU@`*CKogqhF2Ht4Nq54lltfFoDEne(+&_XB+o?N1^+m-;Pt
z{F2NN$ha%I_M}<sybWxJpO#$;75}CFYRk!mQfGLctFOB3Y3KgWqjKTSs^x7W3lC*?
z+styy*z~XKiHmRN$*p$f51njcmTBL7b8oJES+;4ZO)KxTf&+qi86DP}_U^dn=Qph}
zB;(!R+NTqXG*6c07N1cUXb5MN`@pp*c(P1mPPO{B-M4$Drg~1_c#*5QglST4In(L+
zL9;h^mI~b|+x~yK#=5P#%XeP0o6yX8_QKPN>2KT9B_%3z*KJWbEp_txi^QMCfA2mu
zdLcgd^^?}%^-rE@bS&jFI_t`i!uZnS!;k-_Z|n1`B5lKdb-#SJzv7Ho-Akk8hIN|d
zS*;a&?tTp1^I!ktzw?hS7Ctt9cc9~!{Hwp;U#$(^+*_K;v*Y%8`8)5;&IiQZunCY-
z7dkw7a{Oa`ok#og47XkWWLC~3*D~+anK+xh^@>ktrW+o*{C!^A-D~ED>zC&;vM?|J
E0MDlQDgXcg

literal 372
zcmb2|=3oE;Cg#$>(B?Y|0(JZ2H`=PQ-QK=y_wMgeOp|qV8{ZntS@Y+6+Y&wf7wN{A
zD^l2n)Qu)>KUT|T^Zr3W(a+;sZPXSEMp;<t^Qo@9xx1VF`OVv>uS!SiF1z}&{A&Am
zS2eHaoQEpkhQ2u<_+N;ze|{6ItDJuHX*0`^Q`WES%{O0~Gk>1xb2h&1529wxHFce+
z8$2bYqV7jk_PydJ<y}^vDyILr+3#>O^0I;WTHC^ZHB~Y%Z7pN(&8vx@#g@u$@2tt<
zS#Z~B*T%CStBp@CVGa*#D>%>cC@6bd<s0RrQbD&q+B3weIR(2jZIcYhoi^J^Mo#Wi
ze!#jK^#!XPyU!ka@n4{Q`>n-ncXXEjXY|ben|S%Um<ZF3dz}W$bnK;+pBESWdUYn^
ztXpT!+*jW-Zq0vde2(#6RoVYI%bwu*|1C4-nN53e^XC4K&)xr2Id`n}{2(ZL=e=%k
f_I&%D<@+XoRuEG9;NSRtd++)koH;8znHU%Vv7xg3

diff --git a/public/assets/js/maps/links.js.map b/public/assets/js/maps/links.js.map
index a916918f..7c55b6a0 100644
--- a/public/assets/js/maps/links.js.map
+++ b/public/assets/js/maps/links.js.map
@@ -1 +1 @@
-{"version":3,"sources":["links.js"],"names":["autolinker","Autolinker","ytidregex","notes","document","querySelectorAll","i","length","ytid","textContent","match","id","iframe","createElement","classList","add","setAttribute","appendChild","orig","innerHTML","linked","link"],"mappings":"AASA,IAAK,GAPDA,YAAa,GAAIC,YAGjBC,UAAY,6BAGZC,MAAQC,SAASC,iBAAiB,cAC7BC,EAAI,EAAGA,EAAIH,MAAMI,OAAQD,IAAK,CAEnC,GAAIE,MAAOL,MAAMG,GAAGG,YAAYC,MAAMR,UACtC,IAAa,OAATM,KAAe,CACf,GAAIG,IAAKH,KAAK,GACVI,OAASR,SAASS,cAAc,SACpCD,QAAOE,UAAUC,IAAI,WACrBH,OAAOI,aAAa,MAAO,2BAA6BL,IACxDC,OAAOI,aAAa,cAAe,GACnCJ,OAAOI,aAAa,kBAAmB,QACvCb,MAAMG,GAAGW,YAAYL,QAGzB,GAAIM,MAAOf,MAAMG,GAAGa,UAChBC,OAASpB,WAAWqB,KAAKH,KAC7Bf,OAAMG,GAAGa,UAAYC","file":"links.js","sourcesContent":["/* global Autolinker */\n//the autlinker object\nvar autolinker = new Autolinker();\n\n//the youtube regex\nvar ytidregex = /watch\\?v=([A-Za-z0-9\\-_]+)/;\n\n//grab the notes and loop through them\nvar notes = document.querySelectorAll('.e-content');\nfor (var i = 0; i < notes.length; i++) {\n    //get Youtube ID\n    var ytid = notes[i].textContent.match(ytidregex);\n    if (ytid !== null) {\n        var id = ytid[1];\n        var iframe = document.createElement('iframe');\n        iframe.classList.add('youtube');\n        iframe.setAttribute('src', '//www.youtube.com/embed/' + id);\n        iframe.setAttribute('frameborder', 0);\n        iframe.setAttribute('allowfullscreen', 'true');\n        notes[i].appendChild(iframe);\n    }\n    //now linkify everything\n    var orig = notes[i].innerHTML;\n    var linked = autolinker.link(orig);\n    notes[i].innerHTML = linked;\n}\n"],"sourceRoot":"/source/"}
\ No newline at end of file
+{"version":3,"sources":["links.js"],"names":["autolinker","Autolinker","ytidregex","spotifyregex","notes","document","querySelectorAll","i","length","ytid","textContent","match","yid","yiframe","createElement","classList","add","setAttribute","appendChild","spotifyid","sid","replace","siframe","orig","innerHTML","linked","link"],"mappings":"AAWA,IAAK,GATDA,YAAa,GAAIC,YAGjBC,UAAY,6BAEZC,aAAe,wCAGfC,MAAQC,SAASC,iBAAiB,cAC7BC,EAAI,EAAGA,EAAIH,MAAMI,OAAQD,IAAK,CAEnC,GAAIE,MAAOL,MAAMG,GAAGG,YAAYC,MAAMT,UACtC,IAAa,OAATO,KAAe,CACf,GAAIG,KAAMH,KAAK,GACXI,QAAUR,SAASS,cAAc,SACrCD,SAAQE,UAAUC,IAAI,WACtBH,QAAQI,aAAa,MAAO,2BAA6BL,KACzDC,QAAQI,aAAa,cAAe,GACpCJ,QAAQI,aAAa,kBAAmB,QACxCb,MAAMG,GAAGW,YAAYL,SAGzB,GAAIM,WAAYf,MAAMG,GAAGG,YAAYC,MAAMR,aAC3C,IAAkB,OAAdgB,UAAoB,CACpB,GAAIC,KAAMD,UAAU,GAAGE,QAAQ,IAAK,KAChCC,QAAUjB,SAASS,cAAc,SACrCQ,SAAQP,UAAUC,IAAI,WACtBM,QAAQL,aAAa,MAAO,0CAA4CG,KACxEE,QAAQL,aAAa,cAAe,GACpCK,QAAQL,aAAa,oBAAqB,QAC1Cb,MAAMG,GAAGW,YAAYI,SAGzB,GAAIC,MAAOnB,MAAMG,GAAGiB,UAChBC,OAASzB,WAAW0B,KAAKH,KAC7BnB,OAAMG,GAAGiB,UAAYC","file":"links.js","sourcesContent":["/* global Autolinker */\n//the autlinker object\nvar autolinker = new Autolinker();\n\n//the youtube regex\nvar ytidregex = /watch\\?v=([A-Za-z0-9\\-_]+)/;\n\nvar spotifyregex = /https\\:\\/\\/play\\.spotify\\.com\\/(.*)\\b/;\n\n//grab the notes and loop through them\nvar notes = document.querySelectorAll('.e-content');\nfor (var i = 0; i < notes.length; i++) {\n    //get Youtube ID\n    var ytid = notes[i].textContent.match(ytidregex);\n    if (ytid !== null) {\n        var yid = ytid[1];\n        var yiframe = document.createElement('iframe');\n        yiframe.classList.add('youtube');\n        yiframe.setAttribute('src', '//www.youtube.com/embed/' + yid);\n        yiframe.setAttribute('frameborder', 0);\n        yiframe.setAttribute('allowfullscreen', 'true');\n        notes[i].appendChild(yiframe);\n    }\n    //get Spotify ID\n    var spotifyid = notes[i].textContent.match(spotifyregex);\n    if (spotifyid !== null) {\n        var sid = spotifyid[1].replace('/', ':');\n        var siframe = document.createElement('iframe');\n        siframe.classList.add('spotify');\n        siframe.setAttribute('src', 'https://embed.spotify.com/?uri=spotify:' + sid);\n        siframe.setAttribute('frameborder', 0);\n        siframe.setAttribute('allowtransparency', 'true');\n        notes[i].appendChild(siframe);\n    }\n    //now linkify everything\n    var orig = notes[i].innerHTML;\n    var linked = autolinker.link(orig);\n    notes[i].innerHTML = linked;\n}\n"],"sourceRoot":"/source/"}
\ No newline at end of file
diff --git a/resources/assets/js/links.js b/resources/assets/js/links.js
index 5871e0e3..26403569 100644
--- a/resources/assets/js/links.js
+++ b/resources/assets/js/links.js
@@ -5,19 +5,32 @@ var autolinker = new Autolinker();
 //the youtube regex
 var ytidregex = /watch\?v=([A-Za-z0-9\-_]+)/;
 
+var spotifyregex = /https\:\/\/play\.spotify\.com\/(.*)\b/;
+
 //grab the notes and loop through them
 var notes = document.querySelectorAll('.e-content');
 for (var i = 0; i < notes.length; i++) {
     //get Youtube ID
     var ytid = notes[i].textContent.match(ytidregex);
     if (ytid !== null) {
-        var id = ytid[1];
-        var iframe = document.createElement('iframe');
-        iframe.classList.add('youtube');
-        iframe.setAttribute('src', '//www.youtube.com/embed/' + id);
-        iframe.setAttribute('frameborder', 0);
-        iframe.setAttribute('allowfullscreen', 'true');
-        notes[i].appendChild(iframe);
+        var yid = ytid[1];
+        var yiframe = document.createElement('iframe');
+        yiframe.classList.add('youtube');
+        yiframe.setAttribute('src', '//www.youtube.com/embed/' + yid);
+        yiframe.setAttribute('frameborder', 0);
+        yiframe.setAttribute('allowfullscreen', 'true');
+        notes[i].appendChild(yiframe);
+    }
+    //get Spotify ID
+    var spotifyid = notes[i].textContent.match(spotifyregex);
+    if (spotifyid !== null) {
+        var sid = spotifyid[1].replace('/', ':');
+        var siframe = document.createElement('iframe');
+        siframe.classList.add('spotify');
+        siframe.setAttribute('src', 'https://embed.spotify.com/?uri=spotify:' + sid);
+        siframe.setAttribute('frameborder', 0);
+        siframe.setAttribute('allowtransparency', 'true');
+        notes[i].appendChild(siframe);
     }
     //now linkify everything
     var orig = notes[i].innerHTML;