mirror of
https://github.com/Equicord/Equicord.git
synced 2025-01-31 03:33:36 -05:00
Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
commit
8ac1f757d5
1 changed files with 4 additions and 6 deletions
|
@ -125,7 +125,7 @@ const settings = definePluginSettings({
|
||||||
default: true,
|
default: true,
|
||||||
},
|
},
|
||||||
hideWithActivity: {
|
hideWithActivity: {
|
||||||
description: "Hide Last.fm presence if any other activity is detected",
|
description: "Hide Last.fm presence if you have any other presence",
|
||||||
type: OptionType.BOOLEAN,
|
type: OptionType.BOOLEAN,
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
|
@ -286,11 +286,9 @@ export default definePlugin({
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settings.store.hideWithSpotify) {
|
if (settings.store.hideWithSpotify) {
|
||||||
for (const activity of PresenceStore.getActivities()) {
|
if (PresenceStore.getActivities().some(a => a.type === ActivityType.LISTENING && a.application_id !== applicationId)) {
|
||||||
if (activity.type === ActivityType.LISTENING && activity.application_id !== applicationId) {
|
// there is already music status because of Spotify or richerCider (probably more)
|
||||||
// there is already music status because of Spotify or richerCider (probably more)
|
return null;
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue