diff --git a/src/main/java/net/romvoid/crashbot/Bot.java b/src/main/java/net/romvoid/crashbot/Bot.java index 1e43788..a7fe1a1 100644 --- a/src/main/java/net/romvoid/crashbot/Bot.java +++ b/src/main/java/net/romvoid/crashbot/Bot.java @@ -81,7 +81,6 @@ /** The prefix. */ private static String prefix; - private static Set intents = new HashSet<>(); public static final Logger LOG = LoggerFactory.getLogger(Bot.class); @@ -91,6 +90,8 @@ * Instantiates a new bot. */ private Bot() { + String jabberusername; + String jabberpass; instance = this; configuration = new Configuration(new File("config.json")); for (String configKey : CONFIG_KEYS) { @@ -100,6 +101,8 @@ } } prefix = instance.configuration.getString("prefix"); + jabberusername = instance.configuration.getString("jabberusername"); + jabberpass = instance.configuration.getString("jabberpass"); setIntents(); client = new CommandClientBuilder(); waiter = new EventWaiter(); @@ -109,7 +112,7 @@ client.addCommands(new InviteCommand(), new GuildlistCommand(waiter), new GitCommand(), new StatusCommand(), new Kot666Command()); initJDA(); - initJabber(); + initJabber(jabberusername, jabberpass); } @@ -145,10 +148,10 @@ getJDA().getPresence().setActivity(Activity.playing("MFND.ru")); } - public static void initJabber() { + public static void initJabber(String jabberusername, String jabberpass) { try { XMPPTCPConnectionConfiguration config = XMPPTCPConnectionConfiguration.builder() - .setUsernameAndPassword("crashlogbot", "cf615weIDQWL") + .setUsernameAndPassword(jabberusername, jabberpass) .setXmppDomain("mfnd.ru") .setHost("xmpp.mfnd.ru") .setPort(5222) diff --git a/src/main/java/net/romvoid/crashbot/commands/StatusCommand.java b/src/main/java/net/romvoid/crashbot/commands/StatusCommand.java index 58eada5..64c5a63 100644 --- a/src/main/java/net/romvoid/crashbot/commands/StatusCommand.java +++ b/src/main/java/net/romvoid/crashbot/commands/StatusCommand.java @@ -48,11 +48,11 @@ embed.setColor(Color.red); } // if () { -// embed.addField("", "Jabber activity - OK", false); +// embed.addField("", "Jabber connect - OK", false); // embed.setColor(Color.green); // } else // { -// embed.addField("", "Jabber activity - FAIL", false); +// embed.addField("", "Jabber connect - FAIL", false); // embed.setColor(Color.red); // } Message msg = EmbedUtil.message(embed);