Commit d6dc9a50 authored by Jose V. Trigueros's avatar Jose V. Trigueros

Update Maven dependencies

Squashed commit of the following:

commit d6d94c14349ca5cff4954e11edcfc382ffc01ef0
Author: Jose V. Trigueros <[email protected]>
Date:   Fri Jan 24 09:04:51 2020 -0800

    Use flatMap instead of queue nesting, new on JDA 4.1.1 :D

commit fe012638aba684d48b23d0d1438418aac8420be9
Author: Jose V. Trigueros <[email protected]>
Date:   Fri Jan 24 08:40:40 2020 -0800

    Update to JDA 4.1.1

    Also update minio-sdk, java-rx, and jcenter URL
parent 5707a11b
Pipeline #112101472 passed with stages
in 15 minutes and 23 seconds
......@@ -10,7 +10,7 @@
</scm>
<properties>
<jda.version>4.1.0_95</jda.version>
<jda.version>4.1.1_101</jda.version>
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
<kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
<kotlin.version>1.3.61</kotlin.version>
......@@ -59,12 +59,12 @@
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
<version>6.0.11</version>
<version>6.0.12</version>
</dependency>
<dependency>
<groupId>io.reactivex.rxjava2</groupId>
<artifactId>rxjava</artifactId>
<version>2.2.16</version>
<version>2.2.17</version>
</dependency>
<dependency>
<groupId>net.dv8tion</groupId>
......@@ -280,7 +280,7 @@
<repository>
<id>jcenter</id>
<name>jcenter-bintray</name>
<url>http://jcenter.bintray.com</url>
<url>https://jcenter.bintray.com</url>
</repository>
<repository>
<id>jitpack.io</id>
......
......@@ -68,19 +68,11 @@ class Help : CommandHandler() {
embed.addField(commandHandler.usage(prefix), description, false)
}
event.author.openPrivateChannel().queue { channel ->
try {
channel
.sendMessage(embed.build())
.queue {
BotUtils.sendMessage(defaultChannel, ":information_source: _**<@${event.author.id}>** check your DMs!_")
}
} catch (ex: UnsupportedOperationException) {
logger.warn(ex) {
"Couldn't send DM to ${event.author.name}"
}
}
}
event.author.openPrivateChannel()
.flatMap { it.sendMessage(embed.build()) }
.queue(
{ BotUtils.sendMessage(defaultChannel, ":information_source: _**<@${event.author.id}>** check your DMs!_") },
{ ex -> logger.warn(ex) { "Couldn't send DM to ${event.author.name}" } })
}
override fun usage(prefix: String): String = "${prefix}help"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment