v4.15.3

6 files changed, 71 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f19175b2bef0..5dcbbd7178ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deezer
 	pkgdesc = A proprietary music streaming service
-	pkgver = 4.15.3
+	pkgver = 4.16.0
 	pkgrel = 1
 	url = https://www.deezer.com/
 	arch = any
@@ -11,18 +11,18 @@ pkgbase = deezer
 	makedepends = imagemagick
 	depends = electron
 	provides = deezer
-	source = deezer-4.15.3-setup.exe::https://www.deezer.com/desktop/download/artifact/win32/x86/4.15.3
+	source = deezer-4.16.0-setup.exe::https://www.deezer.com/desktop/download/artifact/win32/x86/4.16.0
 	source = deezer.desktop
 	source = systray.patch
 	source = nodeIntegration.patch
 	source = urls.patch
 	source = menu-bar.patch
-	md5sums = fce764189fc0e4e9284e0db84929a728
+	md5sums = 5dd856378377ddc944ae99d3ca958016
 	md5sums = bb851102d63a9cb396b42d7a61c5104c
-	md5sums = 4a491cdf76afeffb7680d3abdc3f4b89
-	md5sums = 199ce71cc60dd7feb84ee36a8580639d
-	md5sums = 7ee49aab9514e5a4df00fbd7da982688
-	md5sums = 10058bb31eccb62c706be2d336184a70
+	md5sums = 2a0a5dd017a7a302cf927f01c9fdbe85
+	md5sums = c68c0f0a44afc016da5ac2a692bc48ca
+	md5sums = 0bab4bf4a6802757b84efbb552a7875b
+	md5sums = 2d7b015bfc85fe13174ba434da6bd1c1
 
 pkgname = deezer
 
diff --git a/PKGBUILD b/PKGBUILD
index 494e23d63c04..a21627744283 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Sibren Vasse <arch@sibrenvasse.nl>
 # Contributor: Ilya Gulya <ilyagulya@gmail.com>
 pkgname="deezer"
-pkgver=4.15.3
+pkgver=4.16.0
 pkgrel=1
 pkgdesc="A proprietary music streaming service"
 arch=('any')
@@ -18,12 +18,12 @@ source=(
          urls.patch
          menu-bar.patch
 )
-md5sums=('fce764189fc0e4e9284e0db84929a728'
+md5sums=('5dd856378377ddc944ae99d3ca958016'
          'bb851102d63a9cb396b42d7a61c5104c'
-         '4a491cdf76afeffb7680d3abdc3f4b89'
-         '199ce71cc60dd7feb84ee36a8580639d'
-         '7ee49aab9514e5a4df00fbd7da982688'
-         '10058bb31eccb62c706be2d336184a70')
+         '2a0a5dd017a7a302cf927f01c9fdbe85'
+         'c68c0f0a44afc016da5ac2a692bc48ca'
+         '0bab4bf4a6802757b84efbb552a7875b'
+         '2d7b015bfc85fe13174ba434da6bd1c1')
 
 prepare() {
     # Extract app from installer
@@ -32,7 +32,7 @@ prepare() {
     7z x -y -bsp0 -bso0 app-32.7z
 
     # Extract png from ico container
-    convert resources/build/win/app.ico resources/build/win/deezer.png
+    convert resources/win/app.ico resources/win/deezer.png
 
     cd resources/
     rm -r app || true
@@ -41,12 +41,12 @@ prepare() {
     rm -r app/node_modules/@nodert
 
     cd app
-    prettier --write "app/js/**/*.js"
+    prettier --write "app/*.js"
     # Fix crash on startup since 4.14.1 (patch systray icon path)
     patch -p1 < "$srcdir/systray.patch"
     # Fix electron 5 incompatibility
     patch -p1 < "$srcdir/nodeIntegration.patch"
-    # Fix startup error electron 6.0.1 (https://github.com/electron/electron/pull/19570
+    # Fix startup error electron 6.0.1 (https://github.com/electron/electron/pull/19570)
     patch -p1 < "$srcdir/urls.patch"
     # Disable menu bar
     patch -p1 < "$srcdir/menu-bar.patch"
@@ -65,8 +65,8 @@ package() {
     echo "exec electron /usr/share/deezer/app.asar \"\$@\"" >> deezer
 
     install -Dm644 resources/app.asar "$pkgdir"/usr/share/deezer/
-    install -Dm644 resources/build/win/deezer.png "$pkgdir"/usr/share/icons/hicolor/256x256/apps/
-    install -Dm644 resources/build/win/systray.png "$pkgdir"/usr/share/deezer/
+    install -Dm644 resources/win/deezer.png "$pkgdir"/usr/share/icons/hicolor/256x256/apps/
+    install -Dm644 resources/win/systray.png "$pkgdir"/usr/share/deezer/
     install -Dm644 "$pkgname".desktop "$pkgdir"/usr/share/applications/
     install -Dm755 deezer "$pkgdir"/usr/bin/
 }
diff --git a/menu-bar.patch b/menu-bar.patch
index 0685b80bddf0..e008ddc8f7d1 100644
--- a/menu-bar.patch
+++ b/menu-bar.patch
@@ -1,12 +1,10 @@
-diff --git a/app/js/main/App/index.js b/app/js/main/App/index.js
-index 94631c5..3d69857 100644
---- a/app/js/main/App/index.js
-+++ b/app/js/main/App/index.js
-@@ -274,6 +274,7 @@ var App = (function() {
-               this._adjustViewToContentSize(),
-               this.mainView.setAutoResize({ width: !0, height: !0 })),
-             (this.originalUserAgent = this.getWebContents().getUserAgent()),
-+            this.window.setMenuBarVisibility(false),
-             this.getWebContents().setUserAgent(
-               "Deezer/" +
-                 this.app.getVersion() +
+--- a/app/main.js	2019-08-30 19:55:24.091850904 +0200
++++ b/app/main.js	2019-08-30 19:57:32.550487630 +0200
+@@ -2589,6 +2589,7 @@
+             this._adjustViewToContentSize(),
+             this.mainView.setAutoResize({ width: !0, height: !0 })),
+           (this.originalUserAgent = this.getWebContents().getUserAgent()),
++          this.window.setMenuBarVisibility(false),
+           this.getWebContents().setUserAgent(this.getUserAgent()),
+           Object(utils.h)(platform.a)
+             ? this.getWindow().on("moved", () => {
diff --git a/nodeIntegration.patch b/nodeIntegration.patch
index ef8cfe031069..931765a2eaa8 100644
--- a/nodeIntegration.patch
+++ b/nodeIntegration.patch
@@ -1,21 +1,19 @@
-diff --git a/app/js/main/App/index.js b/app/js/main/App/index.js
-index 94631c5..e00498f 100644
---- a/app/js/main/App/index.js
-+++ b/app/js/main/App/index.js
-@@ -257,6 +257,7 @@ var App = (function() {
-               show: !0,
-               frame: !this.isFrameless,
-               webPreferences: {
-+                nodeIntegration: true,
-                 devTools: _Utils2.default.hasDevTools(),
-                 preload: _path2.default.join(
-                   _Utils2.default.getResolvedDirPath(__dirname),
-@@ -424,7 +425,7 @@ var App = (function() {
-                 (a.oauthWindow = new _electron.BrowserWindow({
-                   parent: a.getWindow(),
+--- a/app/main.js	2019-08-30 19:55:24.091850904 +0200
++++ b/app/main.js	2019-08-30 19:55:47.168907076 +0200
+@@ -2570,6 +2570,7 @@
+           show: !1,
+           frame: !this.isFrameless,
+           webPreferences: {
++            nodeIntegration: true,
+             devTools: Object(utils.f)(),
+             preload: external_path_default.a.resolve(
+               Object(utils.d)(__dirname),
+@@ -2730,7 +2731,7 @@
+                 (this.oauthWindow = new external_electron_.BrowserWindow({
+                   parent: this.getWindow(),
                    show: !1,
 -                  webPreferences: { nodeIntegration: !1 }
 +                  webPreferences: { nodeIntegration: true }
                  }));
-               var n = function() {
-                 a.oauthWindow.loadURL(
+               const openFbLoginWindow = () => {
+                 this.oauthWindow.loadURL(
diff --git a/systray.patch b/systray.patch
index c3da7ffb8923..807d8aad290c 100644
--- a/systray.patch
+++ b/systray.patch
@@ -1,13 +1,10 @@
-diff --git a/app/js/main/Utils/index.js b/app/js/main/Utils/index.js
-index 1d4664c..0ff1f4f 100644
---- a/app/js/main/Utils/index.js
-+++ b/app/js/main/Utils/index.js
-@@ -184,7 +184,7 @@ var platformVersion =
-                 e = "build/mac/trayTemplate.png";
-                 break;
-               case this.isLinux():
--                e = "build/linux/systray.png";
-+                e = "../../../share/deezer/systray.png";
-             }
-             return _path2.default.join(process.resourcesPath, e);
-           }
+--- a/app/main.js	2019-08-30 19:55:24.091850904 +0200
++++ b/app/main.js	2019-08-30 19:59:10.241735036 +0200
+@@ -82,6 +82,7 @@
+       external_path_default = __webpack_require__.n(external_path_),
+       constants_platform = __webpack_require__(4);
+     function getAppIcon() {
++      return "/usr/share/deezer/systray.png";
+       let appIcon = "";
+       switch (getPlatformName()) {
+         case constants_platform.d:
diff --git a/urls.patch b/urls.patch
index 17bf85ff2dfd..2dff0a404050 100644
--- a/urls.patch
+++ b/urls.patch
@@ -1,22 +1,20 @@
-diff --git a/app/js/main/App/index.js b/app/js/main/App/index.js
-index 94631c5..02afd59 100644
---- a/app/js/main/App/index.js
-+++ b/app/js/main/App/index.js
-@@ -124,7 +124,7 @@ var App = (function() {
-             _electron.app.on("ready", function() {
-               _electronLog2.default.debug("App is ready"),
-                 _AutoUpdater2.default.init();
--              var e = { urls: ["*." + r.tld] };
-+              var e = { urls: ["*://*/*"] };
-               _CookieManager2.default.init(_electron.session.defaultSession),
-                 _electron.session.defaultSession.webRequest.onBeforeSendHeaders(
-                   e,
-@@ -140,7 +140,7 @@ var App = (function() {
-                   }
-                 );
-               _electron.session.defaultSession.webRequest.onBeforeRequest(
+--- a/app/main.js	2019-08-30 19:55:24.091850904 +0200
++++ b/app/main.js	2019-08-30 20:00:25.395929199 +0200
+@@ -2439,7 +2439,7 @@
+           external_electron_.app.on("ready", () => {
+             external_electron_log_default.a.debug("App is ready"),
+               main_AutoUpdater.init();
+-            const dzrFilter = { urls: [`*.${this.tld}`] };
++            const dzrFilter = { urls: [`*://*.${this.tld}/*`] };
+             main_CookieManager.init(external_electron_.session.defaultSession),
+               external_electron_.session.defaultSession.webRequest.onBeforeSendHeaders(
+                 dzrFilter,
+@@ -2458,7 +2458,7 @@
+                 }
+               ),
+               external_electron_.session.defaultSession.webRequest.onBeforeRequest(
 -                { urls: ["*.*"] },
 +                { urls: ["*://*/*"] },
-                 function(e, t) {
-                   if (-1 === e.url.indexOf("blob:file"))
-                     if (-1 !== e.url.indexOf("file:")) {
+                 (details, callback) => {
+                   if (-1 !== details.url.indexOf("blob:file"))
+                     return void callback({ cancel: !1 });