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.

Sign up for GitHub

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

Improve Discord RPC #1765

Merged
merged 1 commit into from
Aug 10, 2024
Merged

Improve Discord RPC #1765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 43 additions & 17 deletions lib/provider/discord_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,47 @@ import 'package:spotify/spotify.dart';
import 'package:spotube/extensions/artist_simple.dart';
import 'package:spotube/provider/audio_player/audio_player.dart';
import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
import 'package:spotube/services/audio_player/audio_player.dart';
import 'package:spotube/utils/platform.dart';

class DiscordNotifier extends AsyncNotifier<void> {
@override
FutureOr<void> build() async {
final enabled = ref.watch(
userPreferencesProvider.select((s) => s.discordPresence && kIsDesktop));
final playback = ref.read(audioPlayerProvider);

final subscription =
FlutterDiscordRPC.instance.isConnectedStream.listen((connected) async {
if (connected && playback.activeTrack != null) {
await updatePresence(playback.activeTrack!);
}
});
var lastPosition = audioPlayer.position;

final subscriptions =
[
FlutterDiscordRPC.instance.isConnectedStream.listen((connected) async {
final playback = ref.read(audioPlayerProvider);
if (connected && playback.activeTrack != null) {
await updatePresence(playback.activeTrack!);
}
}),
audioPlayer.playerStateStream.listen((state) async {
final playback = ref.read(audioPlayerProvider);
if (playback.activeTrack == null) return;

await updatePresence(ref.read(audioPlayerProvider).activeTrack!);
}),
audioPlayer.positionStream.listen((position) async {
final playback = ref.read(audioPlayerProvider);
if (playback.activeTrack != null) {
final diff = position.inMilliseconds - lastPosition.inMilliseconds;
if (diff > 500 || diff < -500) {
await updatePresence(ref.read(audioPlayerProvider).activeTrack!);
}
}
lastPosition = position;
})
];

ref.onDispose(() async {
subscription.cancel();
for (final subscription in subscriptions) {
subscription.cancel();
}
await close();
await FlutterDiscordRPC.instance.dispose();
});
Expand All @@ -37,15 +60,18 @@ class DiscordNotifier extends AsyncNotifier<void> {
}

Future<void> updatePresence(Track track) async {
await clear();
final artistNames = track.artists?.asString() ?? "";
final artistNames = track.artists?.asString();
final isPlaying = audioPlayer.isPlaying;
final position = audioPlayer.position;

await FlutterDiscordRPC.instance.setActivity(
activity: RPCActivity(
details: "${track.name} by $artistNames",
state: "Vibing in Music",
assets: const RPCAssets(
largeImage: "spotube-logo-foreground",
largeText: "Spotube",
details: track.name,
state: artistNames != null ? "by $artistNames" : null,
assets: RPCAssets(
largeImage:
track.album?.images?.first.url ?? "spotube-logo-foreground",
largeText: track.album?.name ?? "Unknown album",
smallImage: "spotube-logo-foreground",
smallText: "Spotube",
),
Expand All @@ -57,7 +83,7 @@ class DiscordNotifier extends AsyncNotifier<void> {
),
],
timestamps: RPCTimestamps(
start: DateTime.now().millisecondsSinceEpoch,
start: isPlaying ? DateTime.now().millisecondsSinceEpoch - position.inMilliseconds : null,
),
),
);
Expand All @@ -73,4 +99,4 @@ class DiscordNotifier extends AsyncNotifier<void> {
}

final discordProvider =
AsyncNotifierProvider<DiscordNotifier, void>(() => DiscordNotifier());
AsyncNotifierProvider<DiscordNotifier, void>(() => DiscordNotifier());