Merge branch 'hotfix/3.9.8'

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>dev.nincodedo</groupId>
     <artifactId>ninbot</artifactId>
-    <version>3.9.7</version>
+    <version>3.9.8</version>
     <name>Ninbot</name>
     <description>Discord bot for OCW Discord using JDA</description>
     <url>https://github.com/Nincodedo/Ninbot</url>

src/main/java/dev/nincodedo/ninbot/components/announcements/StickerCreationAnnouncement.java

@@ -13,7 +13,6 @@
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
-import net.dv8tion.jda.api.entities.sticker.GuildSticker;
 import net.dv8tion.jda.api.events.sticker.GuildStickerAddedEvent;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
@@ -53,12 +52,13 @@ public void onGuildStickerAdded(@NotNull GuildStickerAddedEvent event) {
             }
             var sticker = event.getSticker();
             var member = getMemberFromAudit(event.getJDA().getSelfUser(), event.getGuild(), channel);
-            channel.sendMessage(buildAnnouncementMessage(sticker, event.getGuild(), member))
+            channel.sendMessage(buildAnnouncementMessage(event.getGuild(), member))
+                    .setStickers(sticker)
                     .queue(message -> countOneStat(componentName, event.getGuild().getId()));
         });
     }
 
-    private MessageCreateData buildAnnouncementMessage(GuildSticker sticker, Guild guild, Member member) {
+    private MessageCreateData buildAnnouncementMessage(Guild guild, Member member) {
         ResourceBundle resourceBundle = LocaleService.getResourceBundleOrDefault(guild);
         MessageCreateBuilder messageBuilder = new MessageCreateBuilder();
         messageBuilder.addContent(resourceBundle.getString("listener.sticker.announce.message"));
@@ -67,7 +67,7 @@ private MessageCreateData buildAnnouncementMessage(GuildSticker sticker, Guild g
                     .addContent(resourceBundle.getString("listener.sticker.announce.message.member"))
                     .addContent(member.getEffectiveName());
         }
-        messageBuilder.addContent(String.valueOf(sticker));
+        messageBuilder.addContent("!");
         return messageBuilder.build();
     }
 

src/main/resources/lang_de.properties

@@ -92,8 +92,8 @@ command.time.description=Create a Discord timestamp relative to the current time
 command.eightball.description=Summons the all knowing 8 ball
 command.topicchange.description=Toggle the topic change announcements for this channel.
 threadunarchiveannouncement.threadrevived=Thread %s has been revived from a long death.
-listener.sticker.announce.message=A new sticker has been added!
-listener.sticker.announce.message.member=Added by 
+listener.sticker.announce.message=A new sticker has been added
+listener.sticker.announce.message.member=by 
 button.stream.nothing=Okay, we'll leave it as it is.
 button.stream.toggle.on=Okay, your stream announcements have been turned on.
 button.stream.toggle.off=Okay, your stream announcements have been turned off.

src/main/resources/lang_en.properties

@@ -92,8 +92,8 @@ command.hugedab.description=Dabs, but huge
 command.time.description=Create a Discord timestamp relative to the current time.
 command.8ball.description=Summons the all knowing 8 ball
 threadunarchiveannouncement.threadrevived=Thread %s has been revived from a long death.
-listener.sticker.announce.message=A new sticker has been added!
-listener.sticker.announce.message.member=Added by 
+listener.sticker.announce.message=A new sticker has been added
+listener.sticker.announce.message.member=by 
 button.stream.nothing=Okay, we'll leave it as it is.
 button.stream.toggle.on=Okay, your stream announcements have been turned on.
 button.stream.toggle.off=Okay, your stream announcements have been turned off.

src/main/resources/lang_es.properties

@@ -92,8 +92,8 @@ command.eightball.description=Summons the all knowing 8 ball
 command.topicchange.description=Toggle the topic change announcements for this channel.
 command.time.description=Create a Discord timestamp relative to the current time.
 threadunarchiveannouncement.threadrevived=Thread %s has been revived from a long death.
-listener.sticker.announce.message=A new sticker has been added!
-listener.sticker.announce.message.member=Added by 
+listener.sticker.announce.message=A new sticker has been added
+listener.sticker.announce.message.member=by 
 button.stream.nothing=Okay, we'll leave it as it is.
 button.stream.toggle.on=Okay, your stream announcements have been turned on.
 button.stream.toggle.off=Okay, your stream announcements have been turned off.

src/main/resources/lang_fr.properties

@@ -92,8 +92,8 @@ command.eightball.description=Summons the all knowing 8 ball
 command.topicchange.description=Toggle the topic change announcements for this channel.
 command.time.description=Create a Discord timestamp relative to the current time.
 threadunarchiveannouncement.threadrevived=Thread %s has been revived from a long death.
-listener.sticker.announce.message=A new sticker has been added!
-listener.sticker.announce.message.member=Added by 
+listener.sticker.announce.message=A new sticker has been added
+listener.sticker.announce.message.member=by 
 button.stream.nothing=Okay, we'll leave it as it is.
 button.stream.toggle.on=Okay, your stream announcements have been turned on.
 button.stream.toggle.off=Okay, your stream announcements have been turned off.

src/main/resources/lang_it.properties

@@ -92,8 +92,8 @@ command.eightball.description=Summons the all knowing 8 ball
 command.topicchange.description=Toggle the topic change announcements for this channel.
 command.time.description=Create a Discord timestamp relative to the current time.
 threadunarchiveannouncement.threadrevived=Thread %s has been revived from a long death.
-listener.sticker.announce.message=A new sticker has been added!
-listener.sticker.announce.message.member=Added by 
+listener.sticker.announce.message=A new sticker has been added
+listener.sticker.announce.message.member=by 
 button.stream.nothing=Okay, we'll leave it as it is.
 button.stream.toggle.on=Okay, your stream announcements have been turned on.
 button.stream.toggle.off=Okay, your stream announcements have been turned off.

src/main/resources/lang_pt.properties

@@ -92,8 +92,8 @@ command.eightball.description=Summons the all knowing 8 ball
 command.topicchange.description=Toggle the topic change announcements for this channel.
 command.time.description=Create a Discord timestamp relative to the current time.
 threadunarchiveannouncement.threadrevived=Thread %s has been revived from a long death.
-listener.sticker.announce.message=A new sticker has been added!
-listener.sticker.announce.message.member=Added by 
+listener.sticker.announce.message=A new sticker has been added
+listener.sticker.announce.message.member=by 
 button.stream.nothing=Okay, we'll leave it as it is.
 button.stream.toggle.on=Okay, your stream announcements have been turned on.
 button.stream.toggle.off=Okay, your stream announcements have been turned off.