v4.18.0

6 files changed, 95 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d8365da3e21..f9c57a6b4f4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deezer
 	pkgdesc = A proprietary music streaming service
-	pkgver = 4.17.21
+	pkgver = 4.18.0
 	pkgrel = 1
 	url = https://www.deezer.com/
 	arch = any
@@ -9,22 +9,21 @@ pkgbase = deezer
 	makedepends = asar
 	makedepends = prettier
 	makedepends = imagemagick
+	makedepends = npm
 	depends = electron6
 	provides = deezer
-	source = deezer-4.17.21-setup.exe::https://www.deezer.com/desktop/download/artifact/win32/x86/4.17.21
+	source = deezer-4.18.0-setup.exe::https://www.deezer.com/desktop/download/artifact/win32/x86/4.18.0
 	source = deezer.desktop
 	source = systray.patch
 	source = menu-bar.patch
-	source = oauth.patch
+	source = nav-buttons.patch
 	source = 0001-MPRIS-interface.patch
-	source = https://github.com/SibrenVasse/deezer/raw/mpris/node_modules.tar.xz
-	sha256sums = 433fe36ee19c4b13eb715bd740a6ae325199b00da15c4ea376b03944cb57b0fe
+	sha256sums = 6af0d33489a82399a814928daa96cece5eaf4b3276b7ede2bf88c1c78a3b160d
 	sha256sums = f8a5279239b56082a5c85487b0c261fb332623f27dac3ec8093458b8c55d8d99
 	sha256sums = f7df7ba3dd91d8d327c3bfe69c65d3969b3f7a80ca253c29bad316e09f65ab8b
-	sha256sums = 9c1a1c809f813646f14355af03670f6c10a5ad47c606b0ef45e1b66b6aa559b5
-	sha256sums = 5cbe1696d5f948cdda1fdd5ef9f8d94d5e14d8594558e35472517fa659057add
-	sha256sums = 7cd2ba25d61bbd86d49ca99be96366e72fc6e6a57d50bdbeacf1a6a5535c3e76
-	sha256sums = 8a8a42fd38c6fc5a5f9523620ce7e794355ceec5d71c93a7cee378c9a5b3d8ec
+	sha256sums = 8a22f666e308663cb6addabe7695b1e5e3bfa07f68cc7b479e51426dee1c36b0
+	sha256sums = 4b9279549a4ea005e5a852b7ecad8749d0c60be51a87105db364afbcdcd0bcfd
+	sha256sums = e82cd8d8da62bed9cd154b5b58477f205ea90ad91353b466679414adc2736414
 
 pkgname = deezer
 
diff --git a/0001-MPRIS-interface.patch b/0001-MPRIS-interface.patch
index 0330d3409893..4820e4823893 100644
--- a/0001-MPRIS-interface.patch
+++ b/0001-MPRIS-interface.patch
@@ -10,14 +10,14 @@ index 6f97abb..aaf62f5 100644
          if (void 0 !== this.isSupported) return this.isSupported;
          if (Object(utils.h)(constants.n))
            return (this.isSupported = !1), this.isSupported;
-@@ -3998,6 +3999,7 @@ module.exports = (function(modules) {
-               services_SchemeHandler.handleSchemeFromOpenUrl(url),
-               event.preventDefault();
-           }),
+@@ -4428,6 +4428,7 @@ module.exports = (function(modules) {
+             event.preventDefault(),
+             this.deepLink.handlePath(this.deepLink.getPathFromUrl(url));
+         }),
 +          external_electron_.app.commandLine.appendSwitch('disable-features', 'MediaSessionService'),
-           external_electron_.app.on("ready", () => {
-             external_electron_log_default.a.debug("App is ready"),
-               this.applicationMenu.init(),
+           external_electron_.app.on("ready", () =>
+             application_awaiter(this, void 0, void 0, function*() {
+               external_electron_log_default.a.debug("App is ready"),
 diff --git a/node_modules/electron-media-service/src/index.js b/node_modules/electron-media-service/src/index.js
 index 301db0d..9677e7c 100644
 --- a/node_modules/electron-media-service/src/index.js
diff --git a/PKGBUILD b/PKGBUILD
index 81330982d1ae..80e3d11d79aa 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.17.21
+pkgver=4.18.0
 pkgrel=1
 pkgdesc="A proprietary music streaming service"
 arch=('any')
@@ -9,21 +9,19 @@ url="https://www.deezer.com/"
 license=('custom:"Copyright (c) 2006-2018 Deezer S.A."')
 depends=('electron6')
 provides=('deezer')
-makedepends=('p7zip' 'asar' 'prettier' 'imagemagick')
+makedepends=('p7zip' 'asar' 'prettier' 'imagemagick' 'npm')
 source=("$pkgname-$pkgver-setup.exe::https://www.deezer.com/desktop/download/artifact/win32/x86/$pkgver"
         "$pkgname.desktop"
         systray.patch
         menu-bar.patch
-        oauth.patch
-        0001-MPRIS-interface.patch
-        https://github.com/SibrenVasse/deezer/raw/mpris/node_modules.tar.xz)
-sha256sums=('433fe36ee19c4b13eb715bd740a6ae325199b00da15c4ea376b03944cb57b0fe'
+        nav-buttons.patch
+        0001-MPRIS-interface.patch)
+sha256sums=('6af0d33489a82399a814928daa96cece5eaf4b3276b7ede2bf88c1c78a3b160d'
             'f8a5279239b56082a5c85487b0c261fb332623f27dac3ec8093458b8c55d8d99'
             'f7df7ba3dd91d8d327c3bfe69c65d3969b3f7a80ca253c29bad316e09f65ab8b'
-            '9c1a1c809f813646f14355af03670f6c10a5ad47c606b0ef45e1b66b6aa559b5'
-            '5cbe1696d5f948cdda1fdd5ef9f8d94d5e14d8594558e35472517fa659057add'
-            '7cd2ba25d61bbd86d49ca99be96366e72fc6e6a57d50bdbeacf1a6a5535c3e76'
-            '8a8a42fd38c6fc5a5f9523620ce7e794355ceec5d71c93a7cee378c9a5b3d8ec')
+            '8a22f666e308663cb6addabe7695b1e5e3bfa07f68cc7b479e51426dee1c36b0'
+            '4b9279549a4ea005e5a852b7ecad8749d0c60be51a87105db364afbcdcd0bcfd'
+            'e82cd8d8da62bed9cd154b5b58477f205ea90ad91353b466679414adc2736414')
 
 prepare() {
     # Extract app from installer
@@ -35,24 +33,36 @@ prepare() {
     convert resources/win/app.ico resources/win/deezer.png
 
     cd resources/
-    rm -r app || true
+    rm -r app "$srcdir/npm_temp" || true
     asar extract app.asar app
+
     # Remove NodeRT from package (-205.72 MiB)
     rm -r app/node_modules/@nodert
 
-    cd app
+    # Install extra node modules for mpris-service
+    mkdir "$srcdir/npm_temp"; cd "$srcdir/npm_temp"
+    npm install  --prefix ./ mpris-service
+
+    for d in node_modules/*; do
+        if [ ! -d "$srcdir/resources/app/node_modules/$(basename $d)" ]
+        then
+            mv "$d" "$srcdir/resources/app/node_modules/"
+        fi
+    done
+
+    cd "$srcdir/resources/app"
 
     prettier --write "build/*.js"
+    prettier --write "build/assets/cache/js/route-naboo*ads*.js"
     # Fix crash on startup since 4.14.1 (patch systray icon path)
     patch -p1 < "$srcdir/systray.patch"
     # Disable menu bar
     patch -p1 < "$srcdir/menu-bar.patch"
-    # Fix oauth login
-    patch -p1 < "$srcdir/oauth.patch"
+    # Fix navbar
+    patch -p1 < "$srcdir/nav-buttons.patch"
 
     # Monkeypatch MPRIS D-Bus interface
     patch -p1 < "$srcdir/0001-MPRIS-interface.patch"
-    tar -xvf "$srcdir/node_modules.tar.xz"
 
     cd ..
     asar pack app app.asar
diff --git a/menu-bar.patch b/menu-bar.patch
index 76b5b8206e69..4cf201b4025c 100644
--- a/menu-bar.patch
+++ b/menu-bar.patch
@@ -1,10 +1,12 @@
---- a/build/main.js	2019-08-30 19:55:24.091850904 +0200
-+++ b/build/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()),
+diff --git a/build/main.js b/build/main.js
+index a229f52..0f1955b 100644
+--- a/build/main.js
++++ b/build/main.js
+@@ -4580,6 +4580,7 @@ module.exports = (function(modules) {
+                 .setAutoResize({ width: !0, height: !0 }))
+             : this.appService.setWindow(this.window, void 0),
+           this.appService.setUserAgent(),
 +          this.window.setMenuBarVisibility(false),
-           this.getWebContents().setUserAgent(this.getUserAgent()),
-           Object(utils.h)(platform.a)
-             ? this.getWindow().on("moved", () => {
+           isPlatform(PLATFORM_DARWIN)
+             ? this.window.on("moved", () => {
+                 this.windowState.save();
diff --git a/nav-buttons.patch b/nav-buttons.patch
new file mode 100644
index 000000000000..cf1c6d37df6b
--- /dev/null
+++ b/nav-buttons.patch
@@ -0,0 +1,44 @@
+diff --git a/build/assets/cache/js/route-naboo-ads.4648c843d81640e9f10b.js b/build/assets/cache/js/route-naboo-ads.4648c843d81640e9f10b.js
+index 05ddb28..6f9dfb6 100644
+--- a/build/assets/cache/js/route-naboo-ads.4648c843d81640e9f10b.js
++++ b/build/assets/cache/js/route-naboo-ads.4648c843d81640e9f10b.js
+@@ -8959,7 +8959,7 @@
+                       "button",
+                       {
+                         className: "sidebar-navbar-arrow",
+-                        disabled: !this.state.canGoBack,
++                        disabled: false,
+                         onClick: () => Nt.b.goBack(),
+                         type: "button"
+                       },
+@@ -8969,7 +8969,7 @@
+                       "button",
+                       {
+                         className: "sidebar-navbar-arrow",
+-                        disabled: !this.state.canGoForward,
++                        disabled: false,
+                         onClick: () => Nt.b.goForward(),
+                         type: "button"
+                       },
+diff --git a/build/assets/cache/js/route-naboo-no-ads.2705984b2916612d525c.js b/build/assets/cache/js/route-naboo-no-ads.2705984b2916612d525c.js
+index bc79d36..2dcc0de 100644
+--- a/build/assets/cache/js/route-naboo-no-ads.2705984b2916612d525c.js
++++ b/build/assets/cache/js/route-naboo-no-ads.2705984b2916612d525c.js
+@@ -7767,7 +7767,7 @@
+                       "button",
+                       {
+                         className: "sidebar-navbar-arrow",
+-                        disabled: !this.state.canGoBack,
++                        disabled: false,
+                         onClick: () => At.b.goBack(),
+                         type: "button"
+                       },
+@@ -7777,7 +7777,7 @@
+                       "button",
+                       {
+                         className: "sidebar-navbar-arrow",
+-                        disabled: !this.state.canGoForward,
++                        disabled: false,
+                         onClick: () => At.b.goForward(),
+                         type: "button"
+                       },
diff --git a/oauth.patch b/oauth.patch
deleted file mode 100644
index d441fe02c4dc..000000000000
--- a/oauth.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/main.js	2019-08-30 19:55:24.091850904 +0200
-+++ b/build/main.js	2019-08-30 20:24:34.256473021 +0200
-@@ -1819,7 +1819,7 @@
-       }
-       handleSchemeFromNonSingleInstance(args) {
-         const schemePath = this.getSchemePathFromArgs(args);
--        return "win32" == process.platform && !1 !== schemePath
-+        return !1 !== schemePath
-           ? this.isNonPathAction(schemePath)
-             ? this.handleNonPathAction(schemePath)
-             : this.handlePath(schemePath)