mirror of
https://github.com/Mastermindzh/tidal-hifi.git
synced 2025-09-10 05:45:04 +02:00
Compare commits
15 Commits
2.7.2
...
7b2afd2290
| Author | SHA1 | Date | |
|---|---|---|---|
| 7b2afd2290 | |||
| 5fde20ace1 | |||
| 7f5f5e7f62 | |||
| 6a1a1efe74 | |||
| 94e1bb1780 | |||
| d66dd8cc9e | |||
|
de97ac8a00 | ||
|
82ac5edf22 | ||
|
909c8ee8ba | ||
|
|
15b6b13e14 | ||
| 89589b75e1 | |||
| 6a7b3eefd4 | |||
|
0583c4a188 | ||
|
|
8855e7f89f | ||
|
|
4fbb598c50 |
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -9,6 +9,8 @@ jobs:
|
||||
build_on_linux:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: update apt
|
||||
run: sudo apt-get update
|
||||
- name: Install libarchive-tools
|
||||
run: sudo apt-get install -y libarchive-tools
|
||||
- uses: actions/checkout@master
|
||||
|
||||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -9,6 +9,8 @@ jobs:
|
||||
build_on_linux:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: update apt
|
||||
run: sudo apt-get update
|
||||
- name: Install libarchive-tools
|
||||
run: sudo apt-get install -y libarchive-tools
|
||||
- uses: actions/checkout@master
|
||||
|
||||
3
.vscode/settings.json
vendored
Normal file
3
.vscode/settings.json
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"cSpell.words": ["hifi", "rescrobbler", "widevine"]
|
||||
}
|
||||
34
CHANGELOG.md
34
CHANGELOG.md
@@ -4,13 +4,29 @@ All notable changes to this project will be documented in this file.
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## 2.8.2
|
||||
|
||||
- Updated dependencies
|
||||
- Downgraded packaged version of electron to 8.5.2, doesn't seem to like a newer build
|
||||
- Fixed the annoying (and useless) terminal warning about `allowRendererProcessReuse`
|
||||
|
||||
## 2.8.1
|
||||
|
||||
- Mar0xy fixed some build issues (thanks!)
|
||||
- vincens2005 fixed the quit button in the menubar
|
||||
|
||||
## 2.8.0
|
||||
|
||||
- Added the ability to mute artists automatically
|
||||
- Added better error handling for discord rpc
|
||||
|
||||
## 2.7.2
|
||||
|
||||
- Disabled sanboxing to fix a display compositor issue on Linux.
|
||||
- Disabled sandboxing to fix a display compositor issue on Linux.
|
||||
|
||||
## 2.7.1
|
||||
|
||||
- Fixed bug: Triggering fullscreen from the Tidal web app would cause the menubar to be visible even if it was disabled in the settings
|
||||
- Fixed bug: Triggering full screen from the Tidal web app would cause the menubar to be visible even if it was disabled in the settings
|
||||
|
||||
## 2.7.0
|
||||
|
||||
@@ -19,11 +35,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
## 2.6.0
|
||||
|
||||
- Add album images to mediainfo and discord
|
||||
- Add album images to media info and discord
|
||||
|
||||
## 2.5.0
|
||||
|
||||
- Notify-send now correctly shows "Tidal Hifi" as the program name
|
||||
- Notify-send now correctly shows "Tidal HiFi" as the program name
|
||||
- Updated dependencies (including electron itself)
|
||||
|
||||
### known issues
|
||||
@@ -36,13 +52,13 @@ updated to nodejs 16 in actions
|
||||
|
||||
## 2.4.0
|
||||
|
||||
- Added more mpris settings
|
||||
- Added more MPRIS settings
|
||||
- Added instruction for rescrobbler to get last.fm working without sandbox mode
|
||||
|
||||
## 2.3.0
|
||||
|
||||
- Added a setting to minimize to tray on app close (off by default)
|
||||
- Added the main menu to the trayicon
|
||||
- Added the main menu to the tray icon
|
||||
|
||||
## 2.2.1
|
||||
|
||||
@@ -59,7 +75,7 @@ moved to: [https://github.com/Mastermindzh/tidal-hifi-aur](https://github.com/Ma
|
||||
- All fields (current, remaining, and url are also available in the API\*)
|
||||
- the artist field is now correctly identified
|
||||
|
||||
* current time only updates on play/pause.
|
||||
\* current time only updates on play/pause.
|
||||
|
||||
## 2.1.1
|
||||
|
||||
@@ -84,7 +100,7 @@ moved to: [https://github.com/Mastermindzh/tidal-hifi-aur](https://github.com/Ma
|
||||
|
||||
## 1.3.0
|
||||
|
||||
-- re-enabled mpris-service wit the electron downloader fixes
|
||||
-- re-enabled MPRIS-service wit the electron downloader fixes
|
||||
|
||||
## 1.2.0
|
||||
|
||||
@@ -99,7 +115,7 @@ Bugfixes:
|
||||
## 1.1.0
|
||||
|
||||
- updated to electron 8.0.0
|
||||
- Added a beta-version of the mpris service
|
||||
- Added a beta-version of the MPRIS service
|
||||
|
||||
- Bugfixes:
|
||||
- icon on gnome not showing in launcher
|
||||
|
||||
@@ -58,7 +58,7 @@ snap install --dangerous <path> #for instance: tidal-hifi_1.0.0_amd64.snap
|
||||
Arch Linux users can use the AUR to install tidal-hifi:
|
||||
|
||||
```sh
|
||||
trizen tidal-hifi
|
||||
trizen tidal-hifi-bin
|
||||
```
|
||||
|
||||
### Using source
|
||||
@@ -76,6 +76,7 @@ To install and work with the code on this project follow these steps:
|
||||
- Notifications
|
||||
- Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts))
|
||||
- API for status and playback
|
||||
- [Mute artists automatically (defaults to "Tidal")]("./docs/muting-artists.md")
|
||||
- Custom [integrations](#integrations)
|
||||
- [Settings feature](./docs/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`)
|
||||
- AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847))
|
||||
@@ -89,7 +90,7 @@ You can find these in the settings menu (`ctrl + =` by default) under the "integ
|
||||
|
||||
It currently includes:
|
||||
|
||||
- mpris - mpris media player controls/status
|
||||
- MPRIS - MPRIS media player controls/status
|
||||
- Discord - Shows what you're listening to on Discord.
|
||||
|
||||
### not included
|
||||
@@ -128,7 +129,7 @@ Sometimes it's just easier to start over, cover my own needs and then making it
|
||||
|
||||
## Buy me a coffee? Please don't
|
||||
|
||||
Instead spend some money on a charity I care for: [kwf.nl](https://secure.kwf.nl/donation).
|
||||
Instead spend some money on a charity I care for: [kwf.nl](https://www.kwf.nl/donatie/donation).
|
||||
Inspired by [haydenjames' issue](https://github.com/Mastermindzh/tidal-hifi/issues/27#issuecomment-704198429)
|
||||
|
||||
## Images
|
||||
|
||||
3
build/electron-builder.unpacked.yml
Normal file
3
build/electron-builder.unpacked.yml
Normal file
@@ -0,0 +1,3 @@
|
||||
extends: ./build/electron-builder.yml
|
||||
linux:
|
||||
target:
|
||||
11
docs/muting-artists.md
Normal file
11
docs/muting-artists.md
Normal file
@@ -0,0 +1,11 @@
|
||||
# Muting artists
|
||||
|
||||
If you feel that some of your music is embarrassing for others you can mute specific artists in the settings window.
|
||||
This functionality is inspired by the [adblock ticket](https://github.com/Mastermindzh/tidal-hifi/issues/112), and whilst I personally feel you should simply buy Tidal, I also believe in muting sound that you don't want to hear.
|
||||
|
||||
Anyway, to block an artist, open the settings window (see image below) and enter a list of artists in the textarea as seen below.
|
||||
Don't forget to turn the feature on and Tidal-hifi will automatically mute the player whenever that artist is playing.
|
||||
|
||||
This will allow you to skip the song without anyone noticing. (you can always say "no idea, it seems to have no audio").
|
||||
|
||||
|
||||
BIN
docs/settings-muted-artists.png
Normal file
BIN
docs/settings-muted-artists.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 103 KiB |
259
package-lock.json
generated
259
package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "tidal-hifi",
|
||||
"version": "2.7.2",
|
||||
"version": "2.8.2",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "tidal-hifi",
|
||||
"version": "2.7.1",
|
||||
"version": "2.8.2",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"discord-rpc": "^4.0.1",
|
||||
@@ -18,7 +18,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@mastermindzh/prettier-config": "^1.0.0",
|
||||
"electron": "git+https://github.com/castlabs/electron-releases.git#v16.0.4+wvcus",
|
||||
"electron": "git+https://github.com/castlabs/electron-releases.git#15.5.2-wvvmp",
|
||||
"electron-builder": "^22.14.5",
|
||||
"electron-reload": "^1.5.0",
|
||||
"prettier": "^2.5.0"
|
||||
@@ -595,9 +595,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/async": {
|
||||
"version": "0.9.2",
|
||||
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
|
||||
"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
|
||||
"version": "3.2.3",
|
||||
"resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
|
||||
"integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/async-exit-hook": {
|
||||
@@ -1995,15 +1995,6 @@
|
||||
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
|
||||
"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
|
||||
},
|
||||
"node_modules/escape-string-regexp": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
|
||||
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=0.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/etag": {
|
||||
"version": "1.8.1",
|
||||
"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
|
||||
@@ -2894,13 +2885,13 @@
|
||||
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
|
||||
},
|
||||
"node_modules/jake": {
|
||||
"version": "10.8.2",
|
||||
"resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz",
|
||||
"integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==",
|
||||
"version": "10.8.5",
|
||||
"resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
|
||||
"integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"async": "0.9.x",
|
||||
"chalk": "^2.4.2",
|
||||
"async": "^3.2.3",
|
||||
"chalk": "^4.0.2",
|
||||
"filelist": "^1.0.1",
|
||||
"minimatch": "^3.0.4"
|
||||
},
|
||||
@@ -2908,69 +2899,7 @@
|
||||
"jake": "bin/cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/jake/node_modules/ansi-styles": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
|
||||
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"color-convert": "^1.9.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/jake/node_modules/chalk": {
|
||||
"version": "2.4.2",
|
||||
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
|
||||
"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"ansi-styles": "^3.2.1",
|
||||
"escape-string-regexp": "^1.0.5",
|
||||
"supports-color": "^5.3.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/jake/node_modules/color-convert": {
|
||||
"version": "1.9.3",
|
||||
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
|
||||
"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"color-name": "1.1.3"
|
||||
}
|
||||
},
|
||||
"node_modules/jake/node_modules/color-name": {
|
||||
"version": "1.1.3",
|
||||
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
|
||||
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/jake/node_modules/has-flag": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
|
||||
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/jake/node_modules/supports-color": {
|
||||
"version": "5.5.0",
|
||||
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
|
||||
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"has-flag": "^3.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
"node": ">=10"
|
||||
}
|
||||
},
|
||||
"node_modules/js-yaml": {
|
||||
@@ -3263,9 +3192,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/minimist": {
|
||||
"version": "1.2.5",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
|
||||
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
|
||||
"version": "1.2.6",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
|
||||
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/mkdirp": {
|
||||
@@ -3317,11 +3246,22 @@
|
||||
"optional": true
|
||||
},
|
||||
"node_modules/node-fetch": {
|
||||
"version": "2.6.1",
|
||||
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
|
||||
"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
|
||||
"version": "2.6.7",
|
||||
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
|
||||
"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
|
||||
"dependencies": {
|
||||
"whatwg-url": "^5.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "4.x || >=6.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"encoding": "^0.1.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"encoding": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/normalize-path": {
|
||||
@@ -3594,9 +3534,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/plist": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz",
|
||||
"integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==",
|
||||
"version": "3.0.5",
|
||||
"resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz",
|
||||
"integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"base64-js": "^1.5.1",
|
||||
@@ -4447,6 +4387,11 @@
|
||||
"node": ">=0.8"
|
||||
}
|
||||
},
|
||||
"node_modules/tr46": {
|
||||
"version": "0.0.3",
|
||||
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
|
||||
"integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
|
||||
},
|
||||
"node_modules/truncate-utf8-bytes": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
|
||||
@@ -4665,6 +4610,20 @@
|
||||
"extsprintf": "^1.2.0"
|
||||
}
|
||||
},
|
||||
"node_modules/webidl-conversions": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
|
||||
"integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
|
||||
},
|
||||
"node_modules/whatwg-url": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
|
||||
"integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
|
||||
"dependencies": {
|
||||
"tr46": "~0.0.3",
|
||||
"webidl-conversions": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/which": {
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
|
||||
@@ -5284,9 +5243,9 @@
|
||||
"optional": true
|
||||
},
|
||||
"async": {
|
||||
"version": "0.9.2",
|
||||
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
|
||||
"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
|
||||
"version": "3.2.3",
|
||||
"resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
|
||||
"integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
|
||||
"dev": true
|
||||
},
|
||||
"async-exit-hook": {
|
||||
@@ -6154,7 +6113,7 @@
|
||||
"electron": {
|
||||
"version": "git+ssh://git@github.com/castlabs/electron-releases.git#8d8957ec0fae843760a583ed7a82e5d266fde647",
|
||||
"dev": true,
|
||||
"from": "electron@git+https://github.com/castlabs/electron-releases.git#v16.0.4+wvcus",
|
||||
"from": "electron@git+https://github.com/castlabs/electron-releases.git#15.5.2-wvvmp",
|
||||
"requires": {
|
||||
"@electron/get": "^1.0.1",
|
||||
"@types/node": "^12.0.12",
|
||||
@@ -6396,12 +6355,6 @@
|
||||
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
|
||||
"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
|
||||
},
|
||||
"escape-string-regexp": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
|
||||
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
|
||||
"dev": true
|
||||
},
|
||||
"etag": {
|
||||
"version": "1.8.1",
|
||||
"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
|
||||
@@ -7103,67 +7056,15 @@
|
||||
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
|
||||
},
|
||||
"jake": {
|
||||
"version": "10.8.2",
|
||||
"resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz",
|
||||
"integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==",
|
||||
"version": "10.8.5",
|
||||
"resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
|
||||
"integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"async": "0.9.x",
|
||||
"chalk": "^2.4.2",
|
||||
"async": "^3.2.3",
|
||||
"chalk": "^4.0.2",
|
||||
"filelist": "^1.0.1",
|
||||
"minimatch": "^3.0.4"
|
||||
},
|
||||
"dependencies": {
|
||||
"ansi-styles": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
|
||||
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"color-convert": "^1.9.0"
|
||||
}
|
||||
},
|
||||
"chalk": {
|
||||
"version": "2.4.2",
|
||||
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
|
||||
"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"ansi-styles": "^3.2.1",
|
||||
"escape-string-regexp": "^1.0.5",
|
||||
"supports-color": "^5.3.0"
|
||||
}
|
||||
},
|
||||
"color-convert": {
|
||||
"version": "1.9.3",
|
||||
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
|
||||
"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"color-name": "1.1.3"
|
||||
}
|
||||
},
|
||||
"color-name": {
|
||||
"version": "1.1.3",
|
||||
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
|
||||
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
|
||||
"dev": true
|
||||
},
|
||||
"has-flag": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
|
||||
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
|
||||
"dev": true
|
||||
},
|
||||
"supports-color": {
|
||||
"version": "5.5.0",
|
||||
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
|
||||
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"has-flag": "^3.0.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"js-yaml": {
|
||||
@@ -7394,9 +7295,9 @@
|
||||
}
|
||||
},
|
||||
"minimist": {
|
||||
"version": "1.2.5",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
|
||||
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
|
||||
"version": "1.2.6",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
|
||||
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
|
||||
"dev": true
|
||||
},
|
||||
"mkdirp": {
|
||||
@@ -7442,9 +7343,12 @@
|
||||
"optional": true
|
||||
},
|
||||
"node-fetch": {
|
||||
"version": "2.6.1",
|
||||
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
|
||||
"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
|
||||
"version": "2.6.7",
|
||||
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
|
||||
"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
|
||||
"requires": {
|
||||
"whatwg-url": "^5.0.0"
|
||||
}
|
||||
},
|
||||
"normalize-path": {
|
||||
"version": "3.0.0",
|
||||
@@ -7651,9 +7555,9 @@
|
||||
}
|
||||
},
|
||||
"plist": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz",
|
||||
"integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==",
|
||||
"version": "3.0.5",
|
||||
"resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz",
|
||||
"integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"base64-js": "^1.5.1",
|
||||
@@ -8346,6 +8250,11 @@
|
||||
"punycode": "^2.1.1"
|
||||
}
|
||||
},
|
||||
"tr46": {
|
||||
"version": "0.0.3",
|
||||
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
|
||||
"integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
|
||||
},
|
||||
"truncate-utf8-bytes": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
|
||||
@@ -8518,6 +8427,20 @@
|
||||
"extsprintf": "^1.2.0"
|
||||
}
|
||||
},
|
||||
"webidl-conversions": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
|
||||
"integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
|
||||
},
|
||||
"whatwg-url": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
|
||||
"integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
|
||||
"requires": {
|
||||
"tr46": "~0.0.3",
|
||||
"webidl-conversions": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"which": {
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
{
|
||||
"name": "tidal-hifi",
|
||||
"version": "2.7.2",
|
||||
"version": "2.8.2",
|
||||
"description": "Tidal on Electron with widevine(hifi) support",
|
||||
"main": "src/main.js",
|
||||
"scripts": {
|
||||
"start": "electron .",
|
||||
"build": "electron-builder --publish=never -c ./build/electron-builder.yml",
|
||||
"build-deb": "electron-builder --publish=never -c ./build/electron-builder.deb.yml",
|
||||
"build-unpacked": "electron-builder --publish=never -c ./build/electron-builder.unpacked.yml",
|
||||
"build-rpm": "electron-builder --publish=never -c ./build/electron-builder.rpm.yml",
|
||||
"build-snap": "electron-builder --publish=never -c ./build/electron-builder.snap.yml",
|
||||
"build-arch": "electron-builder --publish=never -c ./build/electron-builder.pacman.yml",
|
||||
@@ -32,10 +33,10 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@mastermindzh/prettier-config": "^1.0.0",
|
||||
"electron": "git+https://github.com/castlabs/electron-releases.git#v16.0.4+wvcus",
|
||||
"electron": "git+https://github.com/castlabs/electron-releases.git#15.5.2-wvvmp",
|
||||
"electron-builder": "^22.14.5",
|
||||
"electron-reload": "^1.5.0",
|
||||
"prettier": "^2.5.0"
|
||||
},
|
||||
"prettier": "@mastermindzh/prettier-config"
|
||||
}
|
||||
}
|
||||
@@ -13,6 +13,8 @@ const settings = {
|
||||
api: "api",
|
||||
menuBar: "menuBar",
|
||||
playBackControl: "playBackControl",
|
||||
muteArtists: "muteArtists",
|
||||
mutedArtists: "mutedArtists",
|
||||
apiSettings: {
|
||||
root: "apiSettings",
|
||||
port: "apiSettings.port",
|
||||
|
||||
@@ -101,6 +101,7 @@ function addGlobalShortcuts() {
|
||||
// initialization and is ready to create browser windows.
|
||||
// Some APIs can only be used after this event occurs.
|
||||
app.on("ready", () => {
|
||||
app.allowRendererProcessReuse = true;
|
||||
createWindow();
|
||||
addMenu();
|
||||
createSettingsWindow();
|
||||
|
||||
@@ -1,8 +1,15 @@
|
||||
let notifications;
|
||||
let playBackControl;
|
||||
let api;
|
||||
let port;
|
||||
let menuBar;
|
||||
let trayIcon,
|
||||
minimizeOnClose,
|
||||
mpris,
|
||||
enableCustomHotkeys,
|
||||
enableDiscord,
|
||||
muteArtists,
|
||||
notifications,
|
||||
playBackControl,
|
||||
api,
|
||||
port,
|
||||
menuBar,
|
||||
mutedArtists;
|
||||
|
||||
const { store, settings } = require("./../../scripts/settings");
|
||||
const { ipcRenderer } = require("electron");
|
||||
@@ -22,6 +29,8 @@ function refreshSettings() {
|
||||
enableCustomHotkeys.checked = store.get(settings.enableCustomHotkeys);
|
||||
enableDiscord.checked = store.get(settings.enableDiscord);
|
||||
minimizeOnClose.checked = store.get(settings.minimizeOnClose);
|
||||
muteArtists.checked = store.get(settings.muteArtists);
|
||||
mutedArtists.value = store.get(settings.mutedArtists).join("\n");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -67,6 +76,13 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
});
|
||||
}
|
||||
|
||||
function addTextAreaListener(source, key) {
|
||||
source.addEventListener("input", function (event, data) {
|
||||
store.set(key, source.value.split("\n"));
|
||||
ipcRenderer.send(globalEvents.storeChanged);
|
||||
});
|
||||
}
|
||||
|
||||
ipcRenderer.on("refreshData", () => {
|
||||
refreshSettings();
|
||||
});
|
||||
@@ -85,6 +101,8 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
mpris = get("mprisCheckbox");
|
||||
enableCustomHotkeys = get("enableCustomHotkeys");
|
||||
enableDiscord = get("enableDiscord");
|
||||
muteArtists = get("muteArtists");
|
||||
mutedArtists = get("mutedArtists");
|
||||
|
||||
refreshSettings();
|
||||
|
||||
@@ -98,4 +116,6 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
addInputListener(enableCustomHotkeys, settings.enableCustomHotkeys);
|
||||
addInputListener(enableDiscord, settings.enableDiscord);
|
||||
addInputListener(minimizeOnClose, settings.minimizeOnClose);
|
||||
addInputListener(muteArtists, settings.muteArtists);
|
||||
addTextAreaListener(mutedArtists, settings.mutedArtists);
|
||||
});
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<title>Tidal-hifi settings</title>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
||||
@@ -54,6 +55,17 @@
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="option">
|
||||
<h4>Mute Artists automatically</h4>
|
||||
<p>
|
||||
The following list of artists (1 per line) will be muted automatically.
|
||||
</p>
|
||||
<label class="switch" style="margin-bottom:10px">
|
||||
<input id="muteArtists" type="checkbox">
|
||||
<span class="slider round" ></span>
|
||||
</label>
|
||||
<textarea id="mutedArtists" cols="40" rows="5"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="section">
|
||||
<h3>UI</h3>
|
||||
@@ -139,12 +151,12 @@
|
||||
<div class="section">
|
||||
<h3>integrations</h3>
|
||||
<p style="margin-bottom: 15px;">
|
||||
Tidal-hifi is extensible trough the use of integrations. You can enable or disable integrations here
|
||||
Tidal-hifi is extensible through the use of integrations. You can enable or disable integrations here
|
||||
</p>
|
||||
<div class="option">
|
||||
<h4>mpris-player</h4>
|
||||
<h4>MPRIS-player</h4>
|
||||
<p>
|
||||
Whether to enable the mpris media player controls for Linux systems
|
||||
Whether to enable the MPRIS media player controls for Linux systems
|
||||
</p>
|
||||
<label class="switch">
|
||||
<input id="mprisCheckbox" type="checkbox">
|
||||
@@ -165,16 +177,16 @@
|
||||
</section>
|
||||
<section id="about" class="tab-panel">
|
||||
<div class="section">
|
||||
<img style="width: 100px; height: auto; display: block; margin: 0 auto; margin-bottom: 20px; margin-top: 20px;" src = "./icon.png">
|
||||
<img alt="tidal icon" style="width: 100px; height: auto; display: block; margin: 0 auto; margin-bottom: 20px; margin-top: 20px;" src = "./icon.png">
|
||||
<p style="max-width: 350px; display:block; margin: 0 auto; text-align: center;">
|
||||
<a href ="javascript:openExternal('https://github.com/Mastermindzh/tidal-hifi');">Tidal-hifi</a> is made by <a href ="javascript:openExternal('https://www.rickvanlieshout.com')">Rick van Lieshout</a>.<br />
|
||||
It uses <a href="javascript:openExternal('https://castlabs.com/');">castlabs</a> versions of Electron for widevine support.
|
||||
It uses <a href="javascript:openExternal('https://castlabs.com/');">Castlabs'</a> versions of Electron for widevine support.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<small>Some settings require a restart of Tidal-hifi. To do so click the button below:</small>
|
||||
<small>Some settings require a restart of Tidal-hifi. To do so, click the button below:</small>
|
||||
<button onClick="restart()" style ="width: 100%">Restart Tidal-hifi</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -469,5 +481,19 @@
|
||||
button:hover{
|
||||
background-color: rgba(229,238,255,.3);
|
||||
}
|
||||
textarea {
|
||||
color: #72777f;
|
||||
background: #242528;
|
||||
border: 0;
|
||||
width: 100%;
|
||||
color: rgba(229, 238, 255, .6);
|
||||
padding: 0 0 12px;
|
||||
display:block;
|
||||
}
|
||||
textarea:focus {
|
||||
outline: none;
|
||||
border: 0;
|
||||
border-bottom: 1px solid #0ff;
|
||||
}
|
||||
</style>
|
||||
</html>
|
||||
|
||||
@@ -8,6 +8,7 @@ const statuses = require("./constants/statuses");
|
||||
const hotkeys = require("./scripts/hotkeys");
|
||||
const globalEvents = require("./constants/globalEvents");
|
||||
const notificationPath = `${app.getPath("userData")}/notification.jpg`;
|
||||
const appName = "Tidal Hifi";
|
||||
let currentSong = "";
|
||||
let player;
|
||||
let currentPlayStatus = statuses.paused;
|
||||
@@ -15,6 +16,7 @@ let progressBarTime;
|
||||
let currentTimeChanged = false;
|
||||
let currentTime;
|
||||
let currentURL = undefined;
|
||||
let isMutedArtist = false;
|
||||
|
||||
const elements = {
|
||||
play: '*[data-test="play"]',
|
||||
@@ -42,7 +44,7 @@ const elements = {
|
||||
playing_title: 'span[data-test="table-cell-title"].css-geqnfr',
|
||||
album_name_cell: '[data-test="table-cell-album"]',
|
||||
tracklist_row: '[data-test="tracklist-row"]',
|
||||
|
||||
volume: '*[data-test="volume"]',
|
||||
/**
|
||||
* Get an element from the dom
|
||||
* @param {*} key key in elements object to fetch
|
||||
@@ -103,6 +105,10 @@ const elements = {
|
||||
return "";
|
||||
},
|
||||
|
||||
isMuted: function () {
|
||||
return this.get("volume").getAttribute("aria-checked") === "false"; // it's muted if aria-checked is false
|
||||
},
|
||||
|
||||
/**
|
||||
* Shorthand function to get the text of a dom element
|
||||
* @param {*} key key in elements object to fetch
|
||||
@@ -220,7 +226,7 @@ function handleLogout() {
|
||||
}
|
||||
|
||||
function addFullScreenListeners() {
|
||||
window.document.addEventListener("fullscreenchange", (event) => {
|
||||
window.document.addEventListener("fullscreenchange", () => {
|
||||
ipcRenderer.send(globalEvents.refreshMenuBar);
|
||||
});
|
||||
}
|
||||
@@ -231,7 +237,7 @@ function addFullScreenListeners() {
|
||||
*/
|
||||
function addIPCEventListeners() {
|
||||
window.addEventListener("DOMContentLoaded", () => {
|
||||
ipcRenderer.on("globalEvent", (event, args) => {
|
||||
ipcRenderer.on("globalEvent", (_event, args) => {
|
||||
switch (args) {
|
||||
case globalEvents.playPause:
|
||||
playPause();
|
||||
@@ -331,7 +337,6 @@ setInterval(function () {
|
||||
const album = elements.getAlbumName();
|
||||
const current = elements.getText("current");
|
||||
const duration = elements.getText("duration");
|
||||
const appName = "Tidal Hifi";
|
||||
const progressBarcurrentTime = elements.get("bar").getAttribute("aria-valuenow");
|
||||
const songDashArtistTitle = `${title} - ${artists}`;
|
||||
const currentStatus = getCurrentlyPlayingStatus();
|
||||
@@ -350,6 +355,8 @@ setInterval(function () {
|
||||
const progressBarTimeChanged = progressBarcurrentTime !== progressBarTime;
|
||||
const titleOrArtistChanged = currentSong !== songDashArtistTitle;
|
||||
|
||||
muteArtistIfFoundInMutedArtistsList();
|
||||
|
||||
if (titleOrArtistChanged || playStatusChanged || progressBarTimeChanged || currentTimeChanged) {
|
||||
// update title, url and play info with new info
|
||||
setTitle(songDashArtistTitle);
|
||||
@@ -404,6 +411,24 @@ setInterval(function () {
|
||||
() => {}
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks whether the current artist is included in the "muted artists" list and if so it will automatically mute the player
|
||||
*/
|
||||
function muteArtistIfFoundInMutedArtistsList() {
|
||||
if (store.get(settings.muteArtists)) {
|
||||
const mutedArtists = store.get(settings.mutedArtists);
|
||||
if (mutedArtists.find((artist) => artist === artists) !== undefined) {
|
||||
if (!elements.isMuted()) {
|
||||
isMutedArtist = true;
|
||||
elements.click("volume");
|
||||
}
|
||||
} else if (currentStatus === statuses.playing && isMutedArtist && elements.isMuted()) {
|
||||
elements.click("volume");
|
||||
isMutedArtist = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}, 200);
|
||||
|
||||
if (process.platform === "linux" && store.get(settings.mpris)) {
|
||||
|
||||
@@ -32,7 +32,9 @@ const observer = (event, arg) => {
|
||||
startTimestamp: parseInt(now),
|
||||
endTimestamp: parseInt(remaining),
|
||||
largeImageKey: mediaInfoModule.mediaInfo.image,
|
||||
largeImageText: (mediaInfoModule.mediaInfo.album) ? mediaInfoModule.mediaInfo.album : `${idleStatus.largeImageText}`,
|
||||
largeImageText: mediaInfoModule.mediaInfo.album
|
||||
? mediaInfoModule.mediaInfo.album
|
||||
: `${idleStatus.largeImageText}`,
|
||||
buttons: [{ label: "Play on Tidal", url: mediaInfoModule.mediaInfo.url }],
|
||||
},
|
||||
});
|
||||
@@ -62,24 +64,32 @@ const idleStatus = {
|
||||
*/
|
||||
discordModule.initRPC = function () {
|
||||
rpc = new discordrpc.Client({ transport: "ipc" });
|
||||
rpc.login({ clientId }).catch(console.error);
|
||||
discordModule.rpc = rpc;
|
||||
rpc.login({ clientId }).then(
|
||||
() => {
|
||||
discordModule.rpc = rpc;
|
||||
|
||||
rpc.on("ready", () => {
|
||||
rpc.setActivity(idleStatus);
|
||||
});
|
||||
ipcMain.on(globalEvents.updateInfo, observer);
|
||||
rpc.on("ready", () => {
|
||||
rpc.setActivity(idleStatus);
|
||||
});
|
||||
ipcMain.on(globalEvents.updateInfo, observer);
|
||||
},
|
||||
() => {
|
||||
console.error("Can't connect to Discord, is it running?");
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
* Remove any RPC connection with discord and remove the event listener on globalEvents.updateInfo
|
||||
*/
|
||||
discordModule.unRPC = function () {
|
||||
rpc.clearActivity();
|
||||
rpc.destroy();
|
||||
rpc = false;
|
||||
discordModule.rpc = rpc;
|
||||
ipcMain.removeListener(globalEvents.updateInfo, observer);
|
||||
if (rpc) {
|
||||
rpc.clearActivity();
|
||||
rpc.destroy();
|
||||
rpc = false;
|
||||
discordModule.rpc = undefined;
|
||||
ipcMain.removeListener(globalEvents.updateInfo, observer);
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = discordModule;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
const { Menu } = require("electron");
|
||||
const { Menu, app } = require("electron");
|
||||
const { showSettingsWindow } = require("./settings");
|
||||
const isMac = process.platform === "darwin";
|
||||
|
||||
@@ -10,6 +10,14 @@ const settingsMenuEntry = {
|
||||
accelerator: "Control+/",
|
||||
};
|
||||
|
||||
const quitMenuEntry = {
|
||||
label: "Quit",
|
||||
click() {
|
||||
app.exit(0);
|
||||
},
|
||||
accelerator: "Control+Q"
|
||||
};
|
||||
|
||||
const mainMenu = [
|
||||
...(isMac
|
||||
? [
|
||||
@@ -25,17 +33,15 @@ const mainMenu = [
|
||||
{ role: "hideothers" },
|
||||
{ role: "unhide" },
|
||||
{ type: "separator" },
|
||||
{ role: "quit" },
|
||||
quitMenuEntry,
|
||||
],
|
||||
},
|
||||
]
|
||||
: []),
|
||||
// { role: 'fileMenu' }
|
||||
{
|
||||
label: "File",
|
||||
submenu: [settingsMenuEntry, isMac ? { role: "close" } : { role: "quit" }],
|
||||
submenu: [settingsMenuEntry, isMac ? { role: "close" } : quitMenuEntry],
|
||||
},
|
||||
// { role: 'editMenu' }
|
||||
{
|
||||
label: "Edit",
|
||||
submenu: [
|
||||
@@ -61,7 +67,6 @@ const mainMenu = [
|
||||
settingsMenuEntry,
|
||||
],
|
||||
},
|
||||
// { role: 'viewMenu' }
|
||||
{
|
||||
label: "View",
|
||||
submenu: [
|
||||
@@ -75,7 +80,6 @@ const mainMenu = [
|
||||
{ role: "togglefullscreen" },
|
||||
],
|
||||
},
|
||||
// { role: 'windowMenu' }
|
||||
{
|
||||
label: "Window",
|
||||
submenu: [
|
||||
|
||||
@@ -10,12 +10,14 @@ const store = new Store({
|
||||
notifications: true,
|
||||
api: true,
|
||||
playBackControl: true,
|
||||
muteArtists: false,
|
||||
mutedArtists: ["TIDAL"],
|
||||
menuBar: true,
|
||||
apiSettings: {
|
||||
port: 47836,
|
||||
},
|
||||
trayIcon: true,
|
||||
minimizeOnClose : false,
|
||||
minimizeOnClose: false,
|
||||
mpris: false,
|
||||
enableCustomHotkeys: false,
|
||||
enableDiscord: false,
|
||||
|
||||
Reference in New Issue
Block a user