Merge branch 'development' into feature/playlist-2023-05

* development: Hide playlists in channel search results if "hide channel playlist" preference selected. (FreeTubeApp#4454) Fix issue with subscribe button styling in specific views (FreeTubeApp#4451) Translated using Weblate (Lithuanian) Bump electron from 27.1.3 to 28.0.0 (FreeTubeApp#4442) Fix pr-labeler.yml (FreeTubeApp#4449) Translated using Weblate (Estonian)
PikachuEXE · Dec 16, 2023 · 266ab7e · 266ab7e
2 parents 36e7ed8 + ca94bce
commit 266ab7e
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 23 deletions.
diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
@@ -1,19 +1,8 @@
 'PR: waiting for review':
-  - '*'  
-  - '.babelrc'        
-  - '.editorconfig'
-  - '.eslintignore'
-  - '.eslintrc.js'
-  - '.gitignore'
-  - '.prettierrc'       
-  - '.whitesource'       
-  - '.github/**/*'         
-  - '.vscode/**/*'          
-  - '_icons/**/*'          
-  - '_scripts/**/*'         
-  - 'src/**/*'          
-  - 'static/**/*'       
+- changed-files:
+  - any-glob-to-any-file: '**'
 
 'PR: dependencies':
-  - 'yarn.lock'
-  - 'package.json'
+- any:
+  - changed-files:
+    - any-glob-to-any-file: ['yarn.lock', 'package.json']
diff --git a/package.json b/package.json
@@ -89,7 +89,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "electron": "^27.1.3",
+    "electron": "^28.0.0",
     "electron-builder": "^24.9.1",
     "eslint": "^8.55.0",
     "eslint-config-prettier": "^9.1.0",

diff --git a/src/renderer/components/ft-subscribe-button/ft-subscribe-button.scss b/src/renderer/components/ft-subscribe-button/ft-subscribe-button.scss
@@ -13,6 +13,7 @@
 .ftSubscribeButton {
   position: relative;
   text-align: start;
+  inline-size: fit-content;
 }
 
 /* Ensures style here overrides style of .btn */

diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
@@ -1801,7 +1801,7 @@ export default defineComponent({
         const results = contents
           .filter(node => node.type === 'ItemSection')
           .flatMap(itemSection => itemSection.contents)
-          .filter(item => item.type === 'Video' || item.type === 'Playlist')
+          .filter(item => item.type === 'Video' || (!this.hideChannelPlaylists && item.type === 'Playlist'))
           .map(item => {
             if (item.type === 'Video') {
               return parseLocalListVideo(item)
@@ -1847,7 +1847,11 @@ export default defineComponent({
       }
 
       invidiousAPICall(payload).then((response) => {
-        this.searchResults = this.searchResults.concat(response)
+        if (this.hideChannelPlaylists) {
+          this.searchResults = this.searchResults.concat(response.filter(item => item.type !== 'playlist'))
+        } else {
+          this.searchResults = this.searchResults.concat(response)
+        }
         this.isElementListLoading = false
         this.searchPage++
       }).catch((err) => {

diff --git a/static/locales/et.yaml b/static/locales/et.yaml
@@ -324,6 +324,7 @@ Settings:
     Fetch Feeds from RSS: 'Laadi RSS-uudisvood'
     Manage Subscriptions: 'Halda tellimusi'
     Fetch Automatically: Laadi tellimuste voog automaatselt
+    Only Show Latest Video for Each Channel: Iga kanali puhul näita vaid viimast videot
   Data Settings:
     Data Settings: 'Andmehaldus'
     Select Import Type: 'Vali imporditava faili vorming'
@@ -488,6 +489,7 @@ Settings:
     Remove Password: Eemalda salasõna
     Set Password: Määra salasõna
     Set Password To Prevent Access: Vältimaks ligipääsu seadistustele määra salasõna
+  Expand All Settings Sections: Laienda kõik seadistuste lõigud
 About:
   #On About page
   About: 'Teave'
@@ -563,6 +565,11 @@ Profile:
   Profile Filter: Sirvi profiile
   Profile Settings: Profiili seadistused
   Toggle Profile List: Lülita profiilide loend sisse/välja
+  Profile Name: Profiili nimi
+  Edit Profile Name: Muuda profiili nime
+  Create Profile Name: Loo profiilile nimi
+  Open Profile Dropdown: Ava profiili rippmenüü
+  Close Profile Dropdown: Sulge profiili rippmenüü
 Channel:
   Subscribe: 'Telli'
   Unsubscribe: 'Lõpeta tellimus'

diff --git a/static/locales/lt.yaml b/static/locales/lt.yaml
@@ -909,3 +909,4 @@ Clipboard:
   Cannot access clipboard without a secure connection: Negalima pasiekti iškarpinės
     be saugaus ryšio
 Preferences: Nuostatos
+Go to page: Eiti į {page}
diff --git a/yarn.lock b/yarn.lock
@@ -3437,10 +3437,10 @@ electron-to-chromium@^1.4.535:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.554.tgz#04e09c2ee31dc0f1546174033809b54cc372740b"
   integrity sha512-Q0umzPJjfBrrj8unkONTgbKQXzXRrH7sVV7D9ea2yBV3Oaogz991yhbpfvo2LMNkJItmruXTEzVpP9cp7vaIiQ==
 
-electron@^27.1.3:
-  version "27.1.3"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-27.1.3.tgz#3fd6decda95c1dd0a7e51a9ac77ee0ba37b7c5c6"
-  integrity sha512-7eD8VMhhlL5J531OOawn00eMthUkX1e3qN5Nqd7eMK8bg5HxQBrn8bdPlvUEnCano9KhrVwaDnGeuzWoDOGpjQ==
+electron@^28.0.0:
+  version "28.0.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-28.0.0.tgz#21e5590c967125a3c1ec6b0d8d923baf9eb6fd72"
+  integrity sha512-eDhnCFBvG0PGFVEpNIEdBvyuGUBsFdlokd+CtuCe2ER3P+17qxaRfWRxMmksCOKgDHb5Wif5UxqOkZSlA4snlw==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^18.11.18"