From b488aeef1599b7e0262ae3f4c0c03c936c26086d Mon Sep 17 00:00:00 2001 From: Nilstrieb Date: Sun, 7 Feb 2021 14:31:16 +0100 Subject: [PATCH] fixed print --- src/main/java/com/github/nilstrieb/cofig/Config.java | 2 +- .../github/nilstrieb/commands/fun/trivia/TriviaCommand.java | 3 +-- src/main/java/com/github/nilstrieb/core/Main.java | 2 +- .../com/github/nilstrieb/core/command/CommandListener.java | 4 +--- .../nilstrieb/core/reactions/ReactionEventManager.java | 6 ++---- .../nilstrieb/core/sections/ChannelMessageEventManager.java | 2 +- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/github/nilstrieb/cofig/Config.java b/src/main/java/com/github/nilstrieb/cofig/Config.java index 417dfb0..05b5120 100644 --- a/src/main/java/com/github/nilstrieb/cofig/Config.java +++ b/src/main/java/com/github/nilstrieb/cofig/Config.java @@ -13,7 +13,7 @@ public class Config { public static final String NORMAL_PREFIX = "kil "; public static final String L_PREFIX = "k "; - public static final String PREFIX = L_PREFIX; + public static final String PREFIX = NORMAL_PREFIX; public static final Color DEFAULT_COLOR = new Color(229, 201, 255); diff --git a/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaCommand.java b/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaCommand.java index a9b9422..13118c3 100644 --- a/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaCommand.java +++ b/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaCommand.java @@ -134,8 +134,7 @@ public class TriviaCommand extends Command { new TriviaApproval(event, new TriviaQuestion(answers)); } else { - System.out.println(ConsoleColors.BLUE_BOLD + "[TriviaCommand.AddSection 139] Received Next Message: " - + text + " status: " + status + ConsoleColors.RESET); + System.out.println(ConsoleColors.BLUE_BOLD + "[TriviaCommand.AddSection 139] Received Next Message. status: " + status + ConsoleColors.RESET); answers[status] = event.getMessage().getContentRaw(); if (status >= 3) { try { diff --git a/src/main/java/com/github/nilstrieb/core/Main.java b/src/main/java/com/github/nilstrieb/core/Main.java index e481cb0..f04cef2 100644 --- a/src/main/java/com/github/nilstrieb/core/Main.java +++ b/src/main/java/com/github/nilstrieb/core/Main.java @@ -30,7 +30,7 @@ import java.util.Scanner; public class Main { public static void main(String[] args) throws LoginException { - JDABuilder builder = JDABuilder.createDefault(Secrets.L_TOKEN); + JDABuilder builder = JDABuilder.createDefault(Secrets.TOKEN); builder.setCompression(Compression.ZLIB); builder.setActivity(Activity.watching("over Gon")); diff --git a/src/main/java/com/github/nilstrieb/core/command/CommandListener.java b/src/main/java/com/github/nilstrieb/core/command/CommandListener.java index e3d2e93..b388295 100644 --- a/src/main/java/com/github/nilstrieb/core/command/CommandListener.java +++ b/src/main/java/com/github/nilstrieb/core/command/CommandListener.java @@ -1,6 +1,5 @@ package com.github.nilstrieb.core.command; -import com.github.nilstrieb.core.command.CommandHandler; import com.github.nilstrieb.util.ConsoleColors; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; @@ -10,8 +9,7 @@ public class CommandListener extends ListenerAdapter { @Override public void onMessageReceived(@NotNull MessageReceivedEvent event) { if (!event.getAuthor().isBot()) { - System.out.println(ConsoleColors.CYAN + "[CListener 13] Received message: '" + - event.getMessage().getContentRaw() + "' by " + event.getAuthor().getAsTag() + ConsoleColors.RESET); + System.out.println(ConsoleColors.CYAN + "[CListener 13] Received message." + ConsoleColors.RESET); CommandHandler.call(event); } } diff --git a/src/main/java/com/github/nilstrieb/core/reactions/ReactionEventManager.java b/src/main/java/com/github/nilstrieb/core/reactions/ReactionEventManager.java index 1bf1130..677fe3a 100644 --- a/src/main/java/com/github/nilstrieb/core/reactions/ReactionEventManager.java +++ b/src/main/java/com/github/nilstrieb/core/reactions/ReactionEventManager.java @@ -18,8 +18,7 @@ public class ReactionEventManager { } public static void onReactionAdd(MessageReactionAddEvent event){ - System.out.println(ConsoleColors.PURPLE + "[ReactionEventManager 21] Reaction added: " + event.getReactionEmote() + - " by " + event.getUser().getAsTag() + ConsoleColors.RESET); + System.out.println(ConsoleColors.PURPLE + "[ReactionEventManager 21] Reaction added: " + event.getReactionEmote() + ConsoleColors.RESET); long message = event.getMessageIdLong(); ReactionListener listener = currentReactions.get(message); if (listener != null) { @@ -28,8 +27,7 @@ public class ReactionEventManager { } public static void onReactionRemove(MessageReactionRemoveEvent event){ - System.out.println(ConsoleColors.PURPLE + "[ReactionEventManager 31] Reaction removed: " + event.getReactionEmote() + - " by " + event.getUser().getAsTag() + ConsoleColors.RESET); + System.out.println(ConsoleColors.PURPLE + "[ReactionEventManager 31] Reaction removed: " + event.getReactionEmote() + ConsoleColors.RESET); long message = event.getMessageIdLong(); ReactionListener listener = currentReactions.get(message); if (listener != null) { diff --git a/src/main/java/com/github/nilstrieb/core/sections/ChannelMessageEventManager.java b/src/main/java/com/github/nilstrieb/core/sections/ChannelMessageEventManager.java index 9ea9011..56a2b06 100644 --- a/src/main/java/com/github/nilstrieb/core/sections/ChannelMessageEventManager.java +++ b/src/main/java/com/github/nilstrieb/core/sections/ChannelMessageEventManager.java @@ -29,7 +29,7 @@ public class ChannelMessageEventManager { //if the message is relevant if (listeners.containsKey(id)) { System.out.println(ConsoleColors.YELLOW + "[ChannelMsgEvtMgr 30] Message in listened channel " + - event.getTextChannel().getName() + " by " + event.getAuthor().getAsTag() + ": " + event.getMessage().getContentRaw() + ConsoleColors.RESET); + event.getTextChannel().getName() + ConsoleColors.RESET); //notify all listeners List list = listeners.get(id);