diff --git a/src/main/java/de/presti/ree6/events/MenuEvents.java b/src/main/java/de/presti/ree6/events/MenuEvents.java index c42dc2f2a..ac22fa3ef 100644 --- a/src/main/java/de/presti/ree6/events/MenuEvents.java +++ b/src/main/java/de/presti/ree6/events/MenuEvents.java @@ -173,8 +173,8 @@ public void onButtonInteraction(@NotNull ButtonInteractionEvent event) { webhookMessageBuilder.addEmbeds(webhookEmbedBuilder.build()); webhookMessageBuilder.addFile(event.getGuild().getId() + "_" + ticketEntity.getTicketCount() + "_transcript.html", TranscriptUtil.generateTranscript(event.getJDA(), event.getChannel().asTextChannel().getIterableHistory().reverse().stream().toList(), - event.getChannel().getTimeCreated().format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG)).replace("T", " "), - ZonedDateTime.now().format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG)).replace("T", " ")).getBytes(StandardCharsets.UTF_8)); + event.getChannel().getTimeCreated().toZonedDateTime().toString().trim(), + ZonedDateTime.now().toOffsetDateTime().toZonedDateTime().toString().trim()).getBytes(StandardCharsets.UTF_8)); WebhookUtil.sendWebhook(null, webhookMessageBuilder.build(), ticketEntity.getLogChannelWebhookId(), ticketEntity.getLogChannelWebhookToken(), WebhookUtil.WebhookTyp.TICKET); diff --git a/src/main/java/de/presti/ree6/events/OtherEvents.java b/src/main/java/de/presti/ree6/events/OtherEvents.java index a4fd4cd0c..988864c8c 100644 --- a/src/main/java/de/presti/ree6/events/OtherEvents.java +++ b/src/main/java/de/presti/ree6/events/OtherEvents.java @@ -155,7 +155,7 @@ public void onGuildMemberJoin(@Nonnull GuildMemberJoinEvent event) { wmb.addFile("welcome.png", ImageCreationUtility.createJoinImage(event.getUser(), joinImage.get().getStringValue(), messageContent.replace("%user_mention%", event.getMember().getUser().getName()))); } catch (IOException e) { - wmb.setContent(messageContent); + wmb.setContent(messageContent.replace("%user_mention%", event.getMember().getUser().getAsMention())); log.error("Error while creating join image!", e); } } else { diff --git a/src/main/java/de/presti/ree6/utils/data/TranscriptUtil.java b/src/main/java/de/presti/ree6/utils/data/TranscriptUtil.java index 94bcd63ca..168801920 100644 --- a/src/main/java/de/presti/ree6/utils/data/TranscriptUtil.java +++ b/src/main/java/de/presti/ree6/utils/data/TranscriptUtil.java @@ -38,16 +38,28 @@ private TranscriptUtil() {