diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/AcceptSuggestionSubcommand.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/AcceptSuggestionSubcommand.java index 29ab4ce34..f6a135f38 100644 --- a/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/AcceptSuggestionSubcommand.java +++ b/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/AcceptSuggestionSubcommand.java @@ -14,6 +14,8 @@ import org.jetbrains.annotations.NotNull; +import java.time.Instant; + /** * Subcommand that lets staff members accept suggestions. */ @@ -46,7 +48,7 @@ protected WebhookMessageCreateAction handleSuggestionCommand(@NotNull S .setAuthor(embed.getAuthor().getName(), embed.getAuthor().getUrl(), embed.getAuthor().getIconUrl()) .setTitle("Suggestion Accepted") .setDescription(embed.getDescription()) - .setTimestamp(embed.getTimestamp()) + .setTimestamp(Instant.now()) .setFooter("Accepted by " + UserUtils.getUserTag(user)) .build(); } diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/ClearSuggestionSubcommand.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/ClearSuggestionSubcommand.java index a531c5cce..6a3ccf164 100644 --- a/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/ClearSuggestionSubcommand.java +++ b/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/ClearSuggestionSubcommand.java @@ -31,7 +31,7 @@ public ClearSuggestionSubcommand(BotConfig botConfig) { @Override protected WebhookMessageCreateAction handleSuggestionCommand(@NotNull SlashCommandInteractionEvent event, @NotNull Message message) { MessageEmbed embed = message.getEmbeds().get(0); - MessageEmbed clearEmbed = buildSuggestionClearEmbed(embed); + MessageEmbed clearEmbed = buildSuggestionClearEmbed(message, embed); SystemsConfig.EmojiConfig emojiConfig = botConfig.getSystems().getEmojiConfig(); message.editMessageEmbeds(clearEmbed).queue( edit -> { @@ -43,13 +43,13 @@ protected WebhookMessageCreateAction handleSuggestionCommand(@NotNull S .setComponents(getJumpButton(message)); } - private @NotNull MessageEmbed buildSuggestionClearEmbed(@NotNull MessageEmbed embed) { + private @NotNull MessageEmbed buildSuggestionClearEmbed(@NotNull Message message, @NotNull MessageEmbed embed) { return new EmbedBuilder() .setColor(Responses.Type.DEFAULT.getColor()) .setAuthor(embed.getAuthor().getName(), embed.getAuthor().getUrl(), embed.getAuthor().getIconUrl()) .setTitle("Suggestion") .setDescription(embed.getDescription()) - .setTimestamp(embed.getTimestamp()) + .setTimestamp(message.getTimeCreated()) .setFooter(null) .build(); } diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/DeclineSuggestionSubcommand.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/DeclineSuggestionSubcommand.java index 6784edbe2..9f722bf69 100644 --- a/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/DeclineSuggestionSubcommand.java +++ b/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/DeclineSuggestionSubcommand.java @@ -15,6 +15,8 @@ import org.jetbrains.annotations.NotNull; +import java.time.Instant; + /** *

This class represents the /suggestion decline command.

*/ @@ -48,7 +50,7 @@ protected WebhookMessageCreateAction handleSuggestionCommand(@NotNull S .setAuthor(embed.getAuthor().getName(), embed.getAuthor().getUrl(), embed.getAuthor().getIconUrl()) .setTitle("Suggestion Declined") .setDescription(embed.getDescription()) - .setTimestamp(embed.getTimestamp()) + .setTimestamp(Instant.now()) .setFooter("Declined by " + UserUtils.getUserTag(user)); if (reason != null) builder.addField("Reason", reason, false); return builder.build(); diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/OnHoldSuggestionSubcommand.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/OnHoldSuggestionSubcommand.java index abc6e0b77..8564ca78c 100644 --- a/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/OnHoldSuggestionSubcommand.java +++ b/src/main/java/net/discordjug/javabot/systems/staff_commands/suggestions/OnHoldSuggestionSubcommand.java @@ -14,6 +14,8 @@ import org.jetbrains.annotations.NotNull; +import java.time.Instant; + /** *

This class represents the /suggestion on-hold command.

*/ @@ -47,7 +49,7 @@ protected WebhookMessageCreateAction handleSuggestionCommand(@NotNull S .setAuthor(embed.getAuthor().getName(), embed.getAuthor().getUrl(), embed.getAuthor().getIconUrl()) .setTitle("Suggestion On Hold") .setDescription(embed.getDescription()) - .setTimestamp(embed.getTimestamp()) + .setTimestamp(Instant.now()) .setFooter("Suggestion marked as On Hold by " + UserUtils.getUserTag(user)) .build(); }