izebra_projects/Rixa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved Commands, added sub command categories, added ShutdownCommand

Browse Source
This commit is contained in:
Savvy 2017-11-19 18:59:42 -05:00
parent cd3407e748
commit 67cc8c2b7a
7 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/io/rixa/bot/Rixa.java
View File

@ -2,12 +2,12 @@ package io.rixa.bot;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import io.rixa.bot.commands.cmds.InfoCommand;
import io.rixa.bot.commands.cmds.PingCommand;
import io.rixa.bot.commands.cmds.ServerInfoCommand;
import io.rixa.bot.commands.cmds.general.InfoCommand;
import io.rixa.bot.commands.cmds.general.PingCommand;
import io.rixa.bot.commands.cmds.general.ServerInfoCommand;
import io.rixa.bot.commands.handler.CommandHandler;
import io.rixa.bot.commands.perms.RixaPermission;
import io.rixa.bot.commands.cmds.HelpCommand;
import io.rixa.bot.commands.cmds.general.HelpCommand;
import io.rixa.bot.data.config.Configuration;
import io.rixa.bot.data.storage.DatabaseAdapter;
import io.rixa.bot.events.BotJoinListener;
@ -124,4 +124,8 @@ public class Rixa {
public static Rixa getInstance() {
return (instance == null) ? new Rixa() : instance;
}
public void close() {
shardList.forEach(JDA::shutdown);
}
}

2
src/main/java/io/rixa/bot/commands/cmds/HelpCommand.java → src/main/java/io/rixa/bot/commands/cmds/general/HelpCommand.java
View File

@ -1,4 +1,4 @@
package io.rixa.bot.commands.cmds;
package io.rixa.bot.commands.cmds.general;
import io.rixa.bot.commands.Command;
import io.rixa.bot.commands.perms.RixaPermission;

2
src/main/java/io/rixa/bot/commands/cmds/InfoCommand.java → src/main/java/io/rixa/bot/commands/cmds/general/InfoCommand.java
View File

@ -1,4 +1,4 @@
package io.rixa.bot.commands.cmds;
package io.rixa.bot.commands.cmds.general;
import io.rixa.bot.Rixa;
import io.rixa.bot.commands.Command;

2
src/main/java/io/rixa/bot/commands/cmds/PingCommand.java → src/main/java/io/rixa/bot/commands/cmds/general/PingCommand.java
View File

@ -1,4 +1,4 @@
package io.rixa.bot.commands.cmds;
package io.rixa.bot.commands.cmds.general;
import io.rixa.bot.commands.Command;
import io.rixa.bot.commands.perms.RixaPermission;

4
src/main/java/io/rixa/bot/commands/cmds/ServerInfoCommand.java → src/main/java/io/rixa/bot/commands/cmds/general/ServerInfoCommand.java
View File

@ -1,4 +1,4 @@
package io.rixa.bot.commands.cmds;
package io.rixa.bot.commands.cmds.general;
import io.rixa.bot.commands.Command;
import io.rixa.bot.commands.perms.RixaPermission;
@ -38,4 +38,4 @@ public class ServerInfoCommand extends Command {
.footer("Server Id: " + event.getGuild().getId(), event.getGuild().getIconUrl())
.queue(event.getChannel());
}
}
}

38
src/main/java/io/rixa/bot/commands/cmds/other/ShutdownCommand.java Normal file
View File

@ -0,0 +1,38 @@
package io.rixa.bot.commands.cmds.other;
import io.rixa.bot.Rixa;
import io.rixa.bot.commands.Command;
import io.rixa.bot.commands.perms.RixaPermission;
import io.rixa.bot.guild.RixaGuild;
import io.rixa.bot.guild.manager.GuildManager;
import io.rixa.bot.utils.MessageFactory;
import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent;
public class ShutdownCommand extends Command {
public ShutdownCommand(String command, RixaPermission rixaPermission, String description) {
super(command, rixaPermission, description);
}
@Override
public void execute(GuildMessageReceivedEvent event) {
if (!(Rixa.getInstance().getConfiguration().isBotAdmin(event.getAuthor().getId()))) {
new MessageFactory(event.getMember().getAsMention() + ", you do not have permission for this command.").setColor(event.getMember().getColor()).queue(event.getChannel());
return;
}
try {
MessageFactory.create("Shutting down...").queue(event.getChannel());
for (RixaGuild rixaGuild : GuildManager.getInstance().getGuilds().values()) {
Thread.sleep(50);
rixaGuild.save();
}
Thread.sleep(500);
Rixa.getInstance().close();
System.exit(0);
} catch (InterruptedException ex) {
ex.printStackTrace();
}
Rixa.getInstance().close();
}
}

5
src/main/java/io/rixa/bot/guild/manager/GuildManager.java
View File

@ -1,5 +1,6 @@
package io.rixa.bot.guild.manager;
import gnu.trove.map.TByteByteMap;
import io.rixa.bot.data.storage.DatabaseAdapter;
import io.rixa.bot.data.storage.enums.Statements;
import io.rixa.bot.guild.RixaGuild;
@ -52,4 +53,8 @@ public class GuildManager {
(Statements.INSERT_CORE.getStatement(),
guild.getId(), guild.getName(), "Description not set.", "No Keywords Found ");
}
public Map<String, RixaGuild> getGuilds() {
return rixaGuildMap;
}
}