sciwhiz12/Janitor
1
0
Fork 0
mirror of https://github.com/sciwhiz12/Janitor.git synced 2024-09-19 23:24:03 +00:00
Code Issues Releases Wiki Activity

Move to JDA

Browse Source
This commit is contained in:
Arnold Alejo Nunag 2020-09-18 03:05:56 +08:00
parent fb10a70891
commit 888309063c
Signed by: sciwhiz12
GPG Key ID: 622CF446534317E1
14 changed files with 129 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -31,7 +31,7 @@ version = getVersion()
println("Version: ${version}")
dependencies {
implementation group: 'org.javacord', name: 'javacord', version: javacord_version
implementation group: 'net.dv8tion', name: 'JDA', version: jda_version
implementation group: 'com.electronwill.night-config', name: 'toml', version: nightconfig_version
implementation group: 'net.sf.jopt-simple', name: 'jopt-simple', version: jopt_version
implementation group: 'com.google.guava', name: 'guava', version: guava_version

2
gradle.properties
View File

@ -1,7 +1,7 @@
grgit_version=4.0.2
shadow_version=6.0.0
javacord_version=3.0.6
jda_version=4.2.0_168
nightconfig_version=3.6.3
jopt_version=6.0-alpha-3
guava_version=29.0-jre

2
src/main/java/sciwhiz12/janitor/BotConsole.java
View File

@ -36,7 +36,7 @@ public class BotConsole {
String[] parts = input.split(" ");
switch (parts[0]) {
case "shutdown": {
bot.disconnect();
bot.shutdown();
break;
}
default:

23
src/main/java/sciwhiz12/janitor/BotStartup.java
View File

@ -1,6 +1,12 @@
package sciwhiz12.janitor;
import org.javacord.api.DiscordApiBuilder;
import net.dv8tion.jda.api.JDABuilder;
import net.dv8tion.jda.api.OnlineStatus;
import net.dv8tion.jda.api.entities.Activity;
import net.dv8tion.jda.api.events.ReadyEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.dv8tion.jda.api.requests.GatewayIntent;
import org.jetbrains.annotations.NotNull;
import sciwhiz12.janitor.config.BotConfig;
import sciwhiz12.janitor.config.BotOptions;
@ -19,9 +25,18 @@ public class BotStartup {
JANITOR.info("Building bot instance and connecting to Discord...");
try {
DiscordApiBuilder builder = new DiscordApiBuilder().setToken(config.getToken().get());
builder.login()
.thenAccept(api -> new JanitorBot(api, config));
JDABuilder builder = JDABuilder.createDefault(config.getToken().get());
builder.enableIntents(GatewayIntent.GUILD_MESSAGES, GatewayIntent.DIRECT_MESSAGES, GatewayIntent.GUILD_MEMBERS)
.setStatus(OnlineStatus.DO_NOT_DISTURB)
.setAutoReconnect(true)
.setActivity(Activity.listening("for the ready call..."))
.addEventListeners(new ListenerAdapter() {
@Override
public void onReady(@NotNull ReadyEvent event) {
new JanitorBot(event.getJDA(), config);
}
})
.build();
} catch (Exception ex) {
JANITOR.error("Error while building Discord connection", ex);
}

68
src/main/java/sciwhiz12/janitor/JanitorBot.java
View File

@ -1,9 +1,10 @@
package sciwhiz12.janitor;
import org.javacord.api.DiscordApi;
import org.javacord.api.entity.activity.ActivityType;
import org.javacord.api.entity.user.User;
import org.javacord.api.entity.user.UserStatus;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.OnlineStatus;
import net.dv8tion.jda.api.entities.Activity;
import net.dv8tion.jda.api.entities.PrivateChannel;
import net.dv8tion.jda.api.entities.User;
import sciwhiz12.janitor.commands.CommandRegistry;
import sciwhiz12.janitor.config.BotConfig;
import sciwhiz12.janitor.utils.Util;
@ -12,35 +13,34 @@ import static sciwhiz12.janitor.Logging.JANITOR;
import static sciwhiz12.janitor.Logging.STATUS;
public class JanitorBot {
private final DiscordApi discord;
private final JDA discord;
private final BotConfig config;
private final BotConsole console;
private final CommandRegistry cmdRegistry;
public JanitorBot(DiscordApi discord, BotConfig config) {
public JanitorBot(JDA discord, BotConfig config) {
this.config = config;
this.console = new BotConsole(this, System.in);
this.cmdRegistry = new CommandRegistry(this, config.getCommandPrefix());
this.discord = discord;
discord.addMessageCreateListener(cmdRegistry);
discord.updateStatus(UserStatus.ONLINE);
discord.updateActivity(ActivityType.PLAYING, " n' sweeping n' testing!");
discord.addEventListener(cmdRegistry);
discord.getPresence().setPresence(OnlineStatus.ONLINE, Activity.playing(" n' sweeping n' testing!"));
JANITOR.info("Ready!");
config.getOwnerID()
.map(ownerId -> getDiscord().getUserById(ownerId))
.map(discord::retrieveUserById)
.ifPresent(retrieveUser ->
retrieveUser
.thenCompose(User::openPrivateChannel)
.thenCompose(channel -> channel.sendMessage("Started up and ready!"))
.whenCompleteAsync(Util.handle(
.flatMap(User::openPrivateChannel)
.flatMap(channel -> channel.sendMessage("Started up and ready!"))
.queue(
msg -> JANITOR.debug(STATUS, "Sent ready message to owner!"),
error -> JANITOR.error(STATUS, "Error while sending ready message to owner", error))
error -> JANITOR.error(STATUS, "Error while sending ready message to owner", error)
)
);
console.start();
}
public DiscordApi getDiscord() {
public JDA getDiscord() {
return this.discord;
}
@ -52,24 +52,28 @@ public class JanitorBot {
return this.cmdRegistry;
}
public void disconnect() {
public void shutdown() {
JANITOR.info(STATUS, "Shutting down!");
console.stop();
discord.disconnect();
// getConfig().getOwnerID()
// .map(id -> getJDA().getUserById(id))
// .ifPresent(owner -> owner.openPrivateChannel().submit()
// .thenCompose(channel -> channel.sendMessage(
// "Shutting down, in accordance with your orders. Goodbye!")
// .submit())
// .whenComplete(Util.handle(
// msg -> JANITOR
// .debug(STATUS, "Sent shutdown message to owner: {}",
// Util.toString(owner)),
// err -> JANITOR
// .error(STATUS, "Error while sending shutdown message to owner", err)
// ))
// .join());
// getJDA().shutdown();
getConfig().getOwnerID()
.map(discord::retrieveUserById)
.map(owner ->
owner
.flatMap(User::openPrivateChannel)
.flatMap(channel ->
channel.sendMessage("Shutting down, in accordance with your orders. Goodbye!"))
.submit()
.whenComplete(Util.handle(
msg ->
JANITOR
.debug(STATUS, "Sent shutdown message to owner: {}",
Util.toString(((PrivateChannel) msg.getChannel()).getUser())),
err ->
JANITOR
.error(STATUS, "Error while sending shutdown message to owner", err)
))
.join()
);
discord.shutdown();
}
}

4
src/main/java/sciwhiz12/janitor/commands/BaseCommand.java
View File

@ -1,7 +1,7 @@
package sciwhiz12.janitor.commands;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import org.javacord.api.event.message.MessageCreateEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import sciwhiz12.janitor.JanitorBot;
public abstract class BaseCommand {
@ -19,5 +19,5 @@ public abstract class BaseCommand {
return registry.getBot();
}
public abstract LiteralArgumentBuilder<MessageCreateEvent> getNode();
public abstract LiteralArgumentBuilder<MessageReceivedEvent> getNode();
}

24
src/main/java/sciwhiz12/janitor/commands/CommandRegistry.java
View File

@ -4,8 +4,10 @@ import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.ParseResults;
import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import org.javacord.api.event.message.MessageCreateEvent;
import org.javacord.api.listener.message.MessageCreateListener;
import net.dv8tion.jda.api.events.GenericEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.EventListener;
import org.jetbrains.annotations.NotNull;
import sciwhiz12.janitor.JanitorBot;
import sciwhiz12.janitor.commands.bot.ShutdownCommand;
import sciwhiz12.janitor.commands.misc.HelloCommand;
@ -19,16 +21,14 @@ import java.util.Map;
import static sciwhiz12.janitor.Logging.COMMANDS;
import static sciwhiz12.janitor.Logging.JANITOR;
public class CommandRegistry implements MessageCreateListener {
public class CommandRegistry implements EventListener {
private final JanitorBot bot;
// private final Pattern pattern;
private final String prefix;
private final Map<String, BaseCommand> registry = new HashMap<>();
private final CommandDispatcher<MessageCreateEvent> dispatcher;
private final CommandDispatcher<MessageReceivedEvent> dispatcher;
public CommandRegistry(JanitorBot bot, String prefix) {
this.bot = bot;
// this.pattern = Pattern.compile("^" + prefix + "([A-Za-z0-9]+).*$");
this.prefix = prefix;
this.dispatcher = new CommandDispatcher<>();
@ -41,7 +41,7 @@ public class CommandRegistry implements MessageCreateListener {
}
}
public CommandDispatcher<MessageCreateEvent> getDispatcher() {
public CommandDispatcher<MessageReceivedEvent> getDispatcher() {
return this.dispatcher;
}
@ -54,14 +54,16 @@ public class CommandRegistry implements MessageCreateListener {
}
@Override
public void onMessageCreate(MessageCreateEvent event) {
String msg = event.getMessage().getContent();
public void onEvent(@NotNull GenericEvent genericEvent) {
if (!(genericEvent instanceof MessageReceivedEvent)) return;
MessageReceivedEvent event = (MessageReceivedEvent) genericEvent;
String msg = event.getMessage().getContentRaw();
if (!msg.startsWith(this.prefix)) return;
JANITOR.debug(COMMANDS, "Received message starting with valid command prefix. Author: {}, full message: {}",
Util.toString(event.getMessageAuthor().asUser().orElse(null)), msg);
Util.toString(event.getAuthor()), msg);
try {
StringReader command = new StringReader(msg.substring(this.prefix.length()));
ParseResults<MessageCreateEvent> parseResults = this.dispatcher.parse(command, event);
ParseResults<MessageReceivedEvent> parseResults = this.dispatcher.parse(command, event);
if (parseResults.getReader().canRead()) {
// Parsing did not succeed, i.e. command not found
// TODO: add separate code path when insufficient permissions / requires fails

12
src/main/java/sciwhiz12/janitor/commands/arguments/UserArgument.java
View File

@ -7,11 +7,11 @@ import com.mojang.brigadier.arguments.ArgumentType;
import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
import org.javacord.api.DiscordApi;
import org.javacord.api.entity.user.User;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.requests.RestAction;
import java.util.Collection;
import java.util.concurrent.CompletableFuture;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -62,7 +62,7 @@ public class UserArgument implements ArgumentType<UserArgument.IUserProvider> {
}
public interface IUserProvider {
CompletableFuture<User> getUsers(DiscordApi api);
RestAction<User> getUsers(JDA api);
}
static class NumericalProvider implements IUserProvider {
@ -73,8 +73,8 @@ public class UserArgument implements ArgumentType<UserArgument.IUserProvider> {
}
@Override
public CompletableFuture<User> getUsers(DiscordApi api) {
return api.getUserById(snowflakeID);
public RestAction<User> getUsers(JDA api) {
return api.retrieveUserById(snowflakeID);
}
}
}

20
src/main/java/sciwhiz12/janitor/commands/bot/ShutdownCommand.java
View File

@ -2,7 +2,7 @@ package sciwhiz12.janitor.commands.bot;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext;
import org.javacord.api.event.message.MessageCreateEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import sciwhiz12.janitor.commands.BaseCommand;
import sciwhiz12.janitor.commands.CommandRegistry;
import sciwhiz12.janitor.utils.Util;
@ -19,23 +19,25 @@ public class ShutdownCommand extends BaseCommand {
}
@Override
public LiteralArgumentBuilder<MessageCreateEvent> getNode() {
public LiteralArgumentBuilder<MessageReceivedEvent> getNode() {
return literal("shutdown")
.requires(ctx -> ctx.getMessageAuthor().getId() == ownerID)
.requires(ctx -> ctx.getAuthor().getIdLong() == ownerID)
.executes(this::run);
}
int run(final CommandContext<MessageCreateEvent> ctx) {
int run(final CommandContext<MessageReceivedEvent> ctx) {
ctx.getSource()
.getMessage()
.getChannel()
.sendMessage("Shutting down, in accordance with the owner's command. Goodbye all!")
.whenCompleteAsync(Util.handle(
success -> JANITOR.debug("Sent shutdown message to channel {}", Util.toString(ctx.getSource().getMessageAuthor())),
err -> JANITOR.error("Error while sending ping message to bot owner {}", Util.toString(ctx.getSource().getMessageAuthor()))
.submit()
.whenComplete(Util.handle(
success -> JANITOR.debug("Sent shutdown message to channel {}", Util.toString(ctx.getSource().getAuthor())),
err -> JANITOR.error("Error while sending ping message to bot owner {}", Util.toString(ctx.getSource().getAuthor()))
)
).join();
getBot().disconnect();
)
.join();
getBot().shutdown();
return 1;
}
}

23
src/main/java/sciwhiz12/janitor/commands/misc/HelloCommand.java
View File

@ -2,7 +2,7 @@ package sciwhiz12.janitor.commands.misc;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext;
import org.javacord.api.event.message.MessageCreateEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import sciwhiz12.janitor.commands.BaseCommand;
import sciwhiz12.janitor.commands.CommandRegistry;
import sciwhiz12.janitor.commands.arguments.UserArgument;
@ -17,7 +17,7 @@ public class HelloCommand extends BaseCommand {
super(registry);
}
public LiteralArgumentBuilder<MessageCreateEvent> getNode() {
public LiteralArgumentBuilder<MessageReceivedEvent> getNode() {
return literal("greet")
.then(
argument("user", UserArgument.user())
@ -25,18 +25,13 @@ public class HelloCommand extends BaseCommand {
);
}
int run(final CommandContext<MessageCreateEvent> ctx) {
UserArgument.getUser("user", ctx).getUsers(ctx.getSource().getApi())
.thenCompose(user ->
ctx.getSource()
.getMessage()
.getChannel()
.sendMessage("Hello " + user.getMentionTag() + " !")
)
.whenCompleteAsync(Util.handle(
success -> JANITOR.debug("Sent greeting message to {}", Util.toString(ctx.getSource().getMessageAuthor())),
err -> JANITOR.error("Error while sending greeting message to {}", Util.toString(ctx.getSource().getMessageAuthor()))
)
int run(final CommandContext<MessageReceivedEvent> ctx) {
UserArgument.getUser("user", ctx)
.getUsers(getBot().getDiscord())
.flatMap(user -> ctx.getSource().getChannel().sendMessage("Hello " + user.getAsMention() + "!"))
.queue(
success -> JANITOR.debug("Sent greeting message to {}", Util.toString(ctx.getSource().getAuthor())),
err -> JANITOR.error("Error while sending greeting message to {}", Util.toString(ctx.getSource().getAuthor()))
);
return 1;
}

13
src/main/java/sciwhiz12/janitor/commands/misc/OKCommand.java
View File

@ -2,7 +2,7 @@ package sciwhiz12.janitor.commands.misc;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext;
import org.javacord.api.event.message.MessageCreateEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import sciwhiz12.janitor.commands.BaseCommand;
import sciwhiz12.janitor.commands.CommandRegistry;
import sciwhiz12.janitor.utils.Util;
@ -15,19 +15,18 @@ public class OKCommand extends BaseCommand {
super(registry);
}
public LiteralArgumentBuilder<MessageCreateEvent> getNode() {
public LiteralArgumentBuilder<MessageReceivedEvent> getNode() {
return literal("ok")
.executes(this::run);
}
int run(final CommandContext<MessageCreateEvent> ctx) {
int run(final CommandContext<MessageReceivedEvent> ctx) {
ctx.getSource()
.getMessage()
.addReaction("\uD83D\uDC4C")
.whenCompleteAsync(Util.handle(
success -> JANITOR.debug("Reacted :ok_hand: to {}'s message", Util.toString(ctx.getSource().getMessageAuthor())),
err -> JANITOR.error("Error while reacting :ok_hand: to {}'s message", Util.toString(ctx.getSource().getMessageAuthor()))
)
.queue(
success -> JANITOR.debug("Reacted :ok_hand: to {}'s message", Util.toString(ctx.getSource().getAuthor())),
err -> JANITOR.error("Error while reacting :ok_hand: to {}'s message", Util.toString(ctx.getSource().getAuthor()))
);
return 1;
}

13
src/main/java/sciwhiz12/janitor/commands/misc/PingCommand.java
View File

@ -2,7 +2,7 @@ package sciwhiz12.janitor.commands.misc;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext;
import org.javacord.api.event.message.MessageCreateEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import sciwhiz12.janitor.commands.BaseCommand;
import sciwhiz12.janitor.commands.CommandRegistry;
import sciwhiz12.janitor.utils.Util;
@ -20,20 +20,19 @@ public class PingCommand extends BaseCommand {
this.reply = reply;
}
public LiteralArgumentBuilder<MessageCreateEvent> getNode() {
public LiteralArgumentBuilder<MessageReceivedEvent> getNode() {
return literal(command)
.executes(this::run);
}
int run(final CommandContext<MessageCreateEvent> ctx) {
int run(final CommandContext<MessageReceivedEvent> ctx) {
ctx.getSource()
.getMessage()
.getChannel()
.sendMessage(reply)
.whenCompleteAsync(Util.handle(
success -> JANITOR.debug("Sent ping message to {}: {}", Util.toString(ctx.getSource().getMessageAuthor()), reply),
err -> JANITOR.error("Error while sending ping message to {}", Util.toString(ctx.getSource().getMessageAuthor()))
)
.queue(
success -> JANITOR.debug("Sent ping message to {}: {}", Util.toString(ctx.getSource().getAuthor()), reply),
err -> JANITOR.error("Error while sending ping message to {}", Util.toString(ctx.getSource().getAuthor()))
);
return 1;
}

6
src/main/java/sciwhiz12/janitor/utils/CommandHelper.java
View File

@ -3,14 +3,14 @@ package sciwhiz12.janitor.utils;
import com.mojang.brigadier.arguments.ArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.builder.RequiredArgumentBuilder;
import org.javacord.api.event.message.MessageCreateEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
public class CommandHelper {
public static LiteralArgumentBuilder<MessageCreateEvent> literal(String command) {
public static LiteralArgumentBuilder<MessageReceivedEvent> literal(String command) {
return LiteralArgumentBuilder.literal(command);
}
public static <Arg> RequiredArgumentBuilder<MessageCreateEvent, Arg> argument(String command, ArgumentType<Arg> argument) {
public static <Arg> RequiredArgumentBuilder<MessageReceivedEvent, Arg> argument(String command, ArgumentType<Arg> argument) {
return RequiredArgumentBuilder.argument(command, argument);
}
}

35
src/main/java/sciwhiz12/janitor/utils/Util.java
View File

@ -1,12 +1,6 @@
package sciwhiz12.janitor.utils;
import org.javacord.api.entity.DiscordEntity;
import org.javacord.api.entity.channel.Channel;
import org.javacord.api.entity.channel.ServerChannel;
import org.javacord.api.entity.message.MessageAuthor;
import org.javacord.api.entity.permission.Role;
import org.javacord.api.entity.server.Server;
import org.javacord.api.entity.user.User;
import net.dv8tion.jda.api.entities.*;
import javax.annotation.Nullable;
import java.util.function.BiConsumer;
@ -20,33 +14,34 @@ public class Util {
return obj;
}
public static String toString(final MessageAuthor author) {
return author.asUser().map(Util::toString).orElseGet(() -> String.format("{MessageAuthor,%s}:%s", author.getDiscriminatedName(), author.getId()));
}
// public static String toString(final MessageAuthor author) {
// return author.asUser().map(Util::toString).orElseGet(() -> String.format("{MessageAuthor,%s}:%s", author.getDiscriminatedName(), author.getId()));
// }
public static String toString(@Nullable final User user) {
return user != null ? String.format("{User,%s#%s}:%s", user.getName(), user.getDiscriminator(), getID(user)) : "unknown";
}
public static String toString(final Channel channel) {
if (channel instanceof ServerChannel) {
ServerChannel gc = (ServerChannel) channel;
return String.format("[Channel:%s,%s@%s]%s", gc.getType(), gc.getName(), toString(gc.getServer()), getID(channel));
public static String toString(final MessageChannel channel) {
if (channel instanceof GuildChannel) {
GuildChannel gc = (GuildChannel) channel;
return String.format("[GuildChannel:%s,%s@%s]%s", gc.getType(), gc.getName(), toString(gc.getGuild()), getID(channel));
}
return String.format("[Channel:%s]:%s", channel.getType(), getID(channel));
// TextChannel vs PrivateChannel
return String.format("[MessageChannel]:%s", getID(channel));
}
public static String toString(final Server guild) {
public static String toString(final Guild guild) {
return String.format("(Guild:%s):%s", guild.getName(), getID(guild));
}
public static String getID(final DiscordEntity entity) {
public static String getID(final ISnowflake entity) {
String prefix = "?";
if (entity instanceof User) {
prefix = "@&";
prefix = "@";
} else if (entity instanceof Role) {
prefix = "@!";
} else if (entity instanceof Channel) {
prefix = "@&";
} else if (entity instanceof GuildChannel) {
prefix = "#";
}
return String.format("<%s%s>", prefix, entity.getId());