From a2bb67a8c8e546740e6a3d3cce3a706108cf141c Mon Sep 17 00:00:00 2001 From: Tanish Azad Date: Fri, 22 Mar 2024 22:34:56 +0530 Subject: [PATCH 1/4] removed footer --- .../tjbot/features/moderation/WhoIsCommand.java | 6 +----- .../togetherjava/tjbot/features/reminder/RemindRoutine.java | 2 +- .../org/togetherjava/tjbot/features/tags/TagCommand.java | 3 --- .../togetherjava/tjbot/features/tags/TagManageCommand.java | 3 --- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/application/src/main/java/org/togetherjava/tjbot/features/moderation/WhoIsCommand.java b/application/src/main/java/org/togetherjava/tjbot/features/moderation/WhoIsCommand.java index 11f95e90cb..3a9ebb04b4 100644 --- a/application/src/main/java/org/togetherjava/tjbot/features/moderation/WhoIsCommand.java +++ b/application/src/main/java/org/togetherjava/tjbot/features/moderation/WhoIsCommand.java @@ -16,7 +16,6 @@ import javax.annotation.CheckReturnValue; import java.awt.*; -import java.time.Instant; import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; import java.util.Collection; @@ -139,10 +138,7 @@ private static EmbedBuilder generateEmbedBuilder(final Interaction event, final final User.Profile profile, final Color effectiveColor) { EmbedBuilder embedBuilder = new EmbedBuilder().setThumbnail(user.getEffectiveAvatarUrl()) - .setColor(effectiveColor) - .setFooter("Requested by " + event.getUser().getName(), - event.getMember().getEffectiveAvatarUrl()) - .setTimestamp(Instant.now()); + .setColor(effectiveColor); if (null != profile.getBannerId()) { embedBuilder.setImage(profile.getBannerUrl() + "?size=" + USER_PROFILE_PICTURE_SIZE); diff --git a/application/src/main/java/org/togetherjava/tjbot/features/reminder/RemindRoutine.java b/application/src/main/java/org/togetherjava/tjbot/features/reminder/RemindRoutine.java index 1da5871a1d..91fa62fe08 100644 --- a/application/src/main/java/org/togetherjava/tjbot/features/reminder/RemindRoutine.java +++ b/application/src/main/java/org/togetherjava/tjbot/features/reminder/RemindRoutine.java @@ -114,7 +114,7 @@ private static MessageEmbed createReminderEmbed(CharSequence content, return new EmbedBuilder().setAuthor(authorName, null, authorIconUrl) .setDescription(content) - .setFooter("reminder from") + .setFooter("reminer from") .setTimestamp(createdAt) .setColor(AMBIENT_COLOR) .build(); diff --git a/application/src/main/java/org/togetherjava/tjbot/features/tags/TagCommand.java b/application/src/main/java/org/togetherjava/tjbot/features/tags/TagCommand.java index 2cf1994fba..5dbdb65a2e 100644 --- a/application/src/main/java/org/togetherjava/tjbot/features/tags/TagCommand.java +++ b/application/src/main/java/org/togetherjava/tjbot/features/tags/TagCommand.java @@ -23,7 +23,6 @@ import org.togetherjava.tjbot.features.utils.LinkPreviews; import org.togetherjava.tjbot.features.utils.StringDistances; -import java.time.Instant; import java.util.*; /** @@ -85,8 +84,6 @@ public void onSlashCommand(SlashCommandInteractionEvent event) { String tagContent = tagSystem.getTag(id).orElseThrow(); MessageEmbed contentEmbed = new EmbedBuilder().setDescription(tagContent) - .setFooter(event.getUser().getName() + " • used " + event.getCommandString()) - .setTimestamp(Instant.now()) .setColor(TagSystem.AMBIENT_COLOR) .build(); diff --git a/application/src/main/java/org/togetherjava/tjbot/features/tags/TagManageCommand.java b/application/src/main/java/org/togetherjava/tjbot/features/tags/TagManageCommand.java index 8d957fedfb..c6b327ecf2 100644 --- a/application/src/main/java/org/togetherjava/tjbot/features/tags/TagManageCommand.java +++ b/application/src/main/java/org/togetherjava/tjbot/features/tags/TagManageCommand.java @@ -21,7 +21,6 @@ import javax.annotation.Nullable; import java.nio.charset.StandardCharsets; -import java.time.Instant; import java.time.temporal.TemporalAccessor; import java.util.*; import java.util.function.BiConsumer; @@ -108,8 +107,6 @@ private static void sendSuccessMessage(IReplyCallback event, String id, String a event .replyEmbeds(new EmbedBuilder().setTitle("Success") .setDescription("Successfully %s tag '%s'.".formatted(actionVerb, id)) - .setFooter(event.getUser().getName()) - .setTimestamp(Instant.now()) .setColor(TagSystem.AMBIENT_COLOR) .build()) .queue(); From 575dd8fb40bdfc2ec1192c3788f8fe8aa2f0ab54 Mon Sep 17 00:00:00 2001 From: Tanish Azad Date: Fri, 22 Mar 2024 22:35:46 +0530 Subject: [PATCH 2/4] fix typo --- .../org/togetherjava/tjbot/features/reminder/RemindRoutine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/togetherjava/tjbot/features/reminder/RemindRoutine.java b/application/src/main/java/org/togetherjava/tjbot/features/reminder/RemindRoutine.java index 91fa62fe08..1da5871a1d 100644 --- a/application/src/main/java/org/togetherjava/tjbot/features/reminder/RemindRoutine.java +++ b/application/src/main/java/org/togetherjava/tjbot/features/reminder/RemindRoutine.java @@ -114,7 +114,7 @@ private static MessageEmbed createReminderEmbed(CharSequence content, return new EmbedBuilder().setAuthor(authorName, null, authorIconUrl) .setDescription(content) - .setFooter("reminer from") + .setFooter("reminder from") .setTimestamp(createdAt) .setColor(AMBIENT_COLOR) .build(); From 6976c4408a99b06d54d8fd3504ac51b61698735b Mon Sep 17 00:00:00 2001 From: Tanish Azad Date: Fri, 22 Mar 2024 22:42:34 +0530 Subject: [PATCH 3/4] removed unused parameter --- .../tjbot/features/moderation/WhoIsCommand.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/application/src/main/java/org/togetherjava/tjbot/features/moderation/WhoIsCommand.java b/application/src/main/java/org/togetherjava/tjbot/features/moderation/WhoIsCommand.java index 3a9ebb04b4..137be42f08 100644 --- a/application/src/main/java/org/togetherjava/tjbot/features/moderation/WhoIsCommand.java +++ b/application/src/main/java/org/togetherjava/tjbot/features/moderation/WhoIsCommand.java @@ -3,7 +3,6 @@ import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.*; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import net.dv8tion.jda.api.interactions.Interaction; import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; @@ -76,10 +75,9 @@ private static ReplyCallbackAction handleWhoIsUser(final IReplyCallback event, f + userFlagsToStringItem(user.getFlags()) + "\n**Registration date:** " + DATE_TIME_FORMAT.format(user.getTimeCreated()); - EmbedBuilder embedBuilder = - generateEmbedBuilder(event, user, profile, profile.getAccentColor()).setAuthor( - user.getName(), user.getEffectiveAvatarUrl(), user.getEffectiveAvatarUrl()) - .setDescription(description); + EmbedBuilder embedBuilder = generateEmbedBuilder(user, profile, profile.getAccentColor()) + .setAuthor(user.getName(), user.getEffectiveAvatarUrl(), user.getEffectiveAvatarUrl()) + .setDescription(description); return sendEmbedWithProfileAction(event, embedBuilder.build(), user.getId()); } @@ -99,7 +97,7 @@ private static ReplyCallbackAction handleWhoIsMember(final IReplyCallback event, + DATE_TIME_FORMAT.format(user.getTimeCreated()) + "\n**Roles:** " + formatRoles(member); - EmbedBuilder embedBuilder = generateEmbedBuilder(event, user, profile, effectiveColor) + EmbedBuilder embedBuilder = generateEmbedBuilder(user, profile, effectiveColor) .setAuthor(member.getEffectiveName(), member.getEffectiveAvatarUrl(), member.getEffectiveAvatarUrl()) .setDescription(description); @@ -128,15 +126,13 @@ private static String voiceStateToStringItem(final Member member) { /** * Generates whois embed based on the given parameters. * - * @param event the {@link SlashCommandInteractionEvent} * @param user the {@link User} getting whois'd * @param profile the {@link net.dv8tion.jda.api.entities.User.Profile} of the whois'd user * @param effectiveColor the {@link Color} that the embed will become * @return the generated {@link EmbedBuilder} */ - private static EmbedBuilder generateEmbedBuilder(final Interaction event, final User user, - final User.Profile profile, final Color effectiveColor) { - + private static EmbedBuilder generateEmbedBuilder(final User user, final User.Profile profile, + final Color effectiveColor) { EmbedBuilder embedBuilder = new EmbedBuilder().setThumbnail(user.getEffectiveAvatarUrl()) .setColor(effectiveColor); From 565f8616e58672cf6e2294a22218a6f94b9e6fff Mon Sep 17 00:00:00 2001 From: Tanish Azad Date: Mon, 25 Mar 2024 13:38:32 +0530 Subject: [PATCH 4/4] restore TagCommand --- .../java/org/togetherjava/tjbot/features/tags/TagCommand.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/src/main/java/org/togetherjava/tjbot/features/tags/TagCommand.java b/application/src/main/java/org/togetherjava/tjbot/features/tags/TagCommand.java index 5dbdb65a2e..2cf1994fba 100644 --- a/application/src/main/java/org/togetherjava/tjbot/features/tags/TagCommand.java +++ b/application/src/main/java/org/togetherjava/tjbot/features/tags/TagCommand.java @@ -23,6 +23,7 @@ import org.togetherjava.tjbot.features.utils.LinkPreviews; import org.togetherjava.tjbot.features.utils.StringDistances; +import java.time.Instant; import java.util.*; /** @@ -84,6 +85,8 @@ public void onSlashCommand(SlashCommandInteractionEvent event) { String tagContent = tagSystem.getTag(id).orElseThrow(); MessageEmbed contentEmbed = new EmbedBuilder().setDescription(tagContent) + .setFooter(event.getUser().getName() + " • used " + event.getCommandString()) + .setTimestamp(Instant.now()) .setColor(TagSystem.AMBIENT_COLOR) .build();