Skip to content

Commit 5e7845e

Browse files
committed
Make waitFor return a future.
1 parent 1588c94 commit 5e7845e

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
group 'me.devoxin'
8-
version '4.0.1'
8+
version '4.1.0'
99

1010
repositories {
1111
maven {

src/main/kotlin/me/devoxin/flight/api/context/Context.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package me.devoxin.flight.api.context
22

3-
import kotlinx.coroutines.future.await
43
import me.devoxin.flight.api.CommandClient
54
import me.devoxin.flight.api.entities.DSLMessageCreateBuilder
65
import me.devoxin.flight.internal.entities.Executable
7-
import net.dv8tion.jda.api.EmbedBuilder
86
import net.dv8tion.jda.api.JDA
97
import net.dv8tion.jda.api.entities.Guild
108
import net.dv8tion.jda.api.entities.Member
@@ -13,7 +11,6 @@ import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel
1311
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel
1412
import net.dv8tion.jda.api.events.Event
1513
import net.dv8tion.jda.api.utils.FileUpload
16-
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder
1714
import net.dv8tion.jda.api.utils.messages.MessageCreateData
1815
import java.util.concurrent.CompletableFuture
1916

@@ -158,8 +155,7 @@ interface Context {
158155
*
159156
* @throws java.util.concurrent.TimeoutException
160157
*/
161-
suspend fun <T: Event> waitFor(event: Class<T>, predicate: (T) -> Boolean, timeout: Long): T {
162-
val r = commandClient.waitFor(event, predicate, timeout)
163-
return r.await()
158+
fun <T: Event> waitFor(event: Class<T>, predicate: (T) -> Boolean, timeout: Long): CompletableFuture<T> {
159+
return commandClient.waitFor(event, predicate, timeout)
164160
}
165161
}

0 commit comments

Comments
 (0)