Fixed logic in NewMemberListener

This commit is contained in:
Salmonllama 2020-07-30 18:02:11 -04:00
parent c598d4b5c4
commit 9cc81764c1

View File

@ -6,6 +6,7 @@
package dev.salmonllama.fsbot.listeners; package dev.salmonllama.fsbot.listeners;
import dev.salmonllama.fsbot.config.BotConfig; 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.event.server.member.ServerMemberJoinEvent;
import org.javacord.api.listener.server.member.ServerMemberJoinListener; import org.javacord.api.listener.server.member.ServerMemberJoinListener;
@ -14,11 +15,14 @@ public class NewMemberListener implements ServerMemberJoinListener {
public void onServerMemberJoin(ServerMemberJoinEvent event) { public void onServerMemberJoin(ServerMemberJoinEvent event) {
if (!event.getServer().getIdAsString().equals(BotConfig.HOME_SERVER)) { if (!event.getServer().getIdAsString().equals(BotConfig.HOME_SERVER)) {
// Only active in the Fashionscape server, currently.
return; return;
} }
// String logMessage = String.format(welcomeMsg, event.getUser().getMentionTag()); // TODO: Use the ServerConfig to retrieve the welcome channel as well.
event.getApi().getServerTextChannelById(BotConfig.WELCOME_CHANNEL).ifPresent( // Get the Welcome Channel
event.getApi().getServerTextChannelById(BotConfig.WELCOME_CHANNEL).ifPresent(channel -> channel.sendMessage("Welcome!")); 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
} }
} }