Skip to content

Commit 9e395f0

Browse files
committed
Merge branch 'development' into custom-builds/tmp
* development: (153 commits) Migrate FtTimestampCatcher to the composition API (FreeTubeApp#6064) Translated using Weblate (Polish) Added functionality to export a single playlist (FreeTubeApp#5779) Fix video player displaying a vertical scrollbar when context menu outside player container (FreeTubeApp#6075) Fix use of deprecated Invidious route on the videos subscription tab (FreeTubeApp#6057) Apply active FreeTube theme to shaka-player menus (FreeTubeApp#5986) Bump sass from 1.80.4 to 1.80.6 (FreeTubeApp#6071) Bump mini-css-extract-plugin from 2.9.1 to 2.9.2 (FreeTubeApp#6068) Translated using Weblate (Vietnamese) Bump webpack from 5.95.0 to 5.96.1 (FreeTubeApp#6069) Translated using Weblate (Vietnamese) Bump sass-loader from 16.0.2 to 16.0.3 (FreeTubeApp#6070) Bump lefthook from 1.8.1 to 1.8.2 (FreeTubeApp#6067) Bump the eslint group with 2 updates (FreeTubeApp#6066) Bump youtubei.js from 11.0.0 to 11.0.1 (FreeTubeApp#6072) Migrate PasswordSettings and PasswordDialog to the composition API (FreeTubeApp#6036) Add some missing jsdoc comments, add jsdoc eslint plugin (FreeTubeApp#6048) Fix shortcut for macOS setting shortcut in video page (FreeTubeApp#6054) Use decodingInfo's powerEfficient property when picking streams (FreeTubeApp#6061) Translated using Weblate (Afrikaans) ...
2 parents ab96588 + 9f58f03 commit 9e395f0

File tree

165 files changed

+4914
-5819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+4914
-5819
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: Discussions
4-
url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/general
4+
url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/general
55
about: View discussions or start one yourself
66
- name: Questions
7-
url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/q-a
7+
url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/q-a
88
about: Ask and answer questions
99
- name: Matrix Community
1010
url: https://matrix.to/#/+freetube:matrix.org

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ body:
3434
- type: textarea
3535
attributes:
3636
label: Alternatives Considered
37-
description: A clear and concise description of any alternative solutions or features you've considered.
37+
description: A clear and concise description of any alternative solutions or features you've considered.
3838
validations:
3939
required: true
4040
- type: dropdown

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ updates:
2020
- "@eslint/*"
2121
- "yaml-eslint-parser"
2222
- "vue-eslint-parser"
23+
- "neostandard"
2324
stylelint:
2425
patterns:
2526
- "stylelint"

.github/workflows/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ jobs:
8686
with:
8787
version: ${{ steps.versionNumber.outputs.result }}
8888

89-
9089
- name: Install libarchive-tools
9190
if: startsWith(matrix.os, 'ubuntu')
9291
run: sudo apt -y install libarchive-tools; echo "Version Number ${{ toJson(job) }} ${{ toJson(needs) }}"

.github/workflows/codeql.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@ jobs:
3737
# If you wish to specify custom queries, you can do so here or in a config file.
3838
# By default, queries listed here will override any specified in a config file.
3939
# Prefix the list here with "+" to use these queries and those in the config file.
40-
40+
4141
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
4242
# queries: security-extended,security-and-quality
4343

44-
4544
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4645
# If this step fails, then you should remove it and run the build manually (see below)
4746
- name: Autobuild
@@ -50,7 +49,7 @@ jobs:
5049
# ℹ️ Command-line programs to run using the OS shell.
5150
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
5251

53-
# If the Autobuild fails above, remove it and uncomment the following three lines.
52+
# If the Autobuild fails above, remove it and uncomment the following three lines.
5453
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
5554

5655
# - run: |

.github/workflows/conflicts.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ jobs:
2020
repoToken: "${{ secrets.GITHUB_TOKEN }}"
2121
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
2222
commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
23-

.github/workflows/no-response.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
name: No Response
2-
3-
# Both `issue_comment` and `scheduled` event types are required for this Action
4-
# to work properly.
5-
on:
6-
issue_comment:
7-
types: [created]
8-
schedule:
9-
# Run daily at midnight.
10-
- cron: '0 0 * * *'
11-
12-
jobs:
13-
noResponse:
14-
runs-on: ubuntu-latest
15-
steps:
16-
- uses: lee-dohm/[email protected]
17-
with:
18-
token: ${{ github.token }}
19-
closeComment: >
20-
This issue has been automatically closed because there has been no response to our request for more information from the original author.
21-
With only the information that is currently in the issue, we don't have enough information to take action.
22-
Please reach out if you have or find the answers we need so that we can investigate further.
23-
daysUntilClose: 14
24-
responseRequiredLabel: "U: Waiting for Response from Author"
1+
name: No Response
2+
3+
# Both `issue_comment` and `scheduled` event types are required for this Action
4+
# to work properly.
5+
on:
6+
issue_comment:
7+
types: [created]
8+
schedule:
9+
# Run daily at midnight.
10+
- cron: '0 0 * * *'
11+
12+
jobs:
13+
noResponse:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: lee-dohm/[email protected]
17+
with:
18+
token: ${{ github.token }}
19+
closeComment: >
20+
This issue has been automatically closed because there has been no response to our request for more information from the original author.
21+
With only the information that is currently in the issue, we don't have enough information to take action.
22+
Please reach out if you have or find the answers we need so that we can investigate further.
23+
daysUntilClose: 14
24+
responseRequiredLabel: "U: Waiting for Response from Author"

.github/workflows/release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,4 +349,3 @@ jobs:
349349
# asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.zip
350350
# asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.zip
351351
# asset_content_type: application/x-apple-diskimage
352-
Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
1-
name: Remove outdated labels
2-
on:
3-
pull_request_target:
4-
types:
5-
- closed
6-
- converted_to_draft
7-
- ready_for_review
8-
jobs:
9-
remove-merged-pr-labels:
10-
name: Remove merged pull request labels
11-
if: github.event.pull_request.merged
12-
runs-on: ubuntu-latest
13-
steps:
14-
- uses: mondeja/[email protected]
15-
with:
16-
token: ${{ secrets.GITHUB_TOKEN }}
17-
labels: |
18-
PR: waiting for review
19-
PR: WIP
20-
PR: changes requested
21-
PR: merge conflicts / rebase needed
22-
PR/Issue: dependent
23-
PR: stale
24-
25-
remove-closed-pr-labels:
26-
name: Remove closed pull request labels
27-
if: github.event_name == 'pull_request_target' && (! github.event.pull_request.merged) && (github.event.action != 'converted_to_draft') && (github.event.action != 'ready_for_review')
28-
runs-on: ubuntu-latest
29-
steps:
30-
- uses: mondeja/[email protected]
31-
with:
32-
token: ${{ secrets.GITHUB_TOKEN }}
33-
labels: |
34-
PR: waiting for review
35-
PR: WIP
36-
PR: changes requested
37-
PR: merge conflicts / rebase needed
38-
PR/Issue: dependent
39-
PR: stale
40-
41-
remove-draft-pr-labels:
42-
name: Remove labels from draft pull requests
43-
if: github.event_name == 'pull_request_target' && github.event.action == 'converted_to_draft'
44-
runs-on: ubuntu-latest
45-
steps:
46-
- uses: mondeja/[email protected]
47-
with:
48-
token: ${{ secrets.GITHUB_TOKEN }}
49-
labels: |
50-
PR: waiting for review
51-
52-
remove-ready-pr-labels:
53-
name: Remove labels when draft pr is marked ready for review
54-
if: github.event_name == 'pull_request_target' && github.event.action == 'ready_for_review'
55-
runs-on: ubuntu-latest
56-
steps:
57-
- uses: mondeja/[email protected]
58-
with:
59-
token: ${{ secrets.GITHUB_TOKEN }}
60-
labels: |
61-
PR: WIP
1+
name: Remove outdated labels
2+
on:
3+
pull_request_target:
4+
types:
5+
- closed
6+
- converted_to_draft
7+
- ready_for_review
8+
jobs:
9+
remove-merged-pr-labels:
10+
name: Remove merged pull request labels
11+
if: github.event.pull_request.merged
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: mondeja/[email protected]
15+
with:
16+
token: ${{ secrets.GITHUB_TOKEN }}
17+
labels: |
18+
PR: waiting for review
19+
PR: WIP
20+
PR: changes requested
21+
PR: merge conflicts / rebase needed
22+
PR/Issue: dependent
23+
PR: stale
24+
25+
remove-closed-pr-labels:
26+
name: Remove closed pull request labels
27+
if: github.event_name == 'pull_request_target' && (! github.event.pull_request.merged) && (github.event.action != 'converted_to_draft') && (github.event.action != 'ready_for_review')
28+
runs-on: ubuntu-latest
29+
steps:
30+
- uses: mondeja/[email protected]
31+
with:
32+
token: ${{ secrets.GITHUB_TOKEN }}
33+
labels: |
34+
PR: waiting for review
35+
PR: WIP
36+
PR: changes requested
37+
PR: merge conflicts / rebase needed
38+
PR/Issue: dependent
39+
PR: stale
40+
41+
remove-draft-pr-labels:
42+
name: Remove labels from draft pull requests
43+
if: github.event_name == 'pull_request_target' && github.event.action == 'converted_to_draft'
44+
runs-on: ubuntu-latest
45+
steps:
46+
- uses: mondeja/[email protected]
47+
with:
48+
token: ${{ secrets.GITHUB_TOKEN }}
49+
labels: |
50+
PR: waiting for review
51+
52+
remove-ready-pr-labels:
53+
name: Remove labels when draft pr is marked ready for review
54+
if: github.event_name == 'pull_request_target' && github.event.action == 'ready_for_review'
55+
runs-on: ubuntu-latest
56+
steps:
57+
- uses: mondeja/[email protected]
58+
with:
59+
token: ${{ secrets.GITHUB_TOKEN }}
60+
labels: |
61+
PR: WIP

.prettierrc

Lines changed: 0 additions & 7 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ longer track you using cookies or JavaScript. Your subscriptions and history are
5959
* Option to show only family friendly content
6060
* Show/hide functionality or elements within the app using the distraction free settings
6161
* View channel community posts
62-
* View most age restricted videos
6362

6463
### Browser Extension
6564
FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect) and [LibRedirect](https://github.com/libredirect/libredirect) extensions, which will allow you to open YouTube links into FreeTube.

_scripts/ProcessLocalesPlugin.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ class ProcessLocalesPlugin {
2626
}
2727
this.outputDir = options.outputDir
2828

29-
/** @type {Map<str, any>} */
29+
/** @type {Map<string, any>} */
3030
this.locales = new Map()
3131
this.localeNames = []
3232

33-
/** @type {Map<str, any>} */
33+
/** @type {Map<string, any>} */
3434
this.cache = new Map()
3535

3636
this.filePaths = []
@@ -45,7 +45,7 @@ class ProcessLocalesPlugin {
4545

4646
/** @param {import('webpack').Compiler} compiler */
4747
apply(compiler) {
48-
const { CachedSource, RawSource } = compiler.webpack.sources;
48+
const { CachedSource, RawSource } = compiler.webpack.sources
4949
const { Compilation, DefinePlugin } = compiler.webpack
5050

5151
new DefinePlugin({
@@ -59,7 +59,6 @@ class ProcessLocalesPlugin {
5959
name: PLUGIN_NAME,
6060
stage: Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
6161
}, async (_assets) => {
62-
6362
// While running in the webpack dev server, this hook gets called for every incremental build.
6463
// For incremental builds we can return the already processed versions, which saves time
6564
// and makes webpack treat them as cached

_scripts/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if (platform === 'darwin') {
1616
arch = Arch.arm64
1717
}
1818

19-
targets = Platform.MAC.createTarget(['DMG','zip', '7z'], arch)
19+
targets = Platform.MAC.createTarget(['DMG', 'zip', '7z'], arch)
2020
} else if (platform === 'win32') {
2121
let arch = Arch.x64
2222

_scripts/dev-runner.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ async function restartElectron() {
8888
*/
8989
function setupNotifyLocaleUpdate(compiler, devServer) {
9090
const notifyLocaleChange = (updatedLocales) => {
91-
devServer.sendMessage(devServer.webSocketServer.clients, "freetube-locale-update", updatedLocales)
91+
devServer.sendMessage(devServer.webSocketServer.clients, 'freetube-locale-update', updatedLocales)
9292
}
9393

9494
compiler.options.plugins

_scripts/ebuilder.config.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ const config = {
1111
},
1212
protocols: [
1313
{
14-
name: "FreeTube",
14+
name: 'FreeTube',
1515
schemes: [
16-
"freetube"
16+
'freetube'
1717
]
1818
}
1919
],
@@ -52,19 +52,19 @@ const config = {
5252
// https://github.com/jordansissel/fpm/issues/1503
5353
// https://github.com/jgraph/drawio-desktop/issues/259
5454
rpm: {
55-
fpm: [`--rpm-rpmbuild-define=_build_id_links none`]
55+
fpm: ['--rpm-rpmbuild-define=_build_id_links none']
5656
},
5757
deb: {
5858
depends: [
59-
"libgtk-3-0",
60-
"libnotify4",
61-
"libnss3",
62-
"libxss1",
63-
"libxtst6",
64-
"xdg-utils",
65-
"libatspi2.0-0",
66-
"libuuid1",
67-
"libsecret-1-0"
59+
'libgtk-3-0',
60+
'libnotify4',
61+
'libnss3',
62+
'libxss1',
63+
'libxtst6',
64+
'xdg-utils',
65+
'libatspi2.0-0',
66+
'libuuid1',
67+
'libsecret-1-0'
6868
]
6969
},
7070
mac: {

_scripts/getRegions.mjs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@
1212
*/
1313

1414
import { mkdirSync, readFileSync, rmSync, writeFileSync } from 'fs'
15-
import { dirname } from 'path'
16-
import { fileURLToPath } from 'url'
1715
import { Innertube, Misc } from 'youtubei.js'
1816

19-
const STATIC_DIRECTORY = `${dirname(fileURLToPath(import.meta.url))}/../static`
17+
const STATIC_DIRECTORY = `${import.meta.dirname}/../static`
2018

2119
const activeLanguagesPath = `${STATIC_DIRECTORY}/locales/activeLocales.json`
2220
/** @type {string[]} */
@@ -46,6 +44,7 @@ for (const language of youTubeLanguages) {
4644
youTube: language,
4745
freeTube: language
4846
})
47+
// eslint-disable-next-line @stylistic/brace-style
4948
}
5049
// special cases
5150
else if (language === 'de') {
@@ -120,8 +119,6 @@ for (const { youTube, freeTube } of languagesToScrape) {
120119
processGeolocations(freeTube, youTube, response)
121120
}
122121

123-
124-
125122
async function scrapeLanguage(youTubeLanguageCode) {
126123
const session = await Innertube.create({
127124
retrieve_player: false,

_scripts/getShakaLocales.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function getMappings(shakaLocales, freeTubeLocales) {
3232
* @type {[string, string][]}
3333
* Using this structure as it gets passed to `new Map()` in the player component
3434
* The first element is the FreeTube locale, the second one is the shaka-player one
35-
**/
35+
*/
3636
const mappings = []
3737

3838
for (const locale of freeTubeLocales) {

0 commit comments

Comments
 (0)