mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2024-09-28 21:03:05 +00:00
Use native Discord timestamps for console timestamps
This commit is contained in:
parent
db027bced3
commit
b473460ffc
|
@ -4,7 +4,7 @@ plugins {
|
|||
|
||||
dependencies {
|
||||
compileOnly project(':EssentialsX')
|
||||
implementation('net.dv8tion:JDA:4.3.0_277') {
|
||||
implementation('net.dv8tion:JDA:4.3.0_293') {
|
||||
//noinspection GroovyAssignabilityCheck
|
||||
exclude module: 'opus-java'
|
||||
}
|
||||
|
|
|
@ -3,6 +3,7 @@ package net.essentialsx.discord.util;
|
|||
import com.earth2me.essentials.utils.FormatUtil;
|
||||
import com.google.common.base.Splitter;
|
||||
import net.dv8tion.jda.api.entities.Message;
|
||||
import net.dv8tion.jda.api.utils.TimeFormat;
|
||||
import net.essentialsx.discord.JDADiscordService;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.core.LogEvent;
|
||||
|
@ -11,8 +12,7 @@ import org.apache.logging.log4j.core.appender.AbstractAppender;
|
|||
import org.apache.logging.log4j.core.config.plugins.Plugin;
|
||||
import org.bukkit.Bukkit;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.time.Instant;
|
||||
import java.util.concurrent.BlockingQueue;
|
||||
import java.util.concurrent.LinkedBlockingQueue;
|
||||
|
||||
|
@ -24,7 +24,6 @@ public class ConsoleInjector extends AbstractAppender {
|
|||
|
||||
private final JDADiscordService jda;
|
||||
private final BlockingQueue<String> messageQueue = new LinkedBlockingQueue<>();
|
||||
private final SimpleDateFormat timestampFormat = new SimpleDateFormat("HH:mm:ss");
|
||||
private final int taskId;
|
||||
|
||||
public ConsoleInjector(JDADiscordService jda) {
|
||||
|
@ -76,7 +75,7 @@ public class ConsoleInjector extends AbstractAppender {
|
|||
//noinspection UnstableApiUsage
|
||||
messageQueue.addAll(Splitter.fixedLength(Message.MAX_CONTENT_LENGTH).splitToList(
|
||||
MessageUtil.formatMessage(jda.getSettings().getConsoleFormat(),
|
||||
timestampFormat.format(new Date()),
|
||||
TimeFormat.TIME_LONG.format(Instant.now()),
|
||||
event.getLevel().name(),
|
||||
MessageUtil.sanitizeDiscordMarkdown(entry))));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue