From ed14d476e1bffc260193a155d874f8e1ce760320 Mon Sep 17 00:00:00 2001 From: Salmonllama Date: Tue, 7 Sep 2021 20:31:17 -0400 Subject: [PATCH] Used discrims instead of User object in Color Command messages. --- .../salmonllama/fsbot/commands/general/ColorCommand.java | 2 +- .../salmonllama/fsbot/commands/general/ColorsCommand.java | 5 +---- .../salmonllama/fsbot/commands/staff/AddColorCommand.java | 6 +----- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/dev/salmonllama/fsbot/commands/general/ColorCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/general/ColorCommand.java index 9bcd6ad..ed02a2b 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/general/ColorCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/general/ColorCommand.java @@ -20,7 +20,7 @@ public class ColorCommand extends Command { @Override public void onCommand(CommandContext ctx) { ctx.getApi().getOwner().thenAcceptAsync(owner -> { - ctx.reply("This command is no longer active. An alternative is currently being developed. For more information, please contact " + owner); + ctx.reply("This command is no longer active. An alternative is currently being developed. For more information, please contact " + owner.getDiscriminatedName()); }); } } diff --git a/src/main/java/dev/salmonllama/fsbot/commands/general/ColorsCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/general/ColorsCommand.java index 16e26d5..bafdccb 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/general/ColorsCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/general/ColorsCommand.java @@ -5,10 +5,7 @@ package dev.salmonllama.fsbot.commands.general; -import dev.salmonllama.fsbot.config.BotConfig; -import dev.salmonllama.fsbot.database.controllers.ColorRoleController; import dev.salmonllama.fsbot.guthix.*; -import org.javacord.api.entity.message.embed.EmbedBuilder; import java.util.Arrays; import java.util.List; @@ -24,7 +21,7 @@ public class ColorsCommand extends Command { @Override public void onCommand(CommandContext ctx) { ctx.getApi().getOwner().thenAcceptAsync(owner -> { - ctx.reply("This command is no longer active. An alternative is currently being developed. For more information, please contact " + owner); + ctx.reply("This command is no longer active. An alternative is currently being developed. For more information, please contact " + owner.getDiscriminatedName()); }); } } diff --git a/src/main/java/dev/salmonllama/fsbot/commands/staff/AddColorCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/AddColorCommand.java index 9cf98b2..3170b6b 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/staff/AddColorCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/AddColorCommand.java @@ -5,11 +5,7 @@ package dev.salmonllama.fsbot.commands.staff; -import dev.salmonllama.fsbot.config.BotConfig; -import dev.salmonllama.fsbot.database.controllers.ColorRoleController; -import dev.salmonllama.fsbot.database.models.ColorRole; import dev.salmonllama.fsbot.guthix.*; -import org.javacord.api.entity.permission.Role; import java.util.Arrays; import java.util.List; @@ -25,7 +21,7 @@ public class AddColorCommand extends Command { @Override public void onCommand(CommandContext ctx) { ctx.getApi().getOwner().thenAcceptAsync(owner -> { - ctx.reply("This command is no longer active. An alternative is currently being developed. For more information, please contact " + owner); + ctx.reply("This command is no longer active. An alternative is currently being developed. For more information, please contact " + owner.getDiscriminatedName()); }); } }