diff --git a/.idea/misc.xml b/.idea/misc.xml index 94fad1c..079ae5f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,3 +1,4 @@ + diff --git a/README.md b/README.md index 6975308..582139d 100644 --- a/README.md +++ b/README.md @@ -7,21 +7,21 @@
A multipurpose Discord bot written in Java. -## Required Environment -- Java 17+ (May work on older versions but untested) +## Tested Environments +- Java 21+ (May work on older versions but untested) - Maven ### Tested Operating Systems -- macOS 14 & 15 (arm64) -- Windows 10 22H2 (x86_64) -- Debian 12 (x86_64) +- macOS 14.4.1 +- Windows 10 (22H2) --- ## Config file schema ```json { - "token": "your_token" + "token": "your_token", + "prefix": "oki!" } ``` @@ -29,11 +29,9 @@ A multipurpose Discord bot written in Java. ## Commands -| Command | Description | Arguments | -|-------------------|------------------------------------------------------------------------------|-----------------------------------------------------------| -| `/ping` | Gets the bot's gateway & rest ping | None | -| `/whois` | Gets information about the specified user (message author if none specified) | `[member]` | -| `/timeout set` | Times out a member for a specified amount of time | `[member]`, `[duration]`, `(reason)` | -| `/timeout get` | Gets the current timeout status of the specified member | `[member]` | -| `/timeout cancel` | Cancels the specified users timeout | `[member]`, `(reason)` | -| `/poll` | Creates a poll | `[title]`, `[duration]`, `[options]`, `(multiple-choice)` | +| Command | Description | Arguments | Aliases | +|---------|------------------------------------------------------------------------------|-------------------------------------|---------| +| `about` | Gets information about the bot | None | None | +| `ping` | Gets the bot's gateway & rest ping | None | None | +| `whois` | Gets information about the specified user (message author if none specified) | `[user ping]` | None | +| `mute` | Mutes a member for a specified amount of time | `[user ping]`, `[timeout duration]` | None | \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5ccf8f2..04a17ba 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.hypr doki - 1.0.6 + 1.0.0 17 @@ -18,7 +18,7 @@ net.dv8tion JDA - 5.2.1 + 5.0.1 io.github.freya022 @@ -39,7 +39,7 @@ ch.qos.logback logback-classic - 1.5.13 + 1.5.6 org.mariadb.jdbc @@ -56,15 +56,5 @@ commons-dbutils 1.8.1 - - ch.qos.logback - logback-core - 1.5.13 - - - com.google.protobuf - protobuf-java - 4.28.2 -
\ No newline at end of file diff --git a/src/main/java/net/hypr/doki/commands/moderation/Warn.java b/src/main/java/net/hypr/doki/commands/moderation/Warn.java deleted file mode 100644 index 4c6be60..0000000 --- a/src/main/java/net/hypr/doki/commands/moderation/Warn.java +++ /dev/null @@ -1,34 +0,0 @@ -package net.hypr.doki.commands.moderation; - -import com.freya02.botcommands.api.annotations.BotPermissions; -import com.freya02.botcommands.api.annotations.CommandMarker; -import com.freya02.botcommands.api.annotations.UserPermissions; -import com.freya02.botcommands.api.application.ApplicationCommand; -import com.freya02.botcommands.api.application.annotations.AppOption; -import com.freya02.botcommands.api.application.slash.GuildSlashEvent; -import com.freya02.botcommands.api.application.slash.annotations.JDASlashCommand; -import net.dv8tion.jda.api.EmbedBuilder; -import net.dv8tion.jda.api.Permission; -import net.dv8tion.jda.api.entities.Member; - -@CommandMarker -@BotPermissions(Permission.MODERATE_MEMBERS) -@UserPermissions(Permission.MODERATE_MEMBERS) -public class Warn extends ApplicationCommand { - @JDASlashCommand( - name = "warn", - description = "Warns a member" - ) - public void warn(GuildSlashEvent event, - @AppOption(name = "member", description = "The member to warn") Member member, - @AppOption(name = "reason", description = "The reason for warning them") String reason) { - EmbedBuilder warnEmbed = new EmbedBuilder() - .setTitle(String.format("You were warned in %s", event.getGuild().getName())) - .setDescription(String.format("**Reason:** %s", reason)); - member.getUser().openPrivateChannel().queue((dm) -> dm.sendMessageEmbeds(warnEmbed.build()).queue( - success -> event.replyFormat("Warned %s for %s", member.getAsMention(), reason).setEphemeral(true).queue(), - // User has blocked bot or disabled DMs - error -> event.replyFormat("Warned %s for %s\n-# (Unable to DM user)", member.getAsMention(), reason).queue() - )); - } -} \ No newline at end of file