Update dependencies and enhance ban command

SoAJeff · Sep 26, 2021 · a9a00c1 · a9a00c1
1 parent 0657f23
commit a9a00c1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/soa-discord/pom.xml b/soa-discord/pom.xml
@@ -48,12 +48,12 @@
         <dependency>
             <groupId>com.rometools</groupId>
             <artifactId>rome</artifactId>
-            <version>1.15.0</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.discord4j</groupId>
             <artifactId>discord4j-core</artifactId>
-            <version>3.1.6</version>
+            <version>3.1.8</version>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>3.0.1</version>
+            <version>3.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.jvnet.jaxb2_commons</groupId>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.10.0</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.reflections</groupId>

diff --git a/soa-discord/src/main/java/com/soa/rs/discordbot/v3/commands/UserBanEvent.java b/soa-discord/src/main/java/com/soa/rs/discordbot/v3/commands/UserBanEvent.java
@@ -18,7 +18,8 @@ public void initialize() {
 				.isEnabled()) {
 			setEnabled(true);
 			setMustHavePermission(DiscordCfgFactory.getConfig().getAdminEvent().getAllowedRoles().getRole());
-			addHelpMsg(".ban", "Admin can tag user(s) and they will be banned from the server.");
+			addHelpMsg(".ban",
+					"Admin can tag user(s) and they will be banned from the server.  Or provide args -id and -history to ban by ID, and remove 7 days history.");
 		} else {
 			setEnabled(false);
 		}
@@ -27,7 +28,7 @@ public void initialize() {
 	@Override
 	public Mono<Void> execute(MessageCreateEvent event) {
 		SoaLogging.getLogger(this).info("Attempting to ban user from server");
-		if (event.getMessage().getContent().contains("-id")) {
+		if (event.getMessage().getContent().contains("-id") && event.getMessage().getContent().contains("-history")) {
 			String[] args = event.getMessage().getContent().trim().split(" ");
 			return permittedToExecuteEvent(event.getMember().get())
 					.flatMapMany(ignored -> event.getGuild())
@@ -38,7 +39,17 @@ public Mono<Void> execute(MessageCreateEvent event) {
 						SoaLogging.getLogger(this).error("Failed to ban user: " + err.getMessage());
 						return Mono.empty();
 					})).then(event.getMessage().delete()).then();
-		} else {
+		} else if (event.getMessage().getContent().contains("-id")) {
+			String[] args = event.getMessage().getContent().trim().split(" ");
+			return permittedToExecuteEvent(event.getMember().get()).flatMapMany(ignored -> event.getGuild()).flatMap(
+					guildld -> guildld.ban(Snowflake.of(args[args.length - 1]),
+							banQuerySpec -> banQuerySpec.setReason("Ban issued via admin ban request"))
+							.onErrorResume(err -> {
+						SoaLogging.getLogger(this).error("Failed to ban user: " + err.getMessage());
+						return Mono.empty();
+					})).then(event.getMessage().delete()).then();
+		}
+		else {
 			return permittedToExecuteEvent(event.getMember().get())
 					.flatMapMany(ignored -> event.getMessage().getUserMentions())
 					.flatMap(user -> user.asMember(event.getGuildId().get()))