From 9cc81764c19d1d2638cae6e0e6c73435eef0937c Mon Sep 17 00:00:00 2001 From: Salmonllama Date: Thu, 30 Jul 2020 18:02:11 -0400 Subject: [PATCH] Fixed logic in NewMemberListener --- .../salmonllama/fsbot/listeners/NewMemberListener.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/dev/salmonllama/fsbot/listeners/NewMemberListener.java b/src/main/java/dev/salmonllama/fsbot/listeners/NewMemberListener.java index 8ea2737..458b439 100644 --- a/src/main/java/dev/salmonllama/fsbot/listeners/NewMemberListener.java +++ b/src/main/java/dev/salmonllama/fsbot/listeners/NewMemberListener.java @@ -6,6 +6,7 @@ package dev.salmonllama.fsbot.listeners; import dev.salmonllama.fsbot.config.BotConfig; +import dev.salmonllama.fsbot.database.controllers.ServerConfigController; import org.javacord.api.event.server.member.ServerMemberJoinEvent; import org.javacord.api.listener.server.member.ServerMemberJoinListener; @@ -14,11 +15,14 @@ public class NewMemberListener implements ServerMemberJoinListener { public void onServerMemberJoin(ServerMemberJoinEvent event) { if (!event.getServer().getIdAsString().equals(BotConfig.HOME_SERVER)) { + // Only active in the Fashionscape server, currently. return; } -// String logMessage = String.format(welcomeMsg, event.getUser().getMentionTag()); - - event.getApi().getServerTextChannelById(BotConfig.WELCOME_CHANNEL).ifPresent(channel -> channel.sendMessage("Welcome!")); + // TODO: Use the ServerConfig to retrieve the welcome channel as well. + event.getApi().getServerTextChannelById(BotConfig.WELCOME_CHANNEL).ifPresent( // Get the Welcome Channel + channel -> ServerConfigController.get(event.getServer().getIdAsString()).thenAcceptAsync( // Fetch the server config, if set. + possibleConfig -> possibleConfig.ifPresent( // If config exists + config -> channel.sendMessage(String.format(config.getWelcomeMessage(), event.getUser().getMentionTag()))))); // Send the welcome message } }