strip ads

bump pkgrel

4 files changed, 121 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 535a012c43f5..542ff14e4d87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = eso-logs-uploader-bin
 	pkgdesc = Official log uploader application for esologs.com
 	pkgver = 5.9.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/RPGLogs/Uploaders-esologs
 	arch = any
 	license = custom:CC0
@@ -13,9 +13,11 @@ pkgbase = eso-logs-uploader-bin
 	options = !strip
 	source = eso-logs-uploader-5.9.0.AppImage::https://github.com/RPGLogs/Uploaders-esologs/releases/download/v5.9.0/ESO-Logs-Uploader-5.9.0.AppImage
 	source = eso-logs-uploader.sh
-	source = main.js.patch
+	source = no-devtools.patch
+	source = no-ads.patch
 	sha256sums = 21a77c9730a917ce75db709730969a10c9a19b42beda93558fb5ade67d1b70af
 	sha256sums = 6b260619df25c8f73b2ad252462480745130d3a2d51eb8be431e55f81e637239
-	sha256sums = bc880cedc36a76f0a6ae901da4ca648ea5751d507463e960d03f3ce8b3f4948a
+	sha256sums = 0d1ee7d16d8e226a78300e5f20d6bb743bd194aa68090adccd436952f0b0d287
+	sha256sums = 53c3b564c22088ba45bc6c6a9c6e0c7cf9be126caad9cb77cf88f85973701df0
 
 pkgname = eso-logs-uploader-bin
diff --git a/PKGBUILD b/PKGBUILD
index 969f2234d12a..bbbcdff790aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=eso-logs-uploader-bin
 pkgver=5.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Official log uploader application for esologs.com"
 arch=('any')
 url="https://github.com/RPGLogs/Uploaders-esologs"
@@ -14,10 +14,12 @@ makedepends=('asar')
 options=('!strip')
 source=("${pkgname%-bin}-$pkgver.AppImage::$url/releases/download/v$pkgver/ESO-Logs-Uploader-$pkgver.AppImage"
         'eso-logs-uploader.sh'
-        'main.js.patch')
+        'no-devtools.patch'
+        'no-ads.patch')
 sha256sums=('21a77c9730a917ce75db709730969a10c9a19b42beda93558fb5ade67d1b70af'
             '6b260619df25c8f73b2ad252462480745130d3a2d51eb8be431e55f81e637239'
-            'bc880cedc36a76f0a6ae901da4ca648ea5751d507463e960d03f3ce8b3f4948a')
+            '0d1ee7d16d8e226a78300e5f20d6bb743bd194aa68090adccd436952f0b0d287'
+            '53c3b564c22088ba45bc6c6a9c6e0c7cf9be126caad9cb77cf88f85973701df0')
 
 prepare() {
     cd "$srcdir"
@@ -27,8 +29,11 @@ prepare() {
     asar e "squashfs-root/resources/app.asar" "${pkgname%-bin}"
 
     mv "${pkgname%-bin}/LICENSE.md" "${pkgname%-bin}/README.md" .
-    patch "${pkgname%-bin}/main.js" "main.js.patch"
     sed -i 's/^\(Exec=\).*$/\1eso-logs-uploader/' "squashfs-root/esologs.desktop"
+
+    cd "${pkgname%-bin}"
+    patch -p1 < "$srcdir/no-devtools.patch"
+    patch -p1 < "$srcdir/no-ads.patch"
 }
 
 package() {
diff --git a/no-ads.patch b/no-ads.patch
new file mode 100644
index 000000000000..0629a5ef2c77
--- /dev/null
+++ b/no-ads.patch
@@ -0,0 +1,103 @@
+diff -ruN a/main-view.js b/main-view.js
+--- a/main-view.js	2022-05-28 14:17:42.739111678 +0200
++++ b/main-view.js	2022-05-28 14:50:14.227972642 +0200
+@@ -1,6 +1,5 @@
+ const { dialog } = require('@electron/remote');
+ const { BaseAppView } = require('./base-app-view');
+-const { AdService } = require('./scripts/services/ad-service');
+ const {
+   ExternalLinkService,
+ } = require('./scripts/services/external-link-service');
+@@ -85,7 +84,6 @@
+ 
+     this._mainWindow = mainWindow;
+ 
+-    this._adService = AdService;
+     this._externalLinkService = new ExternalLinkService();
+ 
+     this._mainWindow.game.desktopContentLoaded?.(document);
+@@ -356,12 +354,6 @@
+       this.selectRegion(user.preferredRegion.id, true);
+     }
+ 
+-    if (user && user.isSubscribed) {
+-      this._adService.disableAds();
+-    } else {
+-      this._adService.enableAds();
+-    }
+-
+     this._mainWindow.canUseRealTimeLiveLogging = user.canUseRealTimeLiveLogging;
+ 
+     if (this._onboarded) {
+@@ -734,7 +726,6 @@
+   };
+ 
+   fillInLoginForm = () => {
+-    this._adService.disableAds();
+     document.getElementById('startup-panel').style.display = 'none';
+     document.getElementById('logincontent').style.display = '';
+     document.getElementById('email').value = this._mainWindow.userName;
+@@ -846,7 +837,6 @@
+ </div>`);
+ 
+       $('body').append(settingsElement);
+-      await this._adService.pauseAds();
+ 
+       const closeOverwolfControlElement = $(
+         '.settings__close-overwolf-control'
+@@ -873,7 +863,6 @@
+ 
+       $('.settings__done-button').on('click', async () => {
+         settingsElement.remove();
+-        await this._adService.resumeAds();
+       });
+     });
+   };
+diff -ruN a/scripts/services/ad-service.js b/scripts/services/ad-service.js
+--- a/scripts/services/ad-service.js	2022-05-28 14:17:42.739111678 +0200
++++ b/scripts/services/ad-service.js	1970-01-01 01:00:00.000000000 +0100
+@@ -1,44 +0,0 @@
+-let adsEnabled = false;
+-
+-const resumeAds = () => {
+-  const adContainer = document.getElementById('electron-ad-container');
+-  if (!adsEnabled || !adContainer || adContainer.style.display !== 'none')
+-    return;
+-  adContainer.style.display = 'flex';
+-  adContainer.innerHTML =
+-    "<webview allowpopups httpreferrer='" +
+-    window.game.host() +
+-    "' style='flex:1' id='electron-ad-view' src='" +
+-    window.game.scheme() +
+-    '://' +
+-    window.game.host() +
+-    "/client/ad'></webview>";
+-};
+-
+-const pauseAds = () => {
+-  const adContainer = document.getElementById('electron-ad-container');
+-  if (!adContainer || adContainer.style.display === 'none') return;
+-  adContainer.style.display = 'none';
+-  adContainer.innerHTML = '';
+-};
+-
+-const enableAds = () => {
+-  adsEnabled = true;
+-  resumeAds();
+-};
+-
+-const disableAds = () => {
+-  adsEnabled = false;
+-  pauseAds();
+-};
+-
+-const AdService = {
+-  enableAds,
+-  disableAds,
+-  resumeAds,
+-  pauseAds,
+-};
+-
+-module.exports = {
+-  AdService,
+-};
diff --git a/main.js.patch b/no-devtools.patch
index 84b3e7a4fcb0..f2f45894f9ae 100644
--- a/main.js.patch
+++ b/no-devtools.patch
@@ -1,5 +1,6 @@
---- main.js     2022-05-28 02:38:57.398442864 +0200
-+++ main.js.new 2022-05-28 02:44:27.748478671 +0200
+diff -ruN a/main.js b/main.js
+--- a/main.js	2022-05-28 14:47:17.964878674 +0200
++++ b/main.js	2022-05-28 14:46:30.607414509 +0200
 @@ -91,6 +91,7 @@
        nodeIntegration: true,
        webviewTag: true,
@@ -7,3 +8,4 @@
 +      devTools: false
      },
    };
+