Skip to content

Fix link for report's 'go to message' button #709

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
Taz03 merged 4 commits into from
Dec 6, 2022
Merged

Fix link for report's 'go to message' button #709

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f9724bf
fixed the link for go to message button
Taz03 Dec 2, 2022
a0cd20f
used proper method
Taz03 Dec 4, 2022
f318bda
less complex
Taz03 Dec 5, 2022
0503593
minor changes
Taz03 Dec 5, 2022
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
40 changes: 16 additions & 24 deletions application/src/main/java/org/togetherjava/tjbot/commands/moderation/ReportCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageEmbed;
import net.dv8tion.jda.api.entities.Role;
import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
import net.dv8tion.jda.api.interactions.InteractionHook;
import net.dv8tion.jda.api.interactions.commands.build.Commands;
import net.dv8tion.jda.api.interactions.components.Modal;
import net.dv8tion.jda.api.interactions.components.buttons.Button;
import net.dv8tion.jda.api.interactions.components.text.TextInput;
import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
Expand All @@ -23,7 +21,6 @@
import org.togetherjava.tjbot.commands.BotCommandAdapter;
import org.togetherjava.tjbot.commands.CommandVisibility;
import org.togetherjava.tjbot.commands.MessageContextCommand;
import org.togetherjava.tjbot.commands.utils.DiscordClientAction;
import org.togetherjava.tjbot.commands.utils.MessageUtils;
import org.togetherjava.tjbot.config.Config;

Expand All @@ -37,14 +34,12 @@
import java.util.function.Predicate;
import java.util.regex.Pattern;


/**
* Implements the /report command, which allows users to report a selected offensive message from
* another user. The message is then forwarded to moderators in a dedicated channel given by
* {@link Config#getModMailChannelPattern()}.
*/
public final class ReportCommand extends BotCommandAdapter implements MessageContextCommand {

private static final Logger logger = LoggerFactory.getLogger(ReportCommand.class);
private static final String COMMAND_NAME = "report";
private static final String REPORT_REASON_INPUT_ID = "reportReason";
Expand Down Expand Up @@ -92,6 +87,7 @@ public void onMessageContext(MessageContextInteractionEvent event) {

String reportedMessage = event.getTarget().getContentRaw();
String reportedMessageID = event.getTarget().getId();
String reportedMessageJumpUrl = event.getTarget().getJumpUrl();
String reportedMessageChannel = event.getTarget().getChannel().getId();
String reportedAuthorName = event.getTarget().getAuthor().getName();
String reportedAuthorAvatarURL = event.getTarget().getAuthor().getAvatarUrl();
Expand All @@ -105,8 +101,8 @@ public void onMessageContext(MessageContextInteractionEvent event) {
.build();

String reportModalComponentID = generateComponentId(reportedMessage, reportedMessageID,
reportedMessageChannel, reportedMessageTimestamp, reportedAuthorName,
reportedAuthorAvatarURL, reportedAuthorID);
reportedMessageJumpUrl, reportedMessageChannel, reportedMessageTimestamp,
reportedAuthorName, reportedAuthorAvatarURL, reportedAuthorID);
Modal reportModal = Modal.create(reportModalComponentID, "Report this to a moderator")
.addActionRow(modalTextInput)
.build();
Expand Down Expand Up @@ -169,7 +165,6 @@ private Optional<TextChannel> handleRequireModMailChannel(ModalInteractionEvent

private MessageCreateAction createModMessage(String reportReason,
ReportedMessage reportedMessage, Guild guild, TextChannel modMailAuditLog) {

MessageEmbed reportedMessageEmbed = new EmbedBuilder().setTitle("Report")
.setDescription(MessageUtils.abbreviate(reportedMessage.content,
MessageEmbed.DESCRIPTION_MAX_LENGTH))
Expand All @@ -185,9 +180,7 @@ private MessageCreateAction createModMessage(String reportReason,

MessageCreateAction message =
modMailAuditLog.sendMessageEmbeds(reportedMessageEmbed, reportReasonEmbed)
.addActionRow(DiscordClientAction.Channels.GUILD_CHANNEL_MESSAGE.asLinkButton(
"Go to Message", guild.getId(), reportedMessage.channelID,
reportedMessage.id));
.addActionRow(Button.link(reportedMessage.jumpUrl, "Go to message"));

Optional<Role> moderatorRole = guild.getRoles()
.stream()
Expand All @@ -210,12 +203,12 @@ private void sendModMessage(ModalInteractionEvent event, List<String> args,
ReportedMessage reportedMessage = ReportedMessage.ofArgs(args);

createModMessage(reportReason, reportedMessage, guild, modMailAuditLog).mapToResult()
.map(this::createUserReply)
.map(ReportCommand::createUserReply)
.flatMap(hook::editOriginal)
.queue();
}

private String createUserReply(Result<Message> result) {
private static String createUserReply(Result<Message> result) {
if (result.isFailure()) {
logger.warn("Unable to forward a message report to modmail channel.",
result.getFailure());
Expand All @@ -224,19 +217,18 @@ private String createUserReply(Result<Message> result) {
return "Thank you for reporting this message. A moderator will take care of the matter as soon as possible.";
}

private record ReportedMessage(String content, String id, String channelID, Instant timestamp,
String authorName, String authorAvatarUrl) {
private record ReportedMessage(String content, String id, String jumpUrl, String channelID,
Instant timestamp, String authorName, String authorAvatarUrl) {
static ReportedMessage ofArgs(List<String> args) {
String content = args.get(0);
String id = args.get(1);
String channelID = args.get(2);
Instant timestamp = Instant.parse(args.get(3));
String authorName = args.get(4);
String authorAvatarUrl = args.get(5);
return new ReportedMessage(content, id, channelID, timestamp, authorName,
String jumpUrl = args.get(2);
String channelID = args.get(3);
Instant timestamp = Instant.parse(args.get(4));
String authorName = args.get(5);
String authorAvatarUrl = args.get(6);
return new ReportedMessage(content, id, jumpUrl, channelID, timestamp, authorName,
authorAvatarUrl);
}

}

}