Merge pull request #488 from danthe1st/message-link-author

use requestor as message link author instead of linked message author

Author: MoonTM-GIT

src/main/java/net/discordjug/javabot/listener/MessageLinkListener.java

@@ -48,7 +48,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
 									messageChannel.getType().isThread() ? messageChannel.getIdLong() : 0,
 									List.of(ActionRow.of(
 											Button.link(m.getJumpUrl(), "Jump to Message"),
-											Button.secondary(InteractionUtils.createDeleteInteractionId(m.getAuthor().getIdLong()), "\uD83D\uDDD1️"))),
+											Button.secondary(InteractionUtils.createDeleteInteractionId(event.getAuthor().getIdLong(), m.getAuthor().getIdLong()), "\uD83D\uDDD1️"))),
 									null));
 					}, e -> ExceptionLogger.capture(e, getClass().getSimpleName())));
 			}

src/main/java/net/discordjug/javabot/util/InteractionUtils.java

@@ -72,6 +72,11 @@ public class InteractionUtils implements ButtonHandler, ModalHandler, StringSele
 	 * Template Interaction ID for deleting the original Message.
 	 */
 	private static final String DELETE_ORIGINAL_TEMPLATE = "utils:delete:%d";
+	
+	/**
+	 * Template Interaction ID for deleting the original Message.
+	 */
+	private static final String DELETE_ORIGINAL_TEMPLATE_MULTIPLE_DELETERS = "utils:delete:%d:%d";
 
 	private final NotificationService notificationService;
 	private final BotConfig botConfig;
@@ -93,32 +98,38 @@ private InteractionCallbackAction<?> delete(@NotNull ButtonInteraction interacti
 		if (member == null) {
 			return Responses.warning(interaction, "Could not get member.");
 		}
-		GuildConfig config = botConfig.get(interaction.getGuild());
+		
 		Message msg = interaction.getMessage();
 
-		String authorId = "";
-
-		if (componentId.length > 2) {
-			authorId = componentId[2];
-		}
-
-		if (authorId.equals(member.getUser().getId()) ||
-				member.getRoles().contains(config.getModerationConfig().getStaffRole()) ||
-				member.isOwner()) {
+		if (canDeleteUsingButton(member, componentId)) {
 			msg.delete().queue();
 			return interaction.deferEdit();
 		} else {
 			return Responses.warning(interaction, "You don't have permission to delete this message.");
 		}
 	}
 
+	private boolean canDeleteUsingButton(Member member, String[] componentId) {
+		for(int i=2; i < componentId.length; i++) {
+			if(componentId[i].equals(member.getUser().getId())) {
+				return true;
+			}
+		}
+		GuildConfig config = botConfig.get(member.getGuild());
+		return member.getRoles().contains(config.getModerationConfig().getStaffRole()) || member.isOwner();
+	}
+
 	public static Button createDeleteButton(long senderId) {
 		return Button.secondary(createDeleteInteractionId(senderId), "\uD83D\uDDD1️");
 	}
 
 	public static String createDeleteInteractionId(long senderId) {
 		return DELETE_ORIGINAL_TEMPLATE.formatted(senderId);
 	}
+	
+	public static String createDeleteInteractionId(long senderId, long secondDeleterId) {
+		return DELETE_ORIGINAL_TEMPLATE_MULTIPLE_DELETERS.formatted(senderId, secondDeleterId);
+	}
 
 	private void kick(ModalInteraction interaction, @NotNull Guild guild, String memberId, String reason) {
 		if(!interaction.getMember().hasPermission(Permission.KICK_MEMBERS)) {