Skip to content

Commit 712d046

Browse files
committed
Merge branch 'development' into custom-builds/sabr
* development: (31 commits) Bump mikefarah/yq from 4.47.1 to 4.47.2 (FreeTubeApp#8039) Bump marked from 16.2.1 to 16.3.0 (FreeTubeApp#8040) Bump eslint-plugin-jsdoc from 57.0.3 to 57.0.8 in the eslint group (FreeTubeApp#8038) Adjust homebrew link to maintainers tap (FreeTubeApp#8041) Remove n argument in sed (FreeTubeApp#8033) Translated using Weblate (Russian) Bump eslint-plugin-jsdoc from 56.1.2 to 57.0.3 in the eslint group (FreeTubeApp#8030) Bump youtubei.js from 15.1.0 to 15.1.1 (FreeTubeApp#8031) Translated using Weblate (Polish) Bump eslint-plugin-jsdoc from 55.0.0 to 56.1.2 in the eslint group (FreeTubeApp#8020) Bump lefthook from 1.12.4 to 1.13.0 (FreeTubeApp#8026) Bump swiper from 11.2.10 to 12.0.1 (FreeTubeApp#8024) Bump globals from 16.3.0 to 16.4.0 (FreeTubeApp#8023) Bump package version from 0.23.8 to 0.23.9 (FreeTubeApp#8027) Bump youtubei.js from 15.0.1 to 15.1.0 (FreeTubeApp#8022) Add Workflow to Automate Updating the Website Version Number (FreeTubeApp#7989) Translated using Weblate (Czech) Translated using Weblate (Dutch) Translated using Weblate (Icelandic) Bump sass from 1.91.0 to 1.92.1 (FreeTubeApp#8003) ... # Conflicts: # package.json
2 parents 26a4ecc + 1b2c901 commit 712d046

File tree

15 files changed

+438
-349
lines changed

15 files changed

+438
-349
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565

6666
- name: Set Version Number Variable
6767
id: versionNumber
68-
uses: actions/github-script@v7
68+
uses: actions/github-script@v8
6969
env:
7070
IS_DEV: ${{ contains(github.ref, 'development') }}
7171
IS_RC: ${{ contains(github.ref, 'RC') }}

.github/workflows/flatpak.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,22 @@ jobs:
7676
date +"%Y-%m-%d" >> $GITHUB_ENV
7777
echo 'EOF' >> $GITHUB_ENV
7878
- name: Update x64 File Location in yml File
79-
uses: mikefarah/yq@v4.47.1
79+
uses: mikefarah/yq@v4.47.2
8080
with:
8181
# The Command which should be run
8282
cmd: yq -i '.modules[0].sources[0].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-beta-linux-x64-portable.zip"' io.freetubeapp.FreeTube.yml
8383
- name: Update x64 Hash in yml File
84-
uses: mikefarah/yq@v4.47.1
84+
uses: mikefarah/yq@v4.47.2
8585
with:
8686
# The Command which should be run
8787
cmd: yq -i '.modules[0].sources[0].sha256 = "${{ env.HASH_X64 }}"' io.freetubeapp.FreeTube.yml
8888
- name: Update ARM File Location in yml File
89-
uses: mikefarah/yq@v4.47.1
89+
uses: mikefarah/yq@v4.47.2
9090
with:
9191
# The Command which should be run
9292
cmd: yq -i '.modules[0].sources[1].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-beta-linux-arm64-portable.zip"' io.freetubeapp.FreeTube.yml
9393
- name: Update ARM Hash in yml File
94-
uses: mikefarah/yq@v4.47.1
94+
uses: mikefarah/yq@v4.47.2
9595
with:
9696
# The Command which should be run
9797
cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml

.github/workflows/label-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
if: ${{ !github.event.pull_request.draft }}
1313
steps:
14-
- uses: actions/labeler@v5
14+
- uses: actions/labeler@v6
1515
with:
1616
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1717
configuration-path: .github/pr-labeler.yml

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
stale:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/stale@v9
14+
- uses: actions/stale@v10
1515
with:
1616
stale-issue-message: 'This issue is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
1717
stale-pr-message: 'This PR is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 14 days.'

.github/workflows/updateSite.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# This is a basic workflow that is manually triggered
2+
3+
name: Update Site Version Number
4+
5+
# Controls when the action will run. Workflow runs when manually triggered using the UI
6+
# or API.
7+
on:
8+
workflow_dispatch:
9+
release:
10+
types: [published]
11+
12+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- uses: actions/checkout@v5
19+
with:
20+
repository: FreeTubeApp/FreeTubeApp.io
21+
token: ${{ secrets.FLATHUB_TOKEN }}
22+
- name: Get Repo Release List
23+
uses: moustacheful/github-api-exec-action@v0
24+
id: list_results
25+
with:
26+
# Command to execute, (e.g: `pulls.create`), see https://octokit.github.io/rest.js/ for available commands
27+
command: repos.listReleases
28+
payload: >
29+
{
30+
"owner": "FreeTubeApp",
31+
"repo": "FreeTube"
32+
}
33+
env:
34+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35+
- name: Create Current Version Variable
36+
uses: bluwy/substitute-string-action@v3
37+
id: current
38+
with:
39+
_input-text: ${{ fromJson(steps.list_results.outputs.result)[0].tag_name }}
40+
-beta: ''
41+
v: ''
42+
- name: Create Previous Version Variable
43+
uses: bluwy/substitute-string-action@v3
44+
id: previous
45+
with:
46+
_input-text: ${{ fromJson(steps.list_results.outputs.result)[1].tag_name }}
47+
-beta: ''
48+
v: ''
49+
- name: Set Master Branch
50+
# Currently the default branch is master, but if that changes later, then this acts as a failsafe.
51+
run: |
52+
git checkout master
53+
- name: Update index.php
54+
run: |
55+
sed -i 's/${{ steps.previous.outputs.result }}/${{ steps.current.outputs.result }}/g' src/index.php
56+
- name: Commit Files
57+
uses: stefanzweifel/git-auto-commit-action@v6
58+
with:
59+
# Optional but recommended
60+
# Defaults to "Apply automatic changes"
61+
commit_message: Update version number to v${{ steps.current.outputs.result }}
62+
63+
# Optional options appended to `git-commit`
64+
# See https://git-scm.com/docs/git-commit for a list of available options
65+
commit_options: '--no-verify --signoff'
66+
67+
# Optional: Disable dirty check and always try to create a commit and push
68+
skip_dirty_check: true

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ The first build with a green check mark is the latest build.
125125

126126
* FreeTubeAndroid (FreeTube port for Android and PWA): [Download](https://github.com/MarmadileManteater/FreeTubeAndroid/releases) and [Source Code](https://github.com/MarmadileManteater/FreeTubeAndroid)
127127

128-
* Homebrew Formulae (Mac only): [Download](https://formulae.brew.sh/cask/freetube)
128+
* Homebrew Formulae (Mac only): [Download for Apple Silicon](https://github.com/PikachuEXE/homebrew-FreeTube)
129129

130130
* makedeb Package Repository (MPR): [Download](https://mpr.makedeb.org/packages/freetube-bin)
131131

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "freetube",
33
"productName": "FreeTube",
44
"description": "A private YouTube client",
5-
"version": "0.23.8",
5+
"version": "0.23.9",
66
"license": "AGPL-3.0-or-later",
77
"main": "./dist/main.js",
88
"private": true,
@@ -63,51 +63,51 @@
6363
"autolinker": "^4.1.5",
6464
"bgutils-js": "^3.2.0",
6565
"electron-context-menu": "^4.1.1",
66-
"googlevideo": "^4.0.3",
67-
"marked": "^16.2.1",
66+
"googlevideo": "^4.0.4",
67+
"marked": "^16.3.0",
6868
"portal-vue": "^2.1.7",
6969
"process": "^0.11.10",
7070
"shaka-player": "^4.16.1",
71-
"swiper": "^11.2.10",
71+
"swiper": "^12.0.1",
7272
"vue": "^2.7.16",
7373
"vue-i18n": "^8.28.2",
7474
"vue-observe-visibility": "^1.0.0",
7575
"vue-router": "^3.6.5",
7676
"vuex": "^3.6.2",
77-
"youtubei.js": "^15.0.1"
77+
"youtubei.js": "^15.1.1"
7878
},
7979
"devDependencies": {
80-
"@babel/core": "^7.28.3",
80+
"@babel/core": "^7.28.4",
8181
"@babel/preset-env": "^7.28.3",
8282
"@double-great/stylelint-a11y": "^3.4.0",
83-
"@eslint/js": "^9.34.0",
83+
"@eslint/js": "^9.35.0",
8484
"@intlify/eslint-plugin-vue-i18n": "^3.2.0",
8585
"babel-loader": "^10.0.0",
8686
"copy-webpack-plugin": "^13.0.1",
8787
"css-loader": "^7.1.2",
8888
"css-minimizer-webpack-plugin": "^7.0.2",
8989
"electron": "^37.4.0",
9090
"electron-builder": "^26.0.20",
91-
"eslint": "^9.34.0",
92-
"eslint-plugin-jsdoc": "^54.1.1",
91+
"eslint": "^9.35.0",
92+
"eslint-plugin-jsdoc": "^57.0.8",
9393
"eslint-plugin-jsonc": "^2.20.1",
94-
"eslint-plugin-unicorn": "^60.0.0",
94+
"eslint-plugin-unicorn": "^61.0.2",
9595
"eslint-plugin-vue": "^10.4.0",
9696
"eslint-plugin-vuejs-accessibility": "^2.4.1",
9797
"eslint-plugin-yml": "^1.18.0",
98-
"globals": "^16.3.0",
98+
"globals": "^16.4.0",
9999
"html-webpack-plugin": "^5.6.4",
100100
"js-yaml": "^4.1.0",
101101
"json-minimizer-webpack-plugin": "^5.0.1",
102-
"lefthook": "^1.12.3",
102+
"lefthook": "^1.13.0",
103103
"mini-css-extract-plugin": "^2.9.4",
104104
"neostandard": "^0.12.2",
105105
"npm-run-all2": "^8.0.4",
106106
"postcss": "^8.5.6",
107107
"postcss-scss": "^4.0.9",
108-
"sass": "^1.91.0",
108+
"sass": "^1.92.1",
109109
"sass-loader": "^16.0.5",
110-
"stylelint": "^16.23.1",
110+
"stylelint": "^16.24.0",
111111
"stylelint-config-sass-guidelines": "^12.1.0",
112112
"stylelint-config-standard": "^39.0.0",
113113
"stylelint-high-performance-animation": "^1.11.0",

static/locales/cs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ Settings:
475475
Hide Popular Videos: 'Skrýt populární videa'
476476
Hide Live Chat: 'Skrýt chat'
477477
Hide Active Subscriptions: Skrýt aktivní odběry
478-
Hide Playlists: Skrýt playlist
478+
Hide Playlists: Skrýt playlisty
479479
Hide Video Description: Skrýt popis videa
480480
Hide Comments: Skrýt komentáře
481481
Hide Live Streams: Skrýt živé přenosy

static/locales/es.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ Settings:
443443
Remove All Playlists: Eliminar todas las listas de reproducción
444444
Are you sure you want to remove all your playlists?: ¿Estás seguro de que quieres eliminar todas tus listas de reproducción?
445445
Remember Search History: Guardar Historial de Búsquedas
446-
Are you sure you want to clear out your search history and cache?: Está seguro de que quiere borrar su historial de búsqueda y cache?
446+
Are you sure you want to clear out your search history and cache?: ¿Está seguro de que desea borrar su historial de búsqueda y la caché?
447447
Search history and cache have been cleared: El historial de búsquedas y el cache han sido borrados
448448
Clear Search History and Cache: Borrar Historial de Búsquedas y Cache
449449
Watched Progress Saving Mode:
@@ -966,7 +966,7 @@ Tooltips:
966966
Thumbnail Preference: Todas las miniaturas en FreeTube se reemplazarán con un fotograma del vídeo, borroso o oculto, en lugar de la miniatura predeterminada.
967967
Fallback to Non-Preferred Backend on Failure: Si la API primaria falla, FreeTube utilizará automáticamente la API secundaria cuando esté activada.
968968
Preferred API Backend: Elija el motor que debe utilizar FreeTube para obtener datos. La API local es un extractor incorporado. La API de Invidious requiere de un servidor Invidious al cual conectarse.
969-
External Link Handling: "Elija el comportamiento por defecto cuando se hace clic en un enlace que no se pueda abrirse en FreeTube. \nPor defecto, FreeTube abrirá el enlace en el que se hizo clic en su navegador predeterminado.\n"
969+
External Link Handling: "Elija el comportamiento predeterminado cuando se hace clic en un enlace que no se puede abrir en FreeTube.\nPor defecto, FreeTube abrirá el enlace en el navegador predeterminado.\n"
970970
Open Deep Links In New Window: Las URL que se pasan a FreeTube, por ejemplo mediante la redirección de extensiones del navegador o argumentos de la línea de comandos, se abren en una ventana nueva.
971971
External Player Settings:
972972
Custom External Player Executable: Por defecto, FreeTube buscará el reproductor externo seleccionado mediante la variable de entorno PATH, de no encontrarlo, podrás especificar una ruta personalizada aquí.
@@ -981,6 +981,7 @@ Tooltips:
981981
Hide Channels: Introduzca un ID del canal para ocultar todos los vídeos, listas de reproducción y el propio canal para que no aparezcan en las búsquedas, tendencias, más populares y recomendados. El ID del canal introducido debe coincidir completamente y se debe distinguir entre mayúsculas y minúsculas.
982982
Hide Subscriptions Live: Esta configuración se reemplaza por la configuración «{appWideSetting}» de toda la aplicación, en la sección «{subsection}» de «{settingsSection}»
983983
Hide Videos and Playlists Containing Text: Introduzca una palabra, fragmento de palabra o frase (sin distinguir mayúsculas de minúsculas) para ocultar todos los vídeos y listas de reproducción cuyos títulos originales la contengan en todo FreeTube, excluyendo únicamente Historial, Tus listas de reproducción y los vídeos dentro de las listas de reproducción.
984+
Hide Videos on Watch: Oculta los vídeos vistos de las pestañas de Vídeos, Shorts y En directo en las páginas de Subscripciones y Canales. Esto no afecta a la pestaña de inicio en las páginas de Canales
984985
SponsorBlock Settings:
985986
UseDeArrowTitles: Sustituye los títulos de los vídeos por títulos enviados por los usuarios desde DeArrow.
986987
UseDeArrowThumbnails: Sustituye las miniaturas de vídeo por miniaturas de DeArrow.

static/locales/is.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,7 @@ Tooltips:
969969
Hide Channels: Settu inn auðkenni rásar til að fela öll myndskeið, spilunarlista og sjálfa rásina við leit eða því sem er vinsælast, mest skoðað og mælt með. Auðkenni rásarinnar sem sett er inn þarf að vera nákvæmlega stafrétt og tekur tillit til hástafa/lágstafa.
970970
Hide Subscriptions Live: Þessa stillingu er hægt að taka yfir með "{appWideSetting}" stillingunni fyrir allt forritið, í "{subsection}" hlutanum í "{settingsSection}"
971971
Hide Videos and Playlists Containing Text: Settu inn orð, orðhluta eða setningu (óháð stafstöðu) til að fela öll myndskeið og spilunarlista þar sem titillinn inniheldur þetta, hvar sem er í FreeTube, með undantekningum innan áhorfsferils, spilunarlistanna þinna og myndskeiða innan spilunarlista.
972+
Hide Videos on Watch: Felur myndskeið sem búið er að horfa á, úr flipunum Myndskeið, Símamyndir og Í beinni, á áskriftar- og rásasíðunum. Þetta hefur ekki áhrif á heimaflipann á rásasíðunum
972973
SponsorBlock Settings:
973974
UseDeArrowTitles: Skipta út titlum myndskeiða fyrir titla sem notendur hafa sent inn á DeArrow.
974975
UseDeArrowThumbnails: Skipta út smámyndum myndskeiða fyrir smámyndir frá DeArrow.

0 commit comments

Comments
 (0)