Skip to content

Commit 266ab7e

Browse files
committed
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)
2 parents 36e7ed8 + ca94bce commit 266ab7e

File tree

7 files changed

+25
-23
lines changed

7 files changed

+25
-23
lines changed

.github/pr-labeler.yml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
11
'PR: waiting for review':
2-
- '*'
3-
- '.babelrc'
4-
- '.editorconfig'
5-
- '.eslintignore'
6-
- '.eslintrc.js'
7-
- '.gitignore'
8-
- '.prettierrc'
9-
- '.whitesource'
10-
- '.github/**/*'
11-
- '.vscode/**/*'
12-
- '_icons/**/*'
13-
- '_scripts/**/*'
14-
- 'src/**/*'
15-
- 'static/**/*'
2+
- changed-files:
3+
- any-glob-to-any-file: '**'
164

175
'PR: dependencies':
18-
- 'yarn.lock'
19-
- 'package.json'
6+
- any:
7+
- changed-files:
8+
- any-glob-to-any-file: ['yarn.lock', 'package.json']

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"copy-webpack-plugin": "^11.0.0",
9090
"css-loader": "^6.8.1",
9191
"css-minimizer-webpack-plugin": "^5.0.1",
92-
"electron": "^27.1.3",
92+
"electron": "^28.0.0",
9393
"electron-builder": "^24.9.1",
9494
"eslint": "^8.55.0",
9595
"eslint-config-prettier": "^9.1.0",

src/renderer/components/ft-subscribe-button/ft-subscribe-button.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
.ftSubscribeButton {
1414
position: relative;
1515
text-align: start;
16+
inline-size: fit-content;
1617
}
1718

1819
/* Ensures style here overrides style of .btn */

src/renderer/views/Channel/Channel.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,7 +1801,7 @@ export default defineComponent({
18011801
const results = contents
18021802
.filter(node => node.type === 'ItemSection')
18031803
.flatMap(itemSection => itemSection.contents)
1804-
.filter(item => item.type === 'Video' || item.type === 'Playlist')
1804+
.filter(item => item.type === 'Video' || (!this.hideChannelPlaylists && item.type === 'Playlist'))
18051805
.map(item => {
18061806
if (item.type === 'Video') {
18071807
return parseLocalListVideo(item)
@@ -1847,7 +1847,11 @@ export default defineComponent({
18471847
}
18481848

18491849
invidiousAPICall(payload).then((response) => {
1850-
this.searchResults = this.searchResults.concat(response)
1850+
if (this.hideChannelPlaylists) {
1851+
this.searchResults = this.searchResults.concat(response.filter(item => item.type !== 'playlist'))
1852+
} else {
1853+
this.searchResults = this.searchResults.concat(response)
1854+
}
18511855
this.isElementListLoading = false
18521856
this.searchPage++
18531857
}).catch((err) => {

static/locales/et.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ Settings:
324324
Fetch Feeds from RSS: 'Laadi RSS-uudisvood'
325325
Manage Subscriptions: 'Halda tellimusi'
326326
Fetch Automatically: Laadi tellimuste voog automaatselt
327+
Only Show Latest Video for Each Channel: Iga kanali puhul näita vaid viimast videot
327328
Data Settings:
328329
Data Settings: 'Andmehaldus'
329330
Select Import Type: 'Vali imporditava faili vorming'
@@ -488,6 +489,7 @@ Settings:
488489
Remove Password: Eemalda salasõna
489490
Set Password: Määra salasõna
490491
Set Password To Prevent Access: Vältimaks ligipääsu seadistustele määra salasõna
492+
Expand All Settings Sections: Laienda kõik seadistuste lõigud
491493
About:
492494
#On About page
493495
About: 'Teave'
@@ -563,6 +565,11 @@ Profile:
563565
Profile Filter: Sirvi profiile
564566
Profile Settings: Profiili seadistused
565567
Toggle Profile List: Lülita profiilide loend sisse/välja
568+
Profile Name: Profiili nimi
569+
Edit Profile Name: Muuda profiili nime
570+
Create Profile Name: Loo profiilile nimi
571+
Open Profile Dropdown: Ava profiili rippmenüü
572+
Close Profile Dropdown: Sulge profiili rippmenüü
566573
Channel:
567574
Subscribe: 'Telli'
568575
Unsubscribe: 'Lõpeta tellimus'

static/locales/lt.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -909,3 +909,4 @@ Clipboard:
909909
Cannot access clipboard without a secure connection: Negalima pasiekti iškarpinės
910910
be saugaus ryšio
911911
Preferences: Nuostatos
912+
Go to page: Eiti į {page}

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3437,10 +3437,10 @@ electron-to-chromium@^1.4.535:
34373437
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.554.tgz#04e09c2ee31dc0f1546174033809b54cc372740b"
34383438
integrity sha512-Q0umzPJjfBrrj8unkONTgbKQXzXRrH7sVV7D9ea2yBV3Oaogz991yhbpfvo2LMNkJItmruXTEzVpP9cp7vaIiQ==
34393439

3440-
electron@^27.1.3:
3441-
version "27.1.3"
3442-
resolved "https://registry.yarnpkg.com/electron/-/electron-27.1.3.tgz#3fd6decda95c1dd0a7e51a9ac77ee0ba37b7c5c6"
3443-
integrity sha512-7eD8VMhhlL5J531OOawn00eMthUkX1e3qN5Nqd7eMK8bg5HxQBrn8bdPlvUEnCano9KhrVwaDnGeuzWoDOGpjQ==
3440+
electron@^28.0.0:
3441+
version "28.0.0"
3442+
resolved "https://registry.yarnpkg.com/electron/-/electron-28.0.0.tgz#21e5590c967125a3c1ec6b0d8d923baf9eb6fd72"
3443+
integrity sha512-eDhnCFBvG0PGFVEpNIEdBvyuGUBsFdlokd+CtuCe2ER3P+17qxaRfWRxMmksCOKgDHb5Wif5UxqOkZSlA4snlw==
34443444
dependencies:
34453445
"@electron/get" "^2.0.0"
34463446
"@types/node" "^18.11.18"

0 commit comments

Comments
 (0)