Skip to content

Commit 44f54f0

Browse files
committed
Make useless and spammy loggers shush
1 parent 25b8db3 commit 44f54f0

10 files changed

Lines changed: 38 additions & 64 deletions

File tree

src/commander/java/com/mcmoddev/mmdbot/commander/TheCommander.java

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -218,20 +218,6 @@ public void start() {
218218
.build();
219219
EventListeners.COMMANDS_LISTENER.addListener((EventListener) commandClient);
220220

221-
if (generalConfig.features().tricks().tricksEnabled()) {
222-
commandClient.addCommand(new AddTrickCommand.Prefix());
223-
commandClient.addCommand(new EditTrickCommand.Prefix());
224-
EventListeners.COMMANDS_LISTENER.addListener(ListTricksCommand.getListListener());
225-
if (generalConfig.features().tricks().prefixEnabled()) {
226-
Tricks.getTricks().stream().map(RunTrickCommand.Prefix::new).forEach(commandClient::addCommand);
227-
}
228-
}
229-
230-
if (generalConfig.features().areQuotesEnabled()) {
231-
commandClient.addContextMenu(new AddQuoteContextMenu());
232-
commandClient.addContextMenu(new UserInfoContextMenu());
233-
}
234-
235221
{
236222
// Command register
237223
ReflectionsUtils.getFieldsAnnotatedWith(RegisterSlashCommand.class)
@@ -253,6 +239,22 @@ public void start() {
253239
.forEach(commandClient::addSlashCommand);
254240
}
255241

242+
// Tricks
243+
if (generalConfig.features().tricks().tricksEnabled()) {
244+
commandClient.addCommand(new AddTrickCommand.Prefix());
245+
commandClient.addCommand(new EditTrickCommand.Prefix());
246+
EventListeners.COMMANDS_LISTENER.addListener(ListTricksCommand.getListListener());
247+
if (generalConfig.features().tricks().prefixEnabled()) {
248+
Tricks.getTricks().stream().map(RunTrickCommand.Prefix::new).forEach(commandClient::addCommand);
249+
}
250+
}
251+
252+
// Quotes
253+
if (generalConfig.features().areQuotesEnabled()) {
254+
commandClient.addContextMenu(new AddQuoteContextMenu());
255+
commandClient.addContextMenu(new UserInfoContextMenu());
256+
}
257+
256258
// Button listeners
257259
EventListeners.COMMANDS_LISTENER.addListeners(DictionaryCommand.listener, new DismissListener(),
258260
QuoteCommand.ListQuotes.getQuoteListener(), RolesCommand.getListener());

src/commander/java/com/mcmoddev/mmdbot/commander/commands/QuoteCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ public class ListQuotes extends PaginatedCommand {
302302
* Create the command.
303303
* Sets all the usual flags.
304304
*/
305-
public ListQuotes() {
305+
private ListQuotes() {
306306
super("list", "Get all quotes.", true, new ArrayList<>(), 10);
307307
category = new Category("Fun");
308308
guildOnly = true;

src/commander/java/com/mcmoddev/mmdbot/commander/commands/tricks/AddTrickCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ protected void execute(final SlashCommandEvent event) {
7171
return;
7272
}
7373

74-
if (TheCommander.getInstance().getGeneralConfig().features().tricks().tricksEnabled()) {
74+
if (!TheCommander.getInstance().getGeneralConfig().features().tricks().tricksEnabled()) {
7575
event.deferReply(true).setContent("Tricks are not enabled!").queue();
7676
return;
7777
}

src/commander/java/com/mcmoddev/mmdbot/commander/tricks/ScriptTrick.java

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,7 @@
2929
import java.util.Arrays;
3030
import java.util.List;
3131

32-
// TODO convert to record, and register a record adapter factory to the GSON in `Tricks`
33-
public final class ScriptTrick implements Trick {
34-
35-
/**
36-
* The Names.
37-
*/
38-
private final List<String> names;
39-
40-
/**
41-
* The Body.
42-
*/
43-
private final String script;
44-
45-
public ScriptTrick(final List<String> names, final String script) {
46-
this.names = names;
47-
this.script = script;
48-
}
32+
public record ScriptTrick(List<String> names, String script) implements Trick {
4933

5034
@Override
5135
public List<String> getNames() {

src/commander/java/com/mcmoddev/mmdbot/commander/tricks/StringTrick.java

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,28 +36,7 @@
3636
*
3737
* @author williambl
3838
*/
39-
public class StringTrick implements Trick {
40-
41-
/**
42-
* The Names.
43-
*/
44-
private final List<String> names;
45-
46-
/**
47-
* The Body.
48-
*/
49-
private final String body;
50-
51-
/**
52-
* Instantiates a new String trick.
53-
*
54-
* @param names the names
55-
* @param body the body
56-
*/
57-
public StringTrick(final List<String> names, final String body) {
58-
this.names = names;
59-
this.body = body;
60-
}
39+
public record StringTrick(List<String> names, String body) implements Trick {
6140

6241
/**
6342
* Gets names.

src/commander/java/com/mcmoddev/mmdbot/commander/tricks/Tricks.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
import java.util.Optional;
5050
import java.util.function.Supplier;
5151

52-
//TODO: Migrate to a SQLite DB with PR #45
53-
5452
/**
5553
* The Tricks Module.
5654
*
@@ -211,8 +209,8 @@ private static void write() {
211209
Tricks.registerTrickType("script", new ScriptTrick.Type());
212210

213211
GSON = new GsonBuilder()
214-
.registerTypeAdapterFactory(new TrickSerializer())
215212
.registerTypeAdapterFactory(new RecordTypeAdapterFactory())
213+
.registerTypeAdapterFactory(new TrickSerializer())
216214
.create();
217215
}
218216

src/commander/java/com/mcmoddev/mmdbot/commander/util/script/ScriptingUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ public static ScriptingContext createMember(Member member, boolean canDm) {
331331
context.set("nickname", member.getNickname());
332332
context.set("color", member.getColorRaw());
333333
context.set("timeBoosted", member.getTimeBoosted());
334-
context.set("joinTime", member.getTimeJoined()); // TODO replace with the database values
334+
context.set("joinTime", member.getTimeJoined());
335335
context.setFunction("getStatus", a -> member.getOnlineStatus().getKey());
336336
context.set("activities", member.getActivities().stream().map(a -> createActivity(a).toProxyObject()).toArray(ScriptingContext[]::new));
337337
context.setFunction("getGuild", a -> createGuild(member.getGuild()).toProxyObject());

src/core/java/com/mcmoddev/mmdbot/core/RunBots.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ public static void main(String[] a) {
117117
ServerBridge.setInstance(new ServerBridgeImpl());
118118
final var dashConfig = getDashboardConfig();
119119
try {
120-
// TODO get the public ipv4 address
121120
final var address = new InetSocketAddress("0.0.0.0", dashConfig.port);
122121
final var listeners = new ArrayList<PacketListener>();
123122
bots.map(b -> b.getType().getPacketListenerUnsafe(b)).forEach(listeners::add);

src/core/java/com/mcmoddev/mmdbot/core/util/event/ThreadedEventListener.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*/
2121
package com.mcmoddev.mmdbot.core.util.event;
2222

23+
import lombok.NonNull;
2324
import lombok.experimental.Delegate;
2425
import lombok.extern.slf4j.Slf4j;
2526
import net.dv8tion.jda.api.EmbedBuilder;
@@ -65,7 +66,7 @@ public ThreadedEventListener(final ExecutorService threadPool, EventListener...
6566
* @param listener the listener to add
6667
* @return the current {@link ThreadedEventListener} for chaining conveniences.
6768
*/
68-
public ThreadedEventListener addListener(EventListener listener) {
69+
public ThreadedEventListener addListener(@NonNull final EventListener listener) {
6970
this.listeners.add(listener);
7071
return this;
7172
}
@@ -76,7 +77,7 @@ public ThreadedEventListener addListener(EventListener listener) {
7677
* @param listeners the listeners to add
7778
* @return the current {@link ThreadedEventListener} for chaining conveniences.
7879
*/
79-
public ThreadedEventListener addListeners(EventListener... listeners) {
80+
public ThreadedEventListener addListeners(@NonNull final EventListener... listeners) {
8081
this.listeners.addAll(Arrays.asList(listeners));
8182
return this;
8283
}
@@ -87,7 +88,7 @@ public ThreadedEventListener addListeners(EventListener... listeners) {
8788
* @param listeners the listeners to add
8889
* @return the current {@link ThreadedEventListener} for chaining conveniences.
8990
*/
90-
public ThreadedEventListener addListeners(List<EventListener> listeners) {
91+
public ThreadedEventListener addListeners(@NonNull List<EventListener> listeners) {
9192
this.listeners.addAll(listeners);
9293
return this;
9394
}
@@ -100,7 +101,9 @@ public ThreadedEventListener addListeners(List<EventListener> listeners) {
100101
public void onEvent(@Nonnull GenericEvent event) {
101102
listeners.forEach(listener -> threadPool.execute(() -> {
102103
try {
103-
listener.onEvent(event);
104+
if (listener != null) {
105+
listener.onEvent(event);
106+
}
104107
} catch (Exception e) {
105108
log.error("Error while executing threaded event!", e);
106109
// Reply to the user in order to inform them

src/main/resources/logback.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,13 @@
3232
<root level="WARN">
3333
<appender-ref ref="CHANNEL"/>
3434
</root>
35+
36+
<!--Disable the weird D4J stuffs -->
37+
<logger name="discord4j.gateway.payload.JacksonPayloadReader" level="ERROR" additivity="false" />
38+
<!--Make all useless loggers shut up -->
39+
<logger name="io.netty.buffer.AbstractByteBufAllocator" level = "WARN" additivity="false" />
40+
<logger name="discord4j.rest.request.RequestStream" level = "WARN" additivity="false" />
41+
<logger name="reactor.netty.resources.DefaultPooledConnectionProvider" level = "WARN" additivity="false" />
42+
<logger name="reactor.netty.ReactorNetty" level = "WARN" additivity="false" />
43+
<logger name="io.netty.buffer.PooledByteBufAllocator" level = "WARN" additivity="false" />
3544
</configuration>

0 commit comments

Comments
 (0)