Skip to content

Error reporting if bot added with wrong scope #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zabuzard merged 1 commit into from
Oct 8, 2021
Merged

Error reporting if bot added with wrong scope #170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion application/src/main/java/org/togetherjava/tjbot/commands/system/CommandSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
package org.togetherjava.tjbot.commands.system;

import com.fasterxml.jackson.core.JsonProcessingException;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.events.ReadyEvent;
import net.dv8tion.jda.api.events.interaction.ButtonClickEvent;
import net.dv8tion.jda.api.events.interaction.SelectionMenuEvent;
import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
import net.dv8tion.jda.api.exceptions.ErrorHandler;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.dv8tion.jda.api.interactions.commands.Command;
import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
import net.dv8tion.jda.api.requests.ErrorResponse;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.togetherjava.tjbot.commands.Commands;
import org.togetherjava.tjbot.commands.SlashCommand;
import org.togetherjava.tjbot.config.Config;
import org.togetherjava.tjbot.db.Database;

import java.util.*;
Expand Down Expand Up @@ -116,7 +121,7 @@ private void registerReloadCommand(@NotNull Guild guild) {
guild.upsertCommand(reloadCommand.getData())
.queue(command -> logger.debug("Registered '{}' for guild '{}'", RELOAD_COMMAND,
guild.getName()));
});
}, ex -> handleRegisterErrors(ex, guild));
}

/**
Expand Down Expand Up @@ -168,6 +173,36 @@ private <T extends ComponentInteraction> void forwardComponentCommand(@NotNull T
return Objects.requireNonNull(nameToSlashCommands.get(name));
}

private static void handleRegisterErrors(Throwable ex, Guild guild) {
new ErrorHandler().handle(ErrorResponse.MISSING_ACCESS, errorResponse -> {
// Find a channel that we have permissions to write to
// NOTE Unfortunately, there is no better accurate way to find a proper channel
// where we can report the setup problems other than simply iterating all of them.
Optional<TextChannel> channelToReportTo = guild.getTextChannelCache()
.stream()
.filter(channel -> guild.getPublicRole()
.hasPermission(channel, Permission.MESSAGE_WRITE))
.findAny();

// Report the problem to the guild
Config config = Config.getInstance();
channelToReportTo.ifPresent(textChannel -> textChannel
.sendMessage("I need the commands scope, please invite me correctly."
+ " You can join '%s' or visit '%s' for more info, I will leave your guild now."
.formatted(config.getDiscordGuildInvite(), config.getProjectWebsite()))
.queue());

guild.leave().queue();

String unableToReportText = channelToReportTo.isPresent() ? ""
: " Did not find any public text channel to report the issue to, unable to inform the guild.";
logger.warn(
"Guild '{}' does not have the required command scope, unable to register, leaving it.{}",
guild.getName(), unableToReportText, ex);
}).accept(ex);

}

/**
* Extension of {@link java.util.function.BiConsumer} but for 3 elements.
* <p>
Expand Down