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

fix(lyrics-plus): switch to wg:// protocol for colors #1631

Merged
merged 1 commit into from
Apr 29, 2022
Merged

fix(lyrics-plus): switch to wg:// protocol for colors #1631

merged 1 commit into from
Apr 29, 2022

Conversation

huhridge
Copy link
Contributor

This is just more reliable and fetches the color regardless of, if the lyrics are present, unlike the old "fix".

@rxri rxri changed the title switch to wg:// protocol for background in lyrics-plus fix(lyrics-plus): switch to wg:// protocol for colors Apr 29, 2022
@rxri rxri merged commit 916fb62 into spicetify:master Apr 29, 2022
@huhridge huhridge deleted the lyrics-plus branch April 29, 2022 15:53
CharlieS1103 added a commit that referenced this pull request May 13, 2022
* feat: add path for void linux (#1534)

* fix: patch part of menu hook (#1529)

Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>

* fix: `fullAppDisplay` album info & background (#1543)

* temporary solution for #1538

As the hermes protocol is broken `1.1.81` onwards, this can "fix" the issue. Now the lyrics-plus background will always match spotify lyrics background.

Maybe, in the future, there is a way to restore the old colorextractor.

* updated `fullAppDisplay` to source album info 1.1.81 onwards

Again, hermes protocol gone, fixed album info

* removed obsolete code from `fullAppDisplay` and `lyrics-plus`

Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>

* upgrade: Go 1.18 (#1547)

Signed-off-by: Moulick Aggarwal <moulickaggarwal@gmail.com>

* fix: menu hook and menu item hook patches (#1548)

* Patch part of Menu hook

* Patch Menu Item hook! ISSUE RESOLVED

* chore(shuffle+): updated api (#1559)

`hm://` protocol deprecated, used alternatives to fetch album's and artist's data.

* fix(fullAppDisplay): background for full screen display on a vertical monitor (#1560)

* Fix background for full screen display on a vertical monitor

* Fix code formatting

Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>

* chore: restructure install.sh (#1535)

* change script

* add adding to shell profile

* add arm64

* remove arm64 and add aarch64

Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>

* fix: `New Releases` custom app for Spotify 1.1.81+ (#1563)

* Fix `New Releases` custom app for Spotify 1.1.81+

- Based on proposed fix for `Shuffle+` (#1559)
- Fixes #1539 #1530 

Notes:
- Can probably be written nicer - this is my scuffed attempt to fix it
- May or may not actually show all new releases for all followed artists - have over 665 of them but I don't think I'm getting all of them (see below)
- May or may not return `error 500` (added `.catch()` block keeps it from breaking whole custom app)

* Minimize `internal server error: 500`...

...for big libraries of followed artists.

Changes:
- Change `URL` to query only discographies
- Limit amount of queried albums to 5

Notes:
- This does **NOT** fixes erroring fully - it only maxes out amount of data you can query before getting rate limited
- The more options you select (ex. albums + EPs + podcasts), the less data you may receive
- To max number of albums received, I recommend to select only `Albums` (since `Singles and EPs` will probably get displayed anyway...)

* Add notifications when error occurred

Notifications added:
- Error code (`500`, `429` etc.)
- Amount of followed artists to fetch releases from
- Amount of followed artists failed to fetch releases from

I guess we have to get along with getting `500-ed` - one time it fetches everything instantly, second time it drops 60 artists...

* "Prettify" file to pass `Prettier` test

* Fix filtering, counter...

- Fixing filtering as no matter was what set in config, it always displayed everything as "Album"
- Fixing "Missing releases from..." counter - should properly reset now

What broke again:
- "Appears on" releases cannot be retrieved with that API endpoint - this filter is just there and doesn't do anything - this prevents from showing everything as "Appears on" etc.

Notes:
- There seem to be an API endpoint for retrieving "Related content" stuff - problem is that would query everything TWICE... which breaks everything even more (and we don't wanna do that)
- If someone knows how to query everything using separate endpoint without doing it 4 times, let me know...

* Forgor `( )`... Oops... 💀

I forgor 💀

* Include requested changes

Changes:
- Properly encode URI including variables
- Make `limit` variable customizable via settings (set default to 5)
- Make error messages as "dev console only"

Notes:
- Errors displayed in console may be a little spammy - if we get error early, there may be lots of lines displaying it + counter...
   * I'm not too sure how to tackle this - just remove them altogether? Or is there a function that could "suppress" them?
   * Switching from normal `log` to `debug` may help a little as they will be only visible if user has set their console log level to include `Verbose`
- Making `limit` customizable may lead to even more errors but fuck it I guess - it's better to have a choice than not, right?
   * It can be manually input via custom app settings (same place where other options are) - there is no list etc. - it's just normal input field
- Set `offset` value as const `0` and not making it customizable (cause why would you want to start searching from ex. 3rd album instead of beginning, right?)
- Leaving `Fetching releases from...` notification cause it looks cool - it's fun to know how many followed artists you have 😆

* add: go formatting to the pipeline (#1574)

* add: go formatting to the pipeline

* formatted missing files

* chore: add print for files with bad formatting

* fix: specific version fetching in install script (#1578)

* chore: enhance specific version fetch (#1582)

* fix: specific version fetching in install script

* fix: Remove unnecessary request when specifying a version

* fix: Allow for input without "v"

* No special print for the latest version

Instead of printing "Latest version", it prints "Version x.y.z"

* chore: better naming of "shortcut"

Co-authored-by: FlafyDev <Flafyarazi@gmail.com>

* chore: added community funding option

* fix: readme links (#1584)

* chore: add bash_profile fallback for bash (#1583)

* chore: add bash_profile fallback for bash

* applied suggested changes

Co-authored-by: wael444 <40663@protonmail.com>

* revert part of the suggested changes

Co-authored-by: wael444 <40663@protonmail.com>

* fix(windows): add missing prefs message (#1571)

* fix: patch prefs on windows

* fix: fix type mismatch

* fix: `New Releases` custom app for Spotify 1.1.81+ (#1563)

* Fix `New Releases` custom app for Spotify 1.1.81+

- Based on proposed fix for `Shuffle+` (#1559)
- Fixes #1539 #1530 

Notes:
- Can probably be written nicer - this is my scuffed attempt to fix it
- May or may not actually show all new releases for all followed artists - have over 665 of them but I don't think I'm getting all of them (see below)
- May or may not return `error 500` (added `.catch()` block keeps it from breaking whole custom app)

* Minimize `internal server error: 500`...

...for big libraries of followed artists.

Changes:
- Change `URL` to query only discographies
- Limit amount of queried albums to 5

Notes:
- This does **NOT** fixes erroring fully - it only maxes out amount of data you can query before getting rate limited
- The more options you select (ex. albums + EPs + podcasts), the less data you may receive
- To max number of albums received, I recommend to select only `Albums` (since `Singles and EPs` will probably get displayed anyway...)

* Add notifications when error occurred

Notifications added:
- Error code (`500`, `429` etc.)
- Amount of followed artists to fetch releases from
- Amount of followed artists failed to fetch releases from

I guess we have to get along with getting `500-ed` - one time it fetches everything instantly, second time it drops 60 artists...

* "Prettify" file to pass `Prettier` test

* Fix filtering, counter...

- Fixing filtering as no matter was what set in config, it always displayed everything as "Album"
- Fixing "Missing releases from..." counter - should properly reset now

What broke again:
- "Appears on" releases cannot be retrieved with that API endpoint - this filter is just there and doesn't do anything - this prevents from showing everything as "Appears on" etc.

Notes:
- There seem to be an API endpoint for retrieving "Related content" stuff - problem is that would query everything TWICE... which breaks everything even more (and we don't wanna do that)
- If someone knows how to query everything using separate endpoint without doing it 4 times, let me know...

* Forgor `( )`... Oops... 💀

I forgor 💀

* Include requested changes

Changes:
- Properly encode URI including variables
- Make `limit` variable customizable via settings (set default to 5)
- Make error messages as "dev console only"

Notes:
- Errors displayed in console may be a little spammy - if we get error early, there may be lots of lines displaying it + counter...
   * I'm not too sure how to tackle this - just remove them altogether? Or is there a function that could "suppress" them?
   * Switching from normal `log` to `debug` may help a little as they will be only visible if user has set their console log level to include `Verbose`
- Making `limit` customizable may lead to even more errors but fuck it I guess - it's better to have a choice than not, right?
   * It can be manually input via custom app settings (same place where other options are) - there is no list etc. - it's just normal input field
- Set `offset` value as const `0` and not making it customizable (cause why would you want to start searching from ex. 3rd album instead of beginning, right?)
- Leaving `Fetching releases from...` notification cause it looks cool - it's fun to know how many followed artists you have 😆

* add: go formatting to the pipeline (#1574)

* add: go formatting to the pipeline

* formatted missing files

* chore: add print for files with bad formatting

* style(utils/config): make file prettier

Signed-off-by: ririxidev <mail@ririxi.dev>

* run go fmt

Co-authored-by: Łukasz Ordon <lukaszordon21@gmail.com>
Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Co-authored-by: ririxidev <mail@ririxi.dev>

* fix(new-releases): switch to `wg://` protocol (#1590)

* fix(lyrics): switch to `wg://` protocol (#1587)

* fix: change protocol to wg://

* Fixes issues with getting spotify lyrics on lyrics-plus & popupLyrics
* Add @ts-nocheck on popupLyrics

Fixes #1566

* style: change wording when no lyrics

* Update Extensions/popupLyrics.js

Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>

* fixed prettier error

Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>

* fix: Fix hooks for Spotify 1.1.83 (#1600)

* Fix (New-Releases) : Cards Being Displayed Incorrectly (#1606)

Due to the CSS Change In 1.1.83+, song cards were being displayed incorrectly.

* fix(devtools): use new method to enable devtools (#1613)

* Update css-map.json with latest main-trackInfo-* (#1610)

* fix(devtools): overwrite homePath if snap detected (#1614)

* fix: modify filePath from .config to .cache (#1618)

Co-authored-by: ririxi <mail@ririxi.dev>

* fix(keyboardShortcut): update selector (#1617)

* fix queue shortcut

* change to double quote

* feat(restart): check if process is running (#1623)

* fix: Lyrics Plus not showing full lyrics (#1627)

* fix(lyrics-plus): add null check (#1630)

* fix(lyrics-plus): switch to `wg://` protocol for colors (#1631)

* fix(wrapper): adapt few functions to `wg://` protocol (#1632)

* fix: adapt urls in custom app & extensions to `wg://` protocol (#1633)

* chore(lyrics-plus): use DOMParser to parse the genius (#1636)

* fix(devtools): patch another location (#1647)

* fix(sidebar-config): get elements by classname (#1654)

Co-authored-by: wael444 <40663@protonmail.com>
Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Co-authored-by: huhridge <67046436+huhridge@users.noreply.github.com>
Co-authored-by: Moulick Aggarwal <Moulick@users.noreply.github.com>
Co-authored-by: kwerdenker <sebastian.spindler@gmail.com>
Co-authored-by: Łukasz Ordon <lukaszordon21@gmail.com>
Co-authored-by: FlafyDev <Flafyarazi@gmail.com>
Co-authored-by: The Blob SCP <81673375+theblobscp@users.noreply.github.com>
Co-authored-by: ririxidev <mail@ririxi.dev>
Co-authored-by: itsmeow <itsmeow@itsmeow.dev>
Co-authored-by: ExHigh <exhigh01@gmail.com>
Co-authored-by: Julien <182520+JulienMaille@users.noreply.github.com>
Co-authored-by: Kafva <36083692+Kafva@users.noreply.github.com>
Co-authored-by: ajiou <35028055+ajiou@users.noreply.github.com>
Co-authored-by: Nam Anh <77577746+kyrie25@users.noreply.github.com>
Co-authored-by: Jeroen <36192730+jeroentvb@users.noreply.github.com>
CharlieS1103 added a commit that referenced this pull request May 13, 2022
* feat: add path for void linux (#1534)

* fix: patch part of menu hook (#1529)

Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>

* fix: `fullAppDisplay` album info & background (#1543)

* temporary solution for #1538

As the hermes protocol is broken `1.1.81` onwards, this can "fix" the issue. Now the lyrics-plus background will always match spotify lyrics background.

Maybe, in the future, there is a way to restore the old colorextractor.

* updated `fullAppDisplay` to source album info 1.1.81 onwards

Again, hermes protocol gone, fixed album info

* removed obsolete code from `fullAppDisplay` and `lyrics-plus`

Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>

* upgrade: Go 1.18 (#1547)

Signed-off-by: Moulick Aggarwal <moulickaggarwal@gmail.com>

* fix: menu hook and menu item hook patches (#1548)

* Patch part of Menu hook

* Patch Menu Item hook! ISSUE RESOLVED

* chore(shuffle+): updated api (#1559)

`hm://` protocol deprecated, used alternatives to fetch album's and artist's data.

* fix(fullAppDisplay): background for full screen display on a vertical monitor (#1560)

* Fix background for full screen display on a vertical monitor

* Fix code formatting

Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>

* chore: restructure install.sh (#1535)

* change script

* add adding to shell profile

* add arm64

* remove arm64 and add aarch64

Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>

* fix: `New Releases` custom app for Spotify 1.1.81+ (#1563)

* Fix `New Releases` custom app for Spotify 1.1.81+

- Based on proposed fix for `Shuffle+` (#1559)
- Fixes #1539 #1530 

Notes:
- Can probably be written nicer - this is my scuffed attempt to fix it
- May or may not actually show all new releases for all followed artists - have over 665 of them but I don't think I'm getting all of them (see below)
- May or may not return `error 500` (added `.catch()` block keeps it from breaking whole custom app)

* Minimize `internal server error: 500`...

...for big libraries of followed artists.

Changes:
- Change `URL` to query only discographies
- Limit amount of queried albums to 5

Notes:
- This does **NOT** fixes erroring fully - it only maxes out amount of data you can query before getting rate limited
- The more options you select (ex. albums + EPs + podcasts), the less data you may receive
- To max number of albums received, I recommend to select only `Albums` (since `Singles and EPs` will probably get displayed anyway...)

* Add notifications when error occurred

Notifications added:
- Error code (`500`, `429` etc.)
- Amount of followed artists to fetch releases from
- Amount of followed artists failed to fetch releases from

I guess we have to get along with getting `500-ed` - one time it fetches everything instantly, second time it drops 60 artists...

* "Prettify" file to pass `Prettier` test

* Fix filtering, counter...

- Fixing filtering as no matter was what set in config, it always displayed everything as "Album"
- Fixing "Missing releases from..." counter - should properly reset now

What broke again:
- "Appears on" releases cannot be retrieved with that API endpoint - this filter is just there and doesn't do anything - this prevents from showing everything as "Appears on" etc.

Notes:
- There seem to be an API endpoint for retrieving "Related content" stuff - problem is that would query everything TWICE... which breaks everything even more (and we don't wanna do that)
- If someone knows how to query everything using separate endpoint without doing it 4 times, let me know...

* Forgor `( )`... Oops... 💀

I forgor 💀

* Include requested changes

Changes:
- Properly encode URI including variables
- Make `limit` variable customizable via settings (set default to 5)
- Make error messages as "dev console only"

Notes:
- Errors displayed in console may be a little spammy - if we get error early, there may be lots of lines displaying it + counter...
   * I'm not too sure how to tackle this - just remove them altogether? Or is there a function that could "suppress" them?
   * Switching from normal `log` to `debug` may help a little as they will be only visible if user has set their console log level to include `Verbose`
- Making `limit` customizable may lead to even more errors but fuck it I guess - it's better to have a choice than not, right?
   * It can be manually input via custom app settings (same place where other options are) - there is no list etc. - it's just normal input field
- Set `offset` value as const `0` and not making it customizable (cause why would you want to start searching from ex. 3rd album instead of beginning, right?)
- Leaving `Fetching releases from...` notification cause it looks cool - it's fun to know how many followed artists you have 😆

* add: go formatting to the pipeline (#1574)

* add: go formatting to the pipeline

* formatted missing files

* chore: add print for files with bad formatting

* fix: specific version fetching in install script (#1578)

* chore: enhance specific version fetch (#1582)

* fix: specific version fetching in install script

* fix: Remove unnecessary request when specifying a version

* fix: Allow for input without "v"

* No special print for the latest version

Instead of printing "Latest version", it prints "Version x.y.z"

* chore: better naming of "shortcut"

Co-authored-by: FlafyDev <Flafyarazi@gmail.com>

* chore: added community funding option

* fix: readme links (#1584)

* chore: add bash_profile fallback for bash (#1583)

* chore: add bash_profile fallback for bash

* applied suggested changes

Co-authored-by: wael444 <40663@protonmail.com>

* revert part of the suggested changes

Co-authored-by: wael444 <40663@protonmail.com>

* fix(windows): add missing prefs message (#1571)

* fix: patch prefs on windows

* fix: fix type mismatch

* fix: `New Releases` custom app for Spotify 1.1.81+ (#1563)

* Fix `New Releases` custom app for Spotify 1.1.81+

- Based on proposed fix for `Shuffle+` (#1559)
- Fixes #1539 #1530 

Notes:
- Can probably be written nicer - this is my scuffed attempt to fix it
- May or may not actually show all new releases for all followed artists - have over 665 of them but I don't think I'm getting all of them (see below)
- May or may not return `error 500` (added `.catch()` block keeps it from breaking whole custom app)

* Minimize `internal server error: 500`...

...for big libraries of followed artists.

Changes:
- Change `URL` to query only discographies
- Limit amount of queried albums to 5

Notes:
- This does **NOT** fixes erroring fully - it only maxes out amount of data you can query before getting rate limited
- The more options you select (ex. albums + EPs + podcasts), the less data you may receive
- To max number of albums received, I recommend to select only `Albums` (since `Singles and EPs` will probably get displayed anyway...)

* Add notifications when error occurred

Notifications added:
- Error code (`500`, `429` etc.)
- Amount of followed artists to fetch releases from
- Amount of followed artists failed to fetch releases from

I guess we have to get along with getting `500-ed` - one time it fetches everything instantly, second time it drops 60 artists...

* "Prettify" file to pass `Prettier` test

* Fix filtering, counter...

- Fixing filtering as no matter was what set in config, it always displayed everything as "Album"
- Fixing "Missing releases from..." counter - should properly reset now

What broke again:
- "Appears on" releases cannot be retrieved with that API endpoint - this filter is just there and doesn't do anything - this prevents from showing everything as "Appears on" etc.

Notes:
- There seem to be an API endpoint for retrieving "Related content" stuff - problem is that would query everything TWICE... which breaks everything even more (and we don't wanna do that)
- If someone knows how to query everything using separate endpoint without doing it 4 times, let me know...

* Forgor `( )`... Oops... 💀

I forgor 💀

* Include requested changes

Changes:
- Properly encode URI including variables
- Make `limit` variable customizable via settings (set default to 5)
- Make error messages as "dev console only"

Notes:
- Errors displayed in console may be a little spammy - if we get error early, there may be lots of lines displaying it + counter...
   * I'm not too sure how to tackle this - just remove them altogether? Or is there a function that could "suppress" them?
   * Switching from normal `log` to `debug` may help a little as they will be only visible if user has set their console log level to include `Verbose`
- Making `limit` customizable may lead to even more errors but fuck it I guess - it's better to have a choice than not, right?
   * It can be manually input via custom app settings (same place where other options are) - there is no list etc. - it's just normal input field
- Set `offset` value as const `0` and not making it customizable (cause why would you want to start searching from ex. 3rd album instead of beginning, right?)
- Leaving `Fetching releases from...` notification cause it looks cool - it's fun to know how many followed artists you have 😆

* add: go formatting to the pipeline (#1574)

* add: go formatting to the pipeline

* formatted missing files

* chore: add print for files with bad formatting

* style(utils/config): make file prettier

Signed-off-by: ririxidev <mail@ririxi.dev>

* run go fmt

Co-authored-by: Łukasz Ordon <lukaszordon21@gmail.com>
Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Co-authored-by: ririxidev <mail@ririxi.dev>

* fix(new-releases): switch to `wg://` protocol (#1590)

* fix(lyrics): switch to `wg://` protocol (#1587)

* fix: change protocol to wg://

* Fixes issues with getting spotify lyrics on lyrics-plus & popupLyrics
* Add @ts-nocheck on popupLyrics

Fixes #1566

* style: change wording when no lyrics

* Update Extensions/popupLyrics.js

Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>

* fixed prettier error

Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>

* fix: Fix hooks for Spotify 1.1.83 (#1600)

* Fix (New-Releases) : Cards Being Displayed Incorrectly (#1606)

Due to the CSS Change In 1.1.83+, song cards were being displayed incorrectly.

* fix(devtools): use new method to enable devtools (#1613)

* Update css-map.json with latest main-trackInfo-* (#1610)

* fix(devtools): overwrite homePath if snap detected (#1614)

* fix: modify filePath from .config to .cache (#1618)

Co-authored-by: ririxi <mail@ririxi.dev>

* fix(keyboardShortcut): update selector (#1617)

* fix queue shortcut

* change to double quote

* feat(restart): check if process is running (#1623)

* fix: Lyrics Plus not showing full lyrics (#1627)

* fix(lyrics-plus): add null check (#1630)

* fix(lyrics-plus): switch to `wg://` protocol for colors (#1631)

* fix(wrapper): adapt few functions to `wg://` protocol (#1632)

* fix: adapt urls in custom app & extensions to `wg://` protocol (#1633)

* chore(lyrics-plus): use DOMParser to parse the genius (#1636)

* fix(devtools): patch another location (#1647)

* fix(sidebar-config): get elements by classname (#1654)

* Hook patch for react_element regex

Co-authored-by: wael444 <40663@protonmail.com>
Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Co-authored-by: huhridge <67046436+huhridge@users.noreply.github.com>
Co-authored-by: Moulick Aggarwal <Moulick@users.noreply.github.com>
Co-authored-by: kwerdenker <sebastian.spindler@gmail.com>
Co-authored-by: Łukasz Ordon <lukaszordon21@gmail.com>
Co-authored-by: FlafyDev <Flafyarazi@gmail.com>
Co-authored-by: The Blob SCP <81673375+theblobscp@users.noreply.github.com>
Co-authored-by: ririxidev <mail@ririxi.dev>
Co-authored-by: itsmeow <itsmeow@itsmeow.dev>
Co-authored-by: ExHigh <exhigh01@gmail.com>
Co-authored-by: Julien <182520+JulienMaille@users.noreply.github.com>
Co-authored-by: Kafva <36083692+Kafva@users.noreply.github.com>
Co-authored-by: ajiou <35028055+ajiou@users.noreply.github.com>
Co-authored-by: Nam Anh <77577746+kyrie25@users.noreply.github.com>
Co-authored-by: Jeroen <36192730+jeroentvb@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants