Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use native Discord timestamps for console timestamps

This commit is contained in:
Chew 2021-07-06 15:32:22 -04:00 committed by Josh Roy
parent db027bced3
commit b473460ffc
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EssentialsDiscord/build.gradle
View File

@ -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'
}

7
EssentialsDiscord/src/main/java/net/essentialsx/discord/util/ConsoleInjector.java
View File

@ -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))));
}