Skip to content

Commit 6c9bdc9

Browse files
duncte123duncte123
committed
rename getLink to getOrCreateLink
1 parent 533f8e1 commit 6c9bdc9

File tree

8 files changed

+34
-21
lines changed

8 files changed

+34
-21
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public void onDiscordVoiceServerUpdate(VoiceServerUpdateEvent event) {
163163
VoiceRegion region = VoiceRegion.fromEndpoint(event.getEndpoint());
164164

165165
// You can omit the region parameter if you dont need region balancing.
166-
Link link = lavalink.getLink(event.getGuildId(), region);
166+
Link link = lavalink.getOrCreateLink(event.getGuildId(), region);
167167

168168
// Finally, tell lavalink to connect.
169169
link.onVoiceServerUpdate(lavalinkVoiceState);

‎src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkClient.kt‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,21 @@ class LavalinkClient(val userId: Long) : Closeable, Disposable {
109109
* @param guildId The id of the guild
110110
* @param region (not currently used) The target voice region of when to select a node
111111
*/
112+
@Deprecated(
113+
message = "Method name unclear",
114+
replaceWith = ReplaceWith("getOrCreateLink(guildId, region)")
115+
)
112116
@JvmOverloads
113-
fun getLink(guildId: Long, region: VoiceRegion? = null): Link {
117+
fun getLink(guildId: Long, region: VoiceRegion? = null) = getOrCreateLink(guildId, region)
118+
119+
/**
120+
* Get or crate a link between a guild and a node.
121+
*
122+
* @param guildId The id of the guild
123+
* @param region (not currently used) The target voice region of when to select a node
124+
*/
125+
@JvmOverloads
126+
fun getOrCreateLink(guildId: Long, region: VoiceRegion? = null): Link {
114127
if (!linkMap.containsKey(guildId)) {
115128
val bestNode = loadBalancer.selectNode(region)
116129
linkMap[guildId] = Link(guildId, bestNode)

‎src/main/kotlin/dev/arbjerg/lavalink/libraries/discord4j/D4JVoiceUpdateHandler.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fun GatewayDiscordClient.installVoiceHandler(lavalink: LavalinkClient): Disposab
4949
)
5050

5151
val region = VoiceRegion.fromEndpoint(update.endpoint!!)
52-
val link = lavalink.getLink(update.guildId.asLong(), region)
52+
val link = lavalink.getOrCreateLink(update.guildId.asLong(), region)
5353

5454
link.onVoiceServerUpdate(state)
5555
Mono.empty<Unit>()

‎src/main/kotlin/dev/arbjerg/lavalink/libraries/jda/JDAVoiceUpdateListener.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class JDAVoiceUpdateListener(private val lavalink: LavalinkClient) : VoiceDispat
1414
update.sessionId
1515
)
1616
val region = VoiceRegion.fromEndpoint(update.endpoint)
17-
val link = lavalink.getLink(update.guildIdLong, region)
17+
val link = lavalink.getOrCreateLink(update.guildIdLong, region)
1818

1919
link.onVoiceServerUpdate(state)
2020
}

‎src/test/java/JavaJDAExample.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
142142
joinHelper(event);
143143
break;
144144
case "stop":
145-
this.client.getLink(event.getGuild().getIdLong())
145+
this.client.getOrCreateLink(event.getGuild().getIdLong())
146146
.updatePlayer(
147147
(update) -> update.setTrack(null).setPaused(false)
148148
)
@@ -155,7 +155,7 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
155155
event.reply("Leaving your channel!").queue();
156156
break;
157157
case "pause":
158-
this.client.getLink(event.getGuild().getIdLong())
158+
this.client.getOrCreateLink(event.getGuild().getIdLong())
159159
.getPlayer()
160160
.flatMap((player) -> player.setPaused(!player.getPaused()))
161161
.subscribe((player) -> {
@@ -175,7 +175,7 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
175175

176176
final String identifier = event.getOption("identifier").getAsString();
177177
final long guildId = guild.getIdLong();
178-
final Link link = this.client.getLink(guildId);
178+
final Link link = this.client.getOrCreateLink(guildId);
179179

180180
link.loadItem(identifier).subscribe(new FunctionalLoadResultHandler(
181181
// Track loaded
@@ -239,7 +239,7 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
239239
break;
240240
}
241241
case "custom-request": {
242-
final Link link = this.client.getLink(event.getGuild().getIdLong());
242+
final Link link = this.client.getOrCreateLink(event.getGuild().getIdLong());
243243

244244
link.getNode().customRequest(
245245
(builder) -> builder.get().path("/version").header("Accept", "text/plain")
@@ -255,7 +255,7 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
255255
break;
256256
}
257257
case "custom-json-request": {
258-
final Link link = this.client.getLink(event.getGuild().getIdLong());
258+
final Link link = this.client.getOrCreateLink(event.getGuild().getIdLong());
259259
link.getNode().customJsonRequest(com.github.topi314.lavasearch.protocol.SearchResult.Companion.serializer(),
260260
(builder) -> builder.path("/v4/loadsearch?query=ytsearch%3Anever%20gonna%20give%20you%20up").get()
261261
).doOnSuccess((loadResult -> {

‎src/test/kotlin/d4jTestScript.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private fun handleSlash(lavalink: LavalinkClient, event: ChatInputInteractionEve
104104
.flatMap(ApplicationCommandInteractionOption::getValue)
105105
.map(ApplicationCommandInteractionOptionValue::asString)
106106
.get()
107-
val link = lavalink.getLink(event.interaction.guildId.get().asLong())
107+
val link = lavalink.getOrCreateLink(event.interaction.guildId.get().asLong())
108108
link.getPlayer().block()!!.setIdentifier(input)
109109
.subscribe()
110110
event.reply("Playing!!").subscribe()

‎src/test/kotlin/testScript.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ private fun handleSlash(lavalink: LavalinkClient, event: SlashCommandInteraction
139139
when (event.fullCommandName) {
140140
"custom-request" -> {
141141
val guildId = event.guild!!.idLong
142-
val link = lavalink.getLink(guildId)
142+
val link = lavalink.getOrCreateLink(guildId)
143143

144144
link.node.customRequest {
145145
it.get()
@@ -157,7 +157,7 @@ private fun handleSlash(lavalink: LavalinkClient, event: SlashCommandInteraction
157157

158158
"custon-json-request" -> {
159159
val guildId = event.guild!!.idLong
160-
val link = lavalink.getLink(guildId)
160+
val link = lavalink.getOrCreateLink(guildId)
161161

162162
link.node.customJsonRequest<TopiSearchResult>{
163163
it.get().path("/v4/loadtracks?identifier=ytsearch%3Anever%20gonna%20give%20you%20up")
@@ -189,7 +189,7 @@ private fun handleSlash(lavalink: LavalinkClient, event: SlashCommandInteraction
189189
event.reply("Leaving your channel!").queue()
190190

191191
val guildId = event.guild!!.idLong
192-
val link = lavalink.getLink(guildId)
192+
val link = lavalink.getOrCreateLink(guildId)
193193

194194
println(link.node.playerCache)
195195
}
@@ -203,7 +203,7 @@ private fun handleSlash(lavalink: LavalinkClient, event: SlashCommandInteraction
203203

204204
val identifier = event.getOption("identifier")!!.asString
205205
val guildId = event.guild!!.idLong
206-
val link = lavalink.getLink(guildId)
206+
val link = lavalink.getOrCreateLink(guildId)
207207

208208
link.loadItem(identifier).subscribe loadItem@ { item ->
209209
when (item) {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
7070
joinHelper(event);
7171
break;
7272
case "stop":
73-
this.client.getLink(guild.getIdLong())
73+
this.client.getOrCreateLink(guild.getIdLong())
7474
.updatePlayer(
7575
(update) -> update.setTrack(null).setPaused(false)
7676
)
@@ -83,7 +83,7 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
8383
event.reply("Leaving your channel!").queue();
8484
break;
8585
case "now-playing": {
86-
final var link = this.client.getLink(guild.getIdLong());
86+
final var link = this.client.getOrCreateLink(guild.getIdLong());
8787
final var player = link.getCachedPlayer();
8888

8989
if (player == null) {
@@ -111,7 +111,7 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
111111
break;
112112
}
113113
case "pause":
114-
this.client.getLink(guild.getIdLong())
114+
this.client.getOrCreateLink(guild.getIdLong())
115115
.getPlayer()
116116
.flatMap((player) -> player.setPaused(!player.getPaused()))
117117
.subscribe((player) -> {
@@ -120,7 +120,7 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
120120
break;
121121
case "karaoke on": {
122122
final long guildId = guild.getIdLong();
123-
final Link link = this.client.getLink(guildId);
123+
final Link link = this.client.getOrCreateLink(guildId);
124124

125125
link.createOrUpdatePlayer()
126126
.setFilters(
@@ -136,7 +136,7 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
136136
}
137137
case "karaoke off": {
138138
final long guildId = guild.getIdLong();
139-
final Link link = this.client.getLink(guildId);
139+
final Link link = this.client.getOrCreateLink(guildId);
140140

141141
link.createOrUpdatePlayer()
142142
.setFilters(
@@ -159,14 +159,14 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
159159

160160
final String identifier = event.getOption("identifier").getAsString();
161161
final long guildId = guild.getIdLong();
162-
final Link link = this.client.getLink(guildId);
162+
final Link link = this.client.getOrCreateLink(guildId);
163163

164164
link.loadItem(identifier).subscribe(new AudioLoader(link, event));
165165

166166
break;
167167
}
168168
case "custom-request": {
169-
final Link link = this.client.getLink(guild.getIdLong());
169+
final Link link = this.client.getOrCreateLink(guild.getIdLong());
170170

171171
link.getNode().customRequest(
172172
(builder) -> builder.get().path("/version").header("Accept", "text/plain")

0 commit comments

Comments
 (0)