From e628210e8506911251cd960fc09eed331ff86563 Mon Sep 17 00:00:00 2001 From: Demir Yerli Date: Sun, 11 Aug 2024 16:39:24 +0300 Subject: [PATCH 1/4] make amrpc display "Listening to" instead of "Playing" --- package-lock.json | 57 +++++++++++++++-------------------------- package.json | 7 +++-- src/managers/discord.ts | 3 ++- 3 files changed, 26 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ada075..fdd7dbb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "amrpc", - "version": "4.3.0", + "version": "4.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "amrpc", - "version": "4.3.0", + "version": "4.4.0", "license": "GPL-3.0", "dependencies": { "@crowdin/ota-client": "^0.7.0", @@ -16,7 +16,7 @@ "cheerio": "^1.0.0-rc.12", "child-process-promise": "^2.2.1", "decompress": "^4.2.1", - "discord-rpc": "^4.0.1", + "discord-rpc": "git://github.com/sKiLdUsT/RPC", "electron-autotheme": "^1.3.2", "electron-log": "^4.4.4", "electron-store": "^8.0.1", @@ -30,16 +30,15 @@ "ws": "^8.6.0" }, "devDependencies": { - "@types/auto-launch": "^5.0.2", + "@types/auto-launch": "^5.0.5", "@types/cron": "^1.7.3", "@types/decompress": "^4.2.4", - "@types/discord-rpc": "^4.0.2", "@types/ws": "^8.5.3", "copyfiles": "^2.4.1", "electron": "^22.3.5", "electron-builder": "^23.6.0", "maketypes": "^1.1.2", - "typescript": "^4.6.3" + "typescript": "^5.5.4" } }, "node_modules/@crowdin/ota-client": { @@ -395,9 +394,9 @@ } }, "node_modules/@types/auto-launch": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@types/auto-launch/-/auto-launch-5.0.2.tgz", - "integrity": "sha512-b03X09+GCM9t6AUECpwA2gUPYs8s5tJHFJw92sK8EiJ7G4QNbsHmXV7nfCfP6G6ivtm230vi4oNfe8AzRgzxMQ==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@types/auto-launch/-/auto-launch-5.0.5.tgz", + "integrity": "sha512-/nGvQZSzM/pvCMCh4Gt2kIeiUmOP/cKGJbjlInI+A+5MoV/7XmT56DJ6EU8bqc3+ItxEe4UC2GVspmPzcCc8cg==", "dev": true }, "node_modules/@types/cacheable-request": { @@ -440,12 +439,6 @@ "@types/node": "*" } }, - "node_modules/@types/discord-rpc": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@types/discord-rpc/-/discord-rpc-4.0.3.tgz", - "integrity": "sha512-4Kh+8u1+OXRHD5OHET3zbBInDkx3cMLaj8Qif8JQbgHZjiru2IYf/WHhuYdzjgtJ/J0CuImOpvt98+Bhe/lr1g==", - "dev": true - }, "node_modules/@types/fs-extra": { "version": "9.0.13", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", @@ -1717,8 +1710,7 @@ }, "node_modules/discord-rpc": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/discord-rpc/-/discord-rpc-4.0.1.tgz", - "integrity": "sha512-HOvHpbq5STRZJjQIBzwoKnQ0jHplbEWFWlPDwXXKm/bILh4nzjcg7mNqll0UY7RsjFoaXA7e/oYb/4lvpda2zA==", + "resolved": "git+ssh://git@github.com/sKiLdUsT/RPC.git#1c5b6842fa586a1b7b339a50fa5ec1c4cf6c8867", "dependencies": { "node-fetch": "^2.6.1", "ws": "^7.3.1" @@ -4455,16 +4447,16 @@ } }, "node_modules/typescript": { - "version": "4.8.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz", - "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=4.2.0" + "node": ">=14.17" } }, "node_modules/typpy": { @@ -5004,9 +4996,9 @@ "dev": true }, "@types/auto-launch": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@types/auto-launch/-/auto-launch-5.0.2.tgz", - "integrity": "sha512-b03X09+GCM9t6AUECpwA2gUPYs8s5tJHFJw92sK8EiJ7G4QNbsHmXV7nfCfP6G6ivtm230vi4oNfe8AzRgzxMQ==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@types/auto-launch/-/auto-launch-5.0.5.tgz", + "integrity": "sha512-/nGvQZSzM/pvCMCh4Gt2kIeiUmOP/cKGJbjlInI+A+5MoV/7XmT56DJ6EU8bqc3+ItxEe4UC2GVspmPzcCc8cg==", "dev": true }, "@types/cacheable-request": { @@ -5049,12 +5041,6 @@ "@types/node": "*" } }, - "@types/discord-rpc": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@types/discord-rpc/-/discord-rpc-4.0.3.tgz", - "integrity": "sha512-4Kh+8u1+OXRHD5OHET3zbBInDkx3cMLaj8Qif8JQbgHZjiru2IYf/WHhuYdzjgtJ/J0CuImOpvt98+Bhe/lr1g==", - "dev": true - }, "@types/fs-extra": { "version": "9.0.13", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", @@ -6068,9 +6054,8 @@ } }, "discord-rpc": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/discord-rpc/-/discord-rpc-4.0.1.tgz", - "integrity": "sha512-HOvHpbq5STRZJjQIBzwoKnQ0jHplbEWFWlPDwXXKm/bILh4nzjcg7mNqll0UY7RsjFoaXA7e/oYb/4lvpda2zA==", + "version": "git+ssh://git@github.com/sKiLdUsT/RPC.git#1c5b6842fa586a1b7b339a50fa5ec1c4cf6c8867", + "from": "discord-rpc@git://github.com/sKiLdUsT/RPC", "requires": { "node-fetch": "^2.6.1", "register-scheme": "github:devsnek/node-register-scheme", @@ -8221,9 +8206,9 @@ } }, "typescript": { - "version": "4.8.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz", - "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true }, "typpy": { diff --git a/package.json b/package.json index b51694e..37d7403 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "cheerio": "^1.0.0-rc.12", "child-process-promise": "^2.2.1", "decompress": "^4.2.1", - "discord-rpc": "^4.0.1", + "discord-rpc": "git://github.com/sKiLdUsT/RPC", "electron-autotheme": "^1.3.2", "electron-log": "^4.4.4", "electron-store": "^8.0.1", @@ -51,16 +51,15 @@ "ws": "^8.6.0" }, "devDependencies": { - "@types/auto-launch": "^5.0.2", + "@types/auto-launch": "^5.0.5", "@types/cron": "^1.7.3", "@types/decompress": "^4.2.4", - "@types/discord-rpc": "^4.0.2", "@types/ws": "^8.5.3", "copyfiles": "^2.4.1", "electron": "^22.3.5", "electron-builder": "^23.6.0", "maketypes": "^1.1.2", - "typescript": "^4.6.3" + "typescript": "^5.5.4" }, "overrides": { "minimatch": ">=3.0.5" diff --git a/src/managers/discord.ts b/src/managers/discord.ts index 7bdcae5..66e6e55 100644 --- a/src/managers/discord.ts +++ b/src/managers/discord.ts @@ -184,7 +184,8 @@ export class Discord { setActivity(activity: Presence) { if (!this.isSupporter) activity.largeImageText = this.defaultLIT; if (!config.get("showTimestamps")) delete activity.endTimestamp; - + let type = 2; + activity.type = type; this.activity = activity; if (this.isReady) { From 405b2188ae4a2a6e5be29ebd98e7559d4ab08709 Mon Sep 17 00:00:00 2001 From: Demir Yerli Date: Sun, 11 Aug 2024 16:43:10 +0300 Subject: [PATCH 2/4] make the code shorter --- src/managers/discord.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/managers/discord.ts b/src/managers/discord.ts index 66e6e55..45b8494 100644 --- a/src/managers/discord.ts +++ b/src/managers/discord.ts @@ -184,8 +184,7 @@ export class Discord { setActivity(activity: Presence) { if (!this.isSupporter) activity.largeImageText = this.defaultLIT; if (!config.get("showTimestamps")) delete activity.endTimestamp; - let type = 2; - activity.type = type; + activity.type = 2; // Display "Listening to Apple Music", instead of "Playing Apple Music" this.activity = activity; if (this.isReady) { From 2f10e194f3d96300edcc1ffc04048936525c720f Mon Sep 17 00:00:00 2001 From: Demir Yerli Date: Sun, 11 Aug 2024 17:05:48 +0300 Subject: [PATCH 3/4] improve the default settings for the app --- src/managers/store.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/managers/store.ts b/src/managers/store.ts index e51bc48..d03b3fb 100644 --- a/src/managers/store.ts +++ b/src/managers/store.ts @@ -19,8 +19,8 @@ export const config = new Store({ colorTheme: "light", language: "en-US", artwork: "applemusic-logo", - rpcLargeImageText: "AMRPC - %version%", - rpcDetails: "%title% - %album%", + rpcLargeImageText: "%album% (AMRPC - %version%)", + rpcDetails: "%title%", rpcState: "%artist%", lastFM: { username: "", From 77ed0ed5de63534107fbe92b827812422b49773d Mon Sep 17 00:00:00 2001 From: Demir Yerli Date: Sat, 24 Aug 2024 15:38:55 +0300 Subject: [PATCH 4/4] Update src/managers/store.ts Co-authored-by: Frederik <53608074+N0chteil@users.noreply.github.com> --- src/managers/store.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/managers/store.ts b/src/managers/store.ts index d03b3fb..e51bc48 100644 --- a/src/managers/store.ts +++ b/src/managers/store.ts @@ -19,8 +19,8 @@ export const config = new Store({ colorTheme: "light", language: "en-US", artwork: "applemusic-logo", - rpcLargeImageText: "%album% (AMRPC - %version%)", - rpcDetails: "%title%", + rpcLargeImageText: "AMRPC - %version%", + rpcDetails: "%title% - %album%", rpcState: "%artist%", lastFM: { username: "",