Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: merge YouTube-Music-Next fork into mainstream #1259

Merged
merged 105 commits into from
Oct 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
170e2a6
cherry-picked: Fixed canvas injected at the wrong position
JellyBrick Sep 27, 2023
6bb3345
feat: Album Color Theme plugin
JellyBrick Sep 27, 2023
8fa1c7e
Merge branch 'feat/typescript' into custom-version
JellyBrick Sep 29, 2023
8d475ed
Merge branch 'feat/typescript' into custom-version
JellyBrick Sep 29, 2023
92ecf6a
fix(album-color-theme): dynamic lightness
JellyBrick Sep 30, 2023
8fd6bdb
fix(album-color-theme): use 30 instead of 25
JellyBrick Sep 30, 2023
1067417
Merge branch 'feat/typescript' into custom-version
JellyBrick Sep 30, 2023
e3d41cc
chore(Actions): update workflows
JellyBrick Sep 30, 2023
b714200
fix: release
JellyBrick Sep 30, 2023
c11ec33
release 1.20.1
JellyBrick Sep 30, 2023
35f6064
fix(actions-linux): release
JellyBrick Sep 30, 2023
549f0f7
Merge branch 'feat/typescript' into custom-version
JellyBrick Sep 30, 2023
7224620
fix(actions): fix release upload
JellyBrick Sep 30, 2023
faaf54d
Update changelog for v1.20.1
JellyBrick Sep 30, 2023
10049d1
chore: update README
JellyBrick Oct 1, 2023
40fa1ba
fix: CVE-2023-4863, CVE-2023-5129
JellyBrick Oct 1, 2023
71f2123
release 1.20.2
JellyBrick Oct 1, 2023
70b5e57
chore: Update index.html
JellyBrick Oct 1, 2023
5cd2e78
release 1.20.3: fix updater download link
JellyBrick Oct 1, 2023
4118b4b
Update changelog for v1.20.3
JellyBrick Oct 1, 2023
f655cdf
fix: fix #7
JellyBrick Oct 2, 2023
61b04e9
fix: fix #4
JellyBrick Oct 2, 2023
042083b
feat(disable-autoplay): add `apply once`, resolve #9
JellyBrick Oct 2, 2023
aed1bbc
fix(lyrics-genius): fix th-ch/youtube-music#1253
Su-Yong Oct 2, 2023
a5fe8bc
feat(precise-volume): add shadow on volume text
Su-Yong Oct 2, 2023
5a7774e
refactor(in-app-menu): refactor in-app-menu plugin
Su-Yong Oct 2, 2023
2cb05c9
fix(in-app-menu): overlay-scrollbar
JellyBrick Oct 3, 2023
2fe391b
Merge branch 'feat/typescript' into custom-version
JellyBrick Oct 3, 2023
831aa3d
feat: add startingPage unset option
JellyBrick Oct 3, 2023
bc40fc3
fix: remove FluentScrollbar
JellyBrick Oct 3, 2023
7af418a
fix(in-app-menu): fix titlebar margin
Su-Yong Oct 3, 2023
2c38b8a
fix(tuna-obs): change to not print messages when not in development mode
JellyBrick Oct 3, 2023
b9ea98c
fix(in-app-menu): remove unused observer
JellyBrick Oct 3, 2023
76c5704
fix: Mitigation for issue #2
JellyBrick Oct 3, 2023
45b7422
release 1.20.4
JellyBrick Oct 3, 2023
16a32d1
Update changelog for v1.20.4
JellyBrick Oct 3, 2023
399c6e3
fix(video-toggle): fix video config not load config
Su-Yong Oct 3, 2023
6eadc7f
fix(precise-volume): fix slider ui does not sync
Su-Yong Oct 3, 2023
9438cd8
fix: resolve #12
Su-Yong Oct 3, 2023
6e315b9
refactor: remove dynamic require (partial of #2)
JellyBrick Oct 3, 2023
1a2f200
Merge branch 'custom-version' of https://github.com/organization/yout…
JellyBrick Oct 3, 2023
61cb313
fix(macos): fix some plugins not working in macos
Su-Yong Oct 3, 2023
2c33795
fix(album-color-theme): fix album-color-theme not working in macos
Su-Yong Oct 3, 2023
40745d3
feat: apply rollup 🚀 (#20)
JellyBrick Oct 4, 2023
127e325
release 2.0.0
JellyBrick Oct 4, 2023
548f82b
fix rollup hanging
JellyBrick Oct 4, 2023
a7fd8bc
feat: configure renovate
JellyBrick Oct 4, 2023
9c4aa4b
chore(deps): update actions/checkout action to v4
renovate[bot] Oct 4, 2023
4b7d94b
chore: bump dependencies
JellyBrick Oct 4, 2023
110dbd3
release 2.0.1
JellyBrick Oct 4, 2023
84f6e46
revert "chore(deps): update dependency node-fetch to v3"
JellyBrick Oct 4, 2023
371a7eb
hotfix: fix #28
JellyBrick Oct 4, 2023
7479f2f
feat(ambient-mode): add ambient-mode plugin
Su-Yong Oct 4, 2023
92a3a55
fix: fix #30
JellyBrick Oct 4, 2023
e86739c
fix: fix #29
JellyBrick Oct 4, 2023
ca31845
release 2.0.2
JellyBrick Oct 4, 2023
f7a0908
Update changelog for v2.0.2
JellyBrick Oct 4, 2023
81b2303
feat(ambient-mode): add ambient effect interpolation
Su-Yong Oct 4, 2023
78d8160
fix: fix #30
JellyBrick Oct 4, 2023
50117ea
fix: fix #29
JellyBrick Oct 4, 2023
0c948d5
feat(ambient-mode): improve performance
Su-Yong Oct 4, 2023
231514a
fix: fix #32
JellyBrick Oct 4, 2023
edd7b80
fix: fix #34
JellyBrick Oct 4, 2023
95ac01c
Merge pull request #33 from organization/feature/ambient-mode
JellyBrick Oct 4, 2023
bcc7397
release 2.0.3
JellyBrick Oct 4, 2023
1af73a7
Update changelog for v2.0.3
JellyBrick Oct 4, 2023
299f34d
chore: Update readme.md
JellyBrick Oct 5, 2023
09ce665
feat: remove sharp, fast-average-color-node deps
JellyBrick Oct 5, 2023
2cf29fe
Merge pull request #35 from organization/fix/sharp
JellyBrick Oct 5, 2023
7b30896
chore(docs): versioning
JellyBrick Oct 5, 2023
04234f0
Merge pull request #36 from organization/docs/versioning
JellyBrick Oct 5, 2023
3cd1f79
release 2.1.0
JellyBrick Oct 5, 2023
5dfbdd4
Update changelog for v2.1.0
JellyBrick Oct 5, 2023
bf5ac28
chore(deps): update dependency @rollup/plugin-commonjs to v25.0.5
renovate[bot] Oct 5, 2023
947007c
chore(deps): update dependency @rollup/plugin-image to v3.0.3
renovate[bot] Oct 5, 2023
3dda8b7
chore(deps): update dependency @rollup/plugin-json to v6.0.1
renovate[bot] Oct 5, 2023
dcadf0a
chore(deps): update dependency @rollup/plugin-node-resolve to v15.2.2
renovate[bot] Oct 5, 2023
eb7ef7a
chore(deps): update dependency @rollup/plugin-typescript to v11.1.5
renovate[bot] Oct 5, 2023
4488a3a
chore(deps): update dependency @rollup/plugin-terser to v0.4.4
renovate[bot] Oct 5, 2023
6a2b393
chore(deps): update dependency @rollup/plugin-wasm to v6.2.2
renovate[bot] Oct 5, 2023
670ed62
chore(deps): update dependency rollup to v4 (#44)
renovate[bot] Oct 6, 2023
59efba4
chore(deps): update dependency rollup to v4.0.1
renovate[bot] Oct 6, 2023
1806d5a
fix: fix the downloader to work in a proxy environment (resolve #46)
JellyBrick Oct 6, 2023
8acfabf
chore(deps): update dependency rollup to v4.0.2
renovate[bot] Oct 6, 2023
b2c27b9
feat: prepare the fork for merging
JellyBrick Oct 7, 2023
517e9c0
Merge branch 'origin-master' into feat/fork-to-main
JellyBrick Oct 7, 2023
935a307
fix(index): electron.screen -> screen
JellyBrick Oct 7, 2023
dd39bdd
fix(menu): type error
JellyBrick Oct 7, 2023
22491ae
feat: register the lumiaStream plugin
JellyBrick Oct 7, 2023
534f969
fix: beta label for lumiastream
JellyBrick Oct 7, 2023
6757987
fix: call pluginEnabledMenu(pluginName, pluginLabel)
JellyBrick Oct 7, 2023
6bf7f3b
chore: update package-lock.json
JellyBrick Oct 7, 2023
70fa5aa
fix(captions): fix configuration
JellyBrick Oct 7, 2023
9048da2
fix: rollback changelog
JellyBrick Oct 7, 2023
1cc46da
fix: .eslintignore
JellyBrick Oct 7, 2023
275d8cb
fix: build.yml
JellyBrick Oct 7, 2023
30e0e99
remove: versioning.md
JellyBrick Oct 7, 2023
7dac9a2
fix: need copying error.html to dist directory
JellyBrick Oct 7, 2023
ca11120
fix: remove title check
JellyBrick Oct 7, 2023
a273d13
chore(deps): update dependency eslint to v8.51.0
renovate[bot] Oct 6, 2023
11ac756
chore(deps): update stefanzweifel/git-auto-commit-action action to v5
renovate[bot] Oct 6, 2023
97297a2
Merge remote-tracking branch 'origin/custom-version' into feat/fork-t…
JellyBrick Oct 7, 2023
0bcfdbf
chore: update README
JellyBrick Oct 7, 2023
d45ca96
feat(in-app-menu): add toggle-menu
JellyBrick Oct 7, 2023
0442e42
feat: rename `Proxy` label to `Set Proxy`
JellyBrick Oct 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
.eslintrc.js
rollup.main.config.ts
rollup.preload.config.ts
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,21 @@ jobs:
- name: Build and release on Mac
if: startsWith(matrix.os, 'macOS') && github.repository == 'th-ch/youtube-music'
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
npm run release:mac

- name: Build and release on Linux
if: startsWith(matrix.os, 'ubuntu') && github.repository == 'th-ch/youtube-music'
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
npm run release:linux

- name: Build and release on Windows
if: startsWith(matrix.os, 'windows') && github.repository == 'th-ch/youtube-music'
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
npm run release:win

Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
uses: cardinalby/git-get-release-action@v1
id: get_draft_release
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
latest: true
draft: true
Expand All @@ -117,7 +117,7 @@ jobs:
if: ${{ env.VERSION_HASH == '' }}
uses: irongut/[email protected]
with:
token: ${{ secrets.GH_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
id: ${{ steps.get_draft_release.outputs.id }}
draft: false
prerelease: false
Expand All @@ -136,7 +136,7 @@ jobs:

- name: Commit changelog
if: ${{ env.VERSION_HASH == '' }}
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Update changelog for ${{ env.VERSION_TAG }}
file_pattern: "changelog.md"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Checkout Repository"
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: "Dependency Review"
uses: actions/dependency-review-action@v3
3 changes: 3 additions & 0 deletions assets/menu.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/youtube-music.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
125 changes: 69 additions & 56 deletions config/defaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,37 +65,46 @@ const defaultConfig = {
proxy: '',
startingPage: '',
overrideUserAgent: false,
themes: {} as string[],
themes: [] as string[],
},
/** please order alphabetically */
'plugins': {
// Enabled plugins
'navigation': {
enabled: true,
},
'adblocker': {
enabled: true,
cache: true,
blocker: 'With blocklists',
additionalBlockLists: [], // Additional list of filters, e.g "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt"
disableDefaultLists: [],
disableDefaultLists: false,
},
'album-color-theme': {},
'ambient-mode': {},
'lumiastream': {},
// Disabled plugins
'shortcuts': {
'audio-compressor': {},
'blur-nav-bar': {},
'bypass-age-restrictions': {},
'captions-selector': {
enabled: false,
overrideMediaKeys: false,
global: {
previous: '',
playPause: '',
next: '',
} as Record<string, string>,
local: {
previous: '',
playPause: '',
next: '',
} as Record<string, string>,
disableCaptions: false,
autoload: false,
lastCaptionsCode: '',
},
'compact-sidebar': {},
'crossfade': {
enabled: false,
fadeInDuration: 1500, // Ms
fadeOutDuration: 5000, // Ms
secondsBeforeEnd: 10, // S
fadeScaling: 'linear', // 'linear', 'logarithmic' or a positive number in dB
},
'disable-autoplay': {
applyOnce: false,
},
'discord': {
enabled: false,
autoReconnect: true, // If enabled, will try to reconnect to discord every 5 seconds after disconnecting or failing to connect
activityTimoutEnabled: true, // If enabled, the discord rich presence gets cleared when music paused after the time specified below
activityTimoutTime: 10 * 60 * 1000, // 10 minutes
listenAlong: true, // Add a "listen along" button to rich presence
hideDurationLeft: false, // Hides the start and end time of the song to rich presence
},
'downloader': {
enabled: false,
Expand All @@ -105,6 +114,8 @@ const defaultConfig = {
skipExisting: false,
playlistMaxItems: undefined as number | undefined,
},
'exponential-volume': {},
'in-app-menu': {},
'last-fm': {
enabled: false,
token: undefined as string | undefined, // Token used for authentication
Expand All @@ -113,17 +124,14 @@ const defaultConfig = {
api_key: '04d76faaac8726e60988e14c105d421a', // Api key registered by @semvis123
secret: 'a5d2a36fdf64819290f6982481eaffa2',
},
'lyric-genius': {
'lumiastream': {},
'lyrics-genius': {
romanizedLyrics: false,
},
'discord': {
enabled: false,
autoReconnect: true, // If enabled, will try to reconnect to discord every 5 seconds after disconnecting or failing to connect
activityTimoutEnabled: true, // If enabled, the discord rich presence gets cleared when music paused after the time specified below
activityTimoutTime: 10 * 60 * 1000, // 10 minutes
listenAlong: true, // Add a "listen along" button to rich presence
hideDurationLeft: false, // Hides the start and end time of the song to rich presence
'navigation': {
enabled: true,
},
'no-google-login': {},
'notifications': {
enabled: false,
unpauseNotification: false,
Expand All @@ -135,6 +143,18 @@ const defaultConfig = {
trayControls: true,
hideButtonText: false,
},
'picture-in-picture': {
'enabled': false,
'alwaysOnTop': true,
'savePosition': true,
'saveSize': false,
'hotkey': 'P',
'pip-position': [10, 10],
'pip-size': [450, 275],
'isInPiP': false,
'useNativePiP': false,
},
'playback-speed': {},
'precise-volume': {
enabled: false,
steps: 1, // Percentage of volume to change
Expand All @@ -145,6 +165,24 @@ const defaultConfig = {
},
savedVolume: undefined as number | undefined, // Plugin save volume between session here
},
'quality-changer': {},
'shortcuts': {
enabled: false,
overrideMediaKeys: false,
global: {
previous: '',
playPause: '',
next: '',
} as Record<string, string>,
local: {
previous: '',
playPause: '',
next: '',
} as Record<string, string>,
},
'skip-silences': {
onlySkipBeginning: false,
},
'sponsorblock': {
enabled: false,
apiURL: 'https://sponsor.ajay.app',
Expand All @@ -157,41 +195,16 @@ const defaultConfig = {
'music_offtopic',
],
},
'taskbar-mediacontrol': {},
'touchbar': {},
'tuna-obs': {},
'video-toggle': {
enabled: false,
hideVideo: false,
mode: 'custom',
forceHide: false,
align: '',
},
'picture-in-picture': {
'enabled': false,
'alwaysOnTop': true,
'savePosition': true,
'saveSize': false,
'hotkey': 'P',
'pip-position': [10, 10],
'pip-size': [450, 275],
'isInPiP': false,
'useNativePiP': false,
},
'captions-selector': {
enabled: false,
disableCaptions: false,
autoload: false,
lastCaptionsCode: '',
disabledCaptions: false,
},
'skip-silences': {
onlySkipBeginning: false,
},
'crossfade': {
enabled: false,
fadeInDuration: 1500, // Ms
fadeOutDuration: 5000, // Ms
secondsBeforeEnd: 10, // S
fadeScaling: 'linear', // 'linear', 'logarithmic' or a positive number in dB
},
'visualizer': {
enabled: false,
type: 'butterchurn',
Expand Down
6 changes: 3 additions & 3 deletions config/dynamic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import { getOptions, setMenuOptions, setOptions } from './plugins';
import { sendToFront } from '../providers/app-controls';
import { Entries } from '../utils/type-utils';

type DefaultPluginsConfig = typeof defaultConfig.plugins;
type OneOfDefaultConfigKey = keyof DefaultPluginsConfig;
type OneOfDefaultConfig = typeof defaultConfig.plugins[OneOfDefaultConfigKey];
export type DefaultPluginsConfig = typeof defaultConfig.plugins;
export type OneOfDefaultConfigKey = keyof DefaultPluginsConfig;
export type OneOfDefaultConfig = typeof defaultConfig.plugins[OneOfDefaultConfigKey];

// eslint-disable-next-line @typescript-eslint/no-explicit-any
const activePlugins: { [key in OneOfDefaultConfigKey]?: PluginConfig<any> } = {};
Expand Down
Loading
Loading