# Automated nightly release 69

commit 9733163 Merge: 25ff177 b5c486b Author: Emma <MarmadileManteater@proton.me> Merge branch 'FreeTubeApp:development' into development commit b5c486b Author: Emma <MarmadileManteater@proton.me> Fixing some leftover `showToast(obj)` (FreeTubeApp#2735) commit 198c3fa Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Bump http-proxy-agent from 4.0.1 to 5.0.0 (FreeTubeApp#2733) commit 25ff177 Merge: 980a387 4ef6369 Author: Emma <MarmadileManteater@proton.me> Merge branch 'upstream_development' into development commit 4ef6369 Author: Gediminas Murauskas <muziejusinfo@gmail.com> Translated using Weblate (Lithuanian) commit 4440044 Author: Massimo Pissarello <mapi68@gmail.com> Translated using Weblate (Italian) commit 8209e7e Author: Oğuz Ersen <oguz@ersen.moe> Translated using Weblate (Turkish) commit 3326224 Author: Jeff Huang <s8321414@gmail.com> Translated using Weblate (Chinese (Traditional)) commit 546a276 Author: Eric <hamburger1024@mailbox.org> Translated using Weblate (Chinese (Simplified)) commit 1b68e56 Author: Rex_sa <rex.sa@pm.me> Translated using Weblate (Arabic) commit 77a18e8 Merge: 62c70fb eefcd36 Author: Hosted Weblate <hosted@weblate.org> Merge branch 'origin/development' into Weblate. commit eefcd36 Author: Gediminas Murauskas <muziejusinfo@gmail.com> Translated using Weblate (Lithuanian) commit 94fb11f Author: Grzegorz Wójcicki <terkaz@gmx.com> Translated using Weblate (Polish) commit 37b3b6d Author: J. Lavoie <j.lavoie@net-c.ca> Translated using Weblate (French) commit 097c06a Author: J. Lavoie <j.lavoie@net-c.ca> Translated using Weblate (German) commit 62c70fb Author: absidue <48293849+absidue@users.noreply.github.com> Fix fetching the comments from invidious (FreeTubeApp#2721) commit 077fde7 Author: absidue <48293849+absidue@users.noreply.github.com> Fix CTRL+clicking on the channel name on the watch page (FreeTubeApp#2713) commit ad01d2b Author: absidue <48293849+absidue@users.noreply.github.com> Make the safe as and open file dialogs blocking (FreeTubeApp#2712) commit 3aa080d Author: absidue <48293849+absidue@users.noreply.github.com> Make showToast a helper (FreeTubeApp#2695) commit f94d8a9 Author: Emma <MarmadileManteater@proton.me> Filtering out invidious instances that don't support the API (FreeTubeApp#2714) commit 21a31cf Author: PikachuEXE <pikachuexe@gmail.com> Upgrade electron from 20 > 21 (FreeTubeApp#2717) commit c0f98ee Author: absidue <48293849+absidue@users.noreply.github.com> Use named parameters instead of $ and % in localised strings (FreeTubeApp#2685) commit 81426ed Author: absidue <48293849+absidue@users.noreply.github.com> Don't lint while rebasing (FreeTubeApp#2711) commit 1695605 Author: Aiz <66974576+Aiz0@users.noreply.github.com> Remove deprecated @keypress + some accessability improvements (FreeTubeApp#2697) commit b35d7ea Author: Sveinn í Felli <sv1@fellsnet.is> Translated using Weblate (Icelandic) commit 6b4727c Merge: bc8261d9 2a60129 Author: Hosted Weblate <hosted@weblate.org> Merge branch 'origin/development' into Weblate. commit 2a60129 Author: Fjuro <ifjuro@proton.me> Translated using Weblate (Czech) commit 5199114 Author: ovari <ovari123@zoho.com> Translated using Weblate (Hungarian) commit 11b3c19 Author: Yaron Shahrabani <sh.yaron@gmail.com> Translated using Weblate (Hebrew) commit bd210ab Author: Егор Ермаков <eg.ermakov2016@yandex.ru> Translated using Weblate (Russian) commit bc8261d Author: absidue <48293849+absidue@users.noreply.github.com> Move colours from the store to the utils helper (FreeTubeApp#2710) commit f12b9e1 Author: SC <lalocas@protonmail.com> Translated using Weblate (Portuguese) **Full Changelog**: 0.17.1-nightly-68...0.17.1-nightly-69
MarmadileManteater · Oct 18, 2022 · e07af70 · e07af70
2 parents c4f7f28 + 9733163
commit e07af70
Show file tree

Hide file tree

Showing 114 changed files with 1,854 additions and 2,397 deletions.
diff --git a/.babelrc b/.babelrc
@@ -4,8 +4,8 @@
       "@babel/env",
       {
         "targets": {
-          "chrome": "104",
-          "node": "16.15.0"
+          "chrome": "106",
+          "node": "16.16.0"
         }
       }
     ]

diff --git a/lefthook.yml b/lefthook.yml
@@ -9,6 +9,8 @@ pre-commit:
       # matching the glob is being committed
       glob: "*.{js,vue}"
       run: yarn run eslint --no-color {staged_files}
+      skip:
+        - rebase
 
 
 

diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "autolinker": "^4.0.0",
     "browserify": "^17.0.0",
     "electron-context-menu": "^3.5.0",
-    "http-proxy-agent": "^4.0.1",
+    "http-proxy-agent": "^5.0.0",
     "https-proxy-agent": "^5.0.0",
     "lodash.debounce": "^4.0.8",
     "lodash.isequal": "^4.5.0",
@@ -98,7 +98,7 @@
     "cordova": "^11.0.0",
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^4.1.0",
-    "electron": "^20.3.1",
+    "electron": "^21.1.1",
     "electron-builder": "^23.6.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",

diff --git a/src/main/index.js b/src/main/index.js
@@ -433,22 +433,28 @@ function runApp() {
     return app.getPath('pictures')
   })
 
-  ipcMain.handle(IpcChannels.SHOW_OPEN_DIALOG, async (_, options) => {
+  ipcMain.handle(IpcChannels.SHOW_OPEN_DIALOG, async ({ sender }, options) => {
+    const senderWindow = findSenderWindow(sender)
+    if (senderWindow) {
+      return await dialog.showOpenDialog(senderWindow, options)
+    }
     return await dialog.showOpenDialog(options)
   })
 
-  ipcMain.handle(IpcChannels.SHOW_SAVE_DIALOG, async (event, { options, useModal }) => {
-    if (useModal) {
-      const senderWindow = BrowserWindow.getAllWindows().find((window) => {
-        return window.webContents.id === event.sender.id
-      })
-      if (senderWindow) {
-        return await dialog.showSaveDialog(senderWindow, options)
-      }
+  ipcMain.handle(IpcChannels.SHOW_SAVE_DIALOG, async ({ sender }, options) => {
+    const senderWindow = findSenderWindow(sender)
+    if (senderWindow) {
+      return await dialog.showSaveDialog(senderWindow, options)
     }
     return await dialog.showSaveDialog(options)
   })
 
+  function findSenderWindow(sender) {
+    return BrowserWindow.getAllWindows().find((window) => {
+      return window.webContents.id === sender.id
+    })
+  }
+
   ipcMain.on(IpcChannels.STOP_POWER_SAVE_BLOCKER, (_, id) => {
     powerSaveBlocker.stop(id)
   })

diff --git a/src/renderer/App.js b/src/renderer/App.js
@@ -13,6 +13,7 @@ import { marked } from 'marked'
 import Parser from 'rss-parser'
 import { IpcChannels } from '../constants'
 import packageDetails from '../../package.json'
+import { showToast } from './helpers/utils'
 
 let ipcRenderer = null
 
@@ -237,8 +238,7 @@ export default Vue.extend({
           const latestPubDate = new Date(latestBlog.pubDate)
 
           if (lastAppWasRunning === null || latestPubDate > lastAppWasRunning) {
-            const message = this.$t('A new blog is now available, $. Click to view more')
-            this.blogBannerMessage = message.replace('$', latestBlog.title)
+            this.blogBannerMessage = this.$t('A new blog is now available, {blogTitle}. Click to view more', { blogTitle: latestBlog.title })
             this.latestBlogUrl = latestBlog.link
             this.showBlogBanner = true
           }
@@ -349,9 +349,7 @@ export default Vue.extend({
         })
       } else if (this.externalLinkHandling === 'doNothing') {
         // Let user know opening external link is disabled via setting
-        this.showToast({
-          message: this.$t('External link opening has been disabled in the general settings')
-        })
+        showToast(this.$t('External link opening has been disabled in the general settings'))
       } else if (this.externalLinkHandling === 'openLinkAfterPrompt') {
         // Storing the URL is necessary as
         // there is no other way to pass the URL to click callback
@@ -417,9 +415,7 @@ export default Vue.extend({
               message = this.$t(message)
             }
 
-            this.showToast({
-              message: message
-            })
+            showToast(message)
             break
           }
 
@@ -446,9 +442,7 @@ export default Vue.extend({
               message = this.$t(message)
             }
 
-            this.showToast({
-              message: message
-            })
+            showToast(message)
           }
         }
       })
@@ -529,7 +523,6 @@ export default Vue.extend({
     ]),
 
     ...mapActions([
-      'showToast',
       'openExternalLink',
       'grabUserSettings',
       'grabAllProfiles',
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,8 @@ pre-commit: @@
           # matching the glob is being committed
           glob: "*.{js,vue}"
           run: yarn run eslint --no-color {staged_files}
+          skip:
+            - rebase
@@ Expand Down @@