Skip to content

Commit 68c29a4

Browse files
committed
Deprecate asMono
1 parent 0aa1a8a commit 68c29a4

File tree

9 files changed

+15
-14
lines changed

9 files changed

+15
-14
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
99

1010
Feature overview:
11+
- [Uses reactor](https://projectreactor.io/) (please make sure you understand how reactor works)
1112
- Works with any discord library (as long as they allow for sending direct request to discord)
1213
- Load balancing based on server metrics and voice server region.
1314
- Make your own custom load balancers and penalty providers!

src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkNode.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class LavalinkNode(
122122

123123
return rest.getPlayer(guildId)
124124
.map { it.toLavalinkPlayer(this) }
125-
.onErrorResume { createOrUpdatePlayer(guildId).asMono() }
125+
.onErrorResume { createOrUpdatePlayer(guildId) }
126126
.doOnNext {
127127
// Update the player internally upon retrieving it.
128128
playerCache[it.guildId] = it
@@ -134,7 +134,7 @@ class LavalinkNode(
134134

135135
updateConsumer.accept(update)
136136

137-
return update.asMono()
137+
return update
138138
}
139139

140140
/**

src/main/kotlin/dev/arbjerg/lavalink/client/Link.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class Link(
5252
node.removeCachedPlayer(guildId)
5353
newNode.createOrUpdatePlayer(guildId)
5454
.applyBuilder(player.stateToBuilder())
55-
.asMono()
5655
.block()
5756
}
5857

@@ -64,7 +63,6 @@ class Link(
6463
state = LinkState.CONNECTING
6564
node.createOrUpdatePlayer(guildId)
6665
.setVoiceState(newVoiceState)
67-
.asMono()
6866
.subscribe()
6967
}
7068
}

src/main/kotlin/dev/arbjerg/lavalink/client/PlayerUpdateBuilder.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,19 @@ class PlayerUpdateBuilder internal constructor(private val node: LavalinkNode, p
126126
voice = state
127127
)
128128

129-
fun asMono(): Mono<LavalinkPlayer> {
130-
return node.rest.updatePlayer(build(), guildId, noReplace)
129+
@Deprecated(
130+
message = "This method causes improper usage of the reactor system",
131+
replaceWith = ReplaceWith("subscribe()")
132+
)
133+
fun asMono(): Mono<LavalinkPlayer> = this
134+
135+
override fun subscribe(actual: CoreSubscriber<in LavalinkPlayer>) {
136+
node.rest.updatePlayer(build(), guildId, noReplace)
131137
.map { it.toLavalinkPlayer(node) }
132138
.doOnNext {
133139
// Update player in cache
134140
node.playerCache[guildId] = it
135141
}
142+
.subscribe(actual)
136143
}
137-
138-
override fun subscribe(actual: CoreSubscriber<in LavalinkPlayer>) = asMono().subscribe(actual)
139144
}

src/main/kotlin/dev/arbjerg/lavalink/internal/LavalinkSocket.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class LavalinkSocket(private val node: LavalinkNode) : WebSocketListener(), Clos
4444
// Re-create the player on the node.
4545
player.stateToBuilder()
4646
.setNoReplace(false)
47-
.asMono().subscribe()
47+
.subscribe()
4848
}
4949
}
5050

src/test/java/JavaJDAExample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
157157
case "pause":
158158
this.client.getLink(event.getGuild().getIdLong())
159159
.getPlayer()
160-
.flatMap((player) -> player.setPaused(!player.getPaused()).asMono())
160+
.flatMap((player) -> player.setPaused(!player.getPaused()))
161161
.subscribe((player) -> {
162162
event.reply("Player has been " + (player.getPaused() ? "paused" : "resumed") + "!").queue();
163163
});

src/test/kotlin/d4jTestScript.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ private fun handleSlash(lavalink: LavalinkClient, event: ChatInputInteractionEve
106106
.get()
107107
val link = lavalink.getLink(event.interaction.guildId.get().asLong())
108108
link.getPlayer().block()!!.setIdentifier(input)
109-
.asMono()
110109
.subscribe()
111110
event.reply("Playing!!").subscribe()
112111
}

src/test/kotlin/testScript.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ private fun handleSlash(lavalink: LavalinkClient, event: SlashCommandInteraction
188188
when (item) {
189189
is TrackLoaded -> {
190190
link.createOrUpdatePlayer().setTrack(item.track)
191-
.asMono()
192191
.subscribe {
193192
event.hook.sendMessage("Now playing ${item.track.info.title}!").queue()
194193
}
@@ -212,7 +211,6 @@ private fun handleSlash(lavalink: LavalinkClient, event: SlashCommandInteraction
212211
val track = item.tracks.first()
213212

214213
link.createOrUpdatePlayer().setTrack(track)
215-
.asMono()
216214
.subscribe {
217215
event.hook.sendMessage("Now playing ${track.info.title}!").queue()
218216
}

testbot/src/main/java/me/duncte123/testbot/JDAListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
7878
case "pause":
7979
this.client.getLink(event.getGuild().getIdLong())
8080
.getPlayer()
81-
.flatMap((player) -> player.setPaused(!player.getPaused()).asMono())
81+
.flatMap((player) -> player.setPaused(!player.getPaused()))
8282
.subscribe((player) -> {
8383
event.reply("Player has been " + (player.getPaused() ? "paused" : "resumed") + "!").queue();
8484
});

0 commit comments

Comments
 (0)