u1/nopalmo-java
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more shit

Browse source 
i should mention im doing live tests before upload, and this is
pre-maintenance, anything worth noting will be written in comments

Signed-off-by: deepCurse <leverplays@gmail.com>
This commit is contained in:
deepCurse 2021-12-06 10:58:30 -04:00
parent 573443e4b4
commit 1380bc2a22
No known key found for this signature in database
GPG key ID: EEBCBB60C9DFC782
24 changed files with 663 additions and 288 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/pkg/deepCurse/nopalmo/command/Command.java → src/pkg/deepCurse/nopalmo/command/AbstractCommand.java
View file

@ -5,13 +5,8 @@ import java.util.HashMap;
import org.jetbrains.annotations.Nullable;
import pkg.deepCurse.nopalmo.manager.Argument;
import pkg.deepCurse.nopalmo.manager.GuildCommandBlob;
import pkg.deepCurse.nopalmo.manager.GuildCommandManager;
public abstract class Command {
public abstract void runCommand(GuildCommandBlob blob, GuildCommandManager commandManager,
HashMap<String, Argument> argumentList) throws Exception;
public abstract class AbstractCommand { // TODO rewrite to implement type args?
public abstract String[] getCommandCalls();
@ -19,10 +14,6 @@ public abstract class Command {
return getCommandCalls()[0];
}
public boolean isHidden() {
return false;
}
public boolean isNSFW() {
return false;
}
@ -39,17 +30,14 @@ public abstract class Command {
}
public String getHelp() {
// TODO Auto-generated method stub
return null;
}
public String getUsage() {
// TODO Auto-generated method stub
return null;
}
public int getTimeout() {
// TODO Auto-generated method stub
return 0;
}
@ -58,5 +46,4 @@ public abstract class Command {
return null;
}
}

12
src/pkg/deepCurse/nopalmo/command/DirectCommand.java Normal file
View file

@ -0,0 +1,12 @@
package pkg.deepCurse.nopalmo.command;
import java.util.HashMap;
import pkg.deepCurse.nopalmo.manager.Argument;
import pkg.deepCurse.nopalmo.manager.DirectCommandBlob;
public abstract class DirectCommand extends AbstractCommand {
public abstract void runCommand(DirectCommandBlob blob, HashMap<String, Argument> argumentList) throws Exception;
}

18
src/pkg/deepCurse/nopalmo/command/GuildCommand.java
View file

@ -1,15 +1,23 @@
package pkg.deepCurse.nopalmo.command;
import net.dv8tion.jda.api.Permission;
import java.util.HashMap;
import net.dv8tion.jda.api.Permission;
import pkg.deepCurse.nopalmo.manager.Argument;
import pkg.deepCurse.nopalmo.manager.GuildCommandBlob;
public abstract class GuildCommand extends AbstractCommand {
public abstract void runCommand(GuildCommandBlob blob, HashMap<String, Argument> argumentList) throws Exception;
public abstract String[] getCommandCalls();
public abstract class GuildCommand extends Command {
public Permission[] getRequiredPermissions() {
return null;
}
public Permission getRequiredPermission() {
// TODO Auto-generated method stub
return null;
}
}

84
src/pkg/deepCurse/nopalmo/command/directCommand/info/DirectMessagePing.java Normal file
View file

@ -0,0 +1,84 @@
package pkg.deepCurse.nopalmo.command.directCommand.info;
import java.util.HashMap;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import pkg.deepCurse.nopalmo.command.DirectCommand;
import pkg.deepCurse.nopalmo.database.DatabaseTools.Tools.Global;
import pkg.deepCurse.nopalmo.manager.Argument;
import pkg.deepCurse.nopalmo.manager.DirectCommandBlob;
import pkg.deepCurse.nopalmo.utils.UptimePing;
public class DirectMessagePing extends DirectCommand {
@Override
public void runCommand(DirectCommandBlob blob,
HashMap<String, Argument> argumentMap) throws Exception {
MessageReceivedEvent event = blob.getEvent();
if (argumentMap.isEmpty()) {
event.getChannel().sendMessage("Pong!\n" + event.getJDA().getGatewayPing() + "ms\n").queue();
return;
}
if (argumentMap.get("all") != null) {
event.getChannel().sendMessage("Gathering data. . .").queue(msg -> {
long timeToProcess = System.currentTimeMillis();
try { // TODO rewrite this block, all tries are not good practice
String out = "Pong!\n" + "Google: " + UptimePing.sendPing("www.google.com") + "ms\n"
+ "JDA Gateway: " + event.getJDA().getGatewayPing() + "ms\n" + "www.discord.com: "
+ UptimePing.sendPing("www.discord.com") + "ms";
msg.editMessage(out + "\nTime to process: " + (System.currentTimeMillis() - timeToProcess) + "ms")
.queue();
} catch (Exception e) {
e.printStackTrace();
}
});
}
// if (argumentArray == null || argumentArray.isEmpty()) {
//
// return;
// } else {
//
// for (Argument i : argumentArray) {
// if (i.getArgName().contentEquals("all")) {
//
// } else {
// Tools.wrongUsage(event.getChannel(), this);
// }
// }
// return;
// }
}
@Override
public String[] getCommandCalls() {
return new String[] { "ping" };
}
@Override
public String getUsage() {
return Global.prefix + "ping [" + Argument.argumentPrefix + "all]";
}
@Override
public HelpPage getHelpPage() {
return HelpPage.Info;
}
@Override
public HashMap<String, Argument> getArguments() {
HashMap<String, Argument> args = new HashMap<String, Argument>();
args.put("all", new Argument("all").setPrefixRequirement(true));
return args;
}
}

28
src/pkg/deepCurse/nopalmo/command/guildCommand/info/Git.java Normal file
View file

@ -0,0 +1,28 @@
package pkg.deepCurse.nopalmo.command.guildCommand.info;
import java.util.HashMap;
import pkg.deepCurse.nopalmo.command.GuildCommand;
import pkg.deepCurse.nopalmo.manager.Argument;
import pkg.deepCurse.nopalmo.manager.GuildCommandBlob;
public class Git extends GuildCommand {
@Override
public void runCommand(GuildCommandBlob blob, HashMap<String, Argument> argumentList) throws Exception {
blob.getEvent().getChannel().sendMessage("Heres the link: https://github.com/lever1209/nopalmo").queue();
}
@Override
public String[] getCommandCalls() {
// TODO Auto-generated method stub
return new String[] { "git", "source", "github" };
}
@Override
public HelpPage getHelpPage() {
// TODO Auto-generated method stub
return HelpPage.Info;
}
}

36
src/pkg/deepCurse/nopalmo/command/guildCommand/info/Help.java
View file

@ -6,10 +6,8 @@ import java.util.Random;
import java.util.concurrent.TimeUnit;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.interactions.commands.Command;
import pkg.deepCurse.nopalmo.command.GuildCommand;
import pkg.deepCurse.nopalmo.database.DatabaseTools.Tools.Global;
import pkg.deepCurse.nopalmo.global.Tools;
import pkg.deepCurse.nopalmo.manager.Argument;
import pkg.deepCurse.nopalmo.manager.GuildCommandBlob;
import pkg.deepCurse.nopalmo.manager.GuildCommandManager;
@ -23,8 +21,7 @@ public class Help extends GuildCommand {
}
@Override
public void runCommand(GuildCommandBlob blob, GuildCommandManager commandManager,
HashMap<String, Argument> argumentMap) throws Exception {
public void runCommand(GuildCommandBlob blob, HashMap<String, Argument> argumentMap) throws Exception {
if (argumentMap.isEmpty()) {
EmbedBuilder embed = new EmbedBuilder().setTitle("Commands:");
@ -40,14 +37,14 @@ public class Help extends GuildCommand {
StringBuilder sB = new StringBuilder();
GuildCommand ping = commandManager.getCommand("ping");
GuildCommand ping = blob.getCommandManager().getCommand("ping");
if (ping != null) {
sB.append("`"+ping.getUsage()+"`\n");
sB.append("`" + ping.getUsage() + "`\n");
}
GuildCommand help = commandManager.getCommand("help");
GuildCommand help = blob.getCommandManager().getCommand("help");
if (help != null) {
sB.append("`"+help.getUsage()+"`\n");
sB.append("`" + help.getUsage() + "`\n");
}
embed.addField("Information:", "Commands to take note of:\n" + sB, false);
@ -59,21 +56,21 @@ public class Help extends GuildCommand {
// embed.setFooter("Command list requested by: "+event.getAuthor().getAsTag(),
// event.getAuthor().getEffectiveAvatarUrl());
embed.setFooter(blob.getGuildMessageEvent().getMember().getEffectiveName(),
blob.getGuildMessageEvent().getMember().getUser().getEffectiveAvatarUrl());
embed.setFooter(blob.getEvent().getMember().getEffectiveName(),
blob.getEvent().getMember().getUser().getEffectiveAvatarUrl());
embed.setTimestamp(Instant.now());
embed.setColor(0);
if (embed.isValidLength()) {
blob.getGuildMessageEvent().getChannel().sendMessageEmbeds(embed.build()).queue();
blob.getEvent().getChannel().sendMessageEmbeds(embed.build()).queue();
} else {
blob.getGuildMessageEvent().getChannel()
blob.getEvent().getChannel()
.sendMessage(
"Critical error!\nEmbed max size exceeded, please report this to the devs immediately")
.queue();
}
if (new Random().nextLong() == 69420l) { // i wonder who will find this, also, if you read the source to
// find this, shhhhhhhh - deepCurse
blob.getGuildMessageEvent().getChannel().sendMessage("we will rise above you humans")
blob.getEvent().getChannel().sendMessage("we will rise above you humans")
.queue(msg -> msg.delete().queueAfter(300, TimeUnit.MILLISECONDS));
}
return;
@ -94,7 +91,7 @@ public class Help extends GuildCommand {
// event.getChannel().sendMessage("Command help for `" + command.commandName() +
// "`:\n\tUsage: "+ command.usageString() + "\n" +
// command.helpString()).queue();
if (!command.isHidden() & command.getHelpPage() != HelpPage.EGG) {
if (command.getHelpPage() != HelpPage.EGG) {
EmbedBuilder eB = new EmbedBuilder();
eB.setTitle("Help results for: " + command.getCommandName());
if (command.getHelp() != null) {
@ -132,14 +129,14 @@ public class Help extends GuildCommand {
}
sB.append("Premium: " + command.isPremium() + "\n");
eB.addField("Misc", sB.toString(), false);
blob.getGuildMessageEvent().getChannel().sendMessageEmbeds(eB.build()).queue();
blob.getEvent().getChannel().sendMessageEmbeds(eB.build()).queue();
} else {
throw new NullPointerException("Invalid input");
}
} catch (java.lang.NullPointerException e) {
e.printStackTrace();
blob.getGuildMessageEvent().getChannel()
blob.getEvent().getChannel()
.sendMessage("The command `" + String.join("", blob.getArgs()) + "` does not exist!\n" + "Use `"
+ Global.prefix + getCommandCalls()[0] + "` for a list of all my commands!")
.queue();
@ -151,11 +148,6 @@ public class Help extends GuildCommand {
// https://download.java.net/java/GA/jdk16/7863447f0ab643c585b9bdebf67c69db/36/GPL/openjdk-16_linux-x64_bin.tar.gz
}
@Override
public boolean isHidden() {
return false;
}
@Override
public HelpPage getHelpPage() {
return HelpPage.Info;

36
src/pkg/deepCurse/nopalmo/command/guildCommand/info/Ping.java
View file

@ -7,15 +7,14 @@ import pkg.deepCurse.nopalmo.command.GuildCommand;
import pkg.deepCurse.nopalmo.database.DatabaseTools.Tools.Global;
import pkg.deepCurse.nopalmo.manager.Argument;
import pkg.deepCurse.nopalmo.manager.GuildCommandBlob;
import pkg.deepCurse.nopalmo.manager.GuildCommandManager;
import pkg.deepCurse.nopalmo.utils.UptimePing;
public class Ping extends GuildCommand {
@Override
public void runCommand(GuildCommandBlob blob, GuildCommandManager commandManager,
HashMap<String, Argument> argumentMap) throws Exception {
public void runCommand(GuildCommandBlob blob, HashMap<String, Argument> argumentMap) throws Exception {
GuildMessageReceivedEvent event = blob.getGuildMessageEvent();
GuildMessageReceivedEvent event = blob.getEvent();
if (argumentMap.isEmpty()) {
event.getChannel().sendMessage("Pong!\n" + event.getJDA().getGatewayPing() + "ms\n").queue();
@ -27,17 +26,28 @@ public class Ping extends GuildCommand {
event.getChannel().sendMessage("Gathering data. . .").queue(msg -> {
long timeToProcess = System.currentTimeMillis();
try { // TODO rewrite this block, all tries are not good practice
String out = "Pong!\n" + "Google: " + services.UptimePing.sendPing("www.google.com") + "ms\n"
+ "JDA Gateway: " + event.getJDA().getGatewayPing() + "ms\n" + "www.discord.com: "
+ services.UptimePing.sendPing("www.discord.com") + "ms";
msg.editMessage(out + "\nTime to process: " + (System.currentTimeMillis() - timeToProcess) + "ms")
.queue();
long jdaPing = event.getJDA().getGatewayPing();
long googlePing = -1;
try {
googlePing = UptimePing.sendPing("www.google.com");
} catch (Exception e) {
e.printStackTrace();
}
long discordPing = -1;
try {
discordPing = UptimePing.sendPing("www.discord.com");
} catch (Exception e) {
e.printStackTrace();
}
String out = "Ping:\n"
+ (googlePing > 0 ? "Google: " + googlePing + "ms\n" : "Could not connect to www.google.com\n")
+ (discordPing > 0 ? "Discord: " + discordPing + "ms\n"
: "Could not connect to www.discord.com\n")
+ "JDA-Discord heartbeat: "+jdaPing+"ms";
msg.editMessage(out + "\nTime to process: " + (System.currentTimeMillis() - timeToProcess) + "ms")
.queue();
});
}
@ -64,7 +74,7 @@ public class Ping extends GuildCommand {
@Override
public String getUsage() {
return Global.prefix+"ping [" + Argument.argumentPrefix + "all]";
return Global.prefix + "ping [" + Argument.argumentPrefix + "all]";
}
@Override

51
src/pkg/deepCurse/nopalmo/core/Boot.java
View file

@ -2,8 +2,6 @@ package pkg.deepCurse.nopalmo.core;
import java.sql.SQLException;
import javax.security.auth.login.LoginException;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.JDABuilder;
import net.dv8tion.jda.api.entities.Activity;
@ -12,57 +10,60 @@ import net.dv8tion.jda.api.utils.ChunkingFilter;
import net.dv8tion.jda.api.utils.MemberCachePolicy;
import pkg.deepCurse.nopalmo.database.DatabaseTools;
import pkg.deepCurse.nopalmo.global.Reactions;
import pkg.deepCurse.nopalmo.listener.DirectMessageReceivedListener;
import pkg.deepCurse.nopalmo.listener.GuildMessageReceivedListener;
import pkg.deepCurse.nopalmo.manager.DirectCommandManager;
import pkg.deepCurse.nopalmo.manager.GuildCommandManager;
import pkg.deepCurse.simpleLoggingGarbage.core.Log;
import pkg.deepCurse.nopalmo.utils.LogHelper;
public class Boot {
public static JDA bot;
public static DatabaseTools databaseTools = null;
public static GuildCommandManager guildCommandManager = new GuildCommandManager(); // move to master manager
public static DirectCommandManager directCommandManager = new DirectCommandManager(); // move to master manager
public static boolean isProd = false;
public static void main(String[] args) {
Log.boot("Booting. . .");
LogHelper.boot("Booting. . .");
long preBootTime = System.currentTimeMillis();
isProd = args[2].contentEquals("prod");
Log.boot("Connecting to mariadb:nopalmo");
LogHelper.boot("Connecting to mariadb:nopalmo");
try {
databaseTools = new DatabaseTools(args[1]);
Log.boot("Connected. . .");
} catch (SQLException e1) {
LogHelper.boot("Connected. . .");
} catch (SQLException | ClassNotFoundException e1) {
e1.printStackTrace();
Log.boot("Failed to connect. . .\nShutting down. . .");
LogHelper.boot("Failed to connect. . .\nShutting down. . .");
System.exit(4);
}
Log.boot("Init reaction/emote list");
LogHelper.boot("Init reaction/emote list");
Reactions.init();
Log.boot("Initialized reaction/emote list. . .");
Log.boot("Init guild commands list");
LogHelper.boot("Initialized reaction/emote list. . .");
LogHelper.boot("Init guild commands list");
guildCommandManager.init();
Log.boot("Initialized guild commands list. . .");
LogHelper.boot("Initialized guild commands list. . .");
try {
bot = JDABuilder.createDefault(args[0]).setChunkingFilter(ChunkingFilter.NONE)
.setMemberCachePolicy(MemberCachePolicy.NONE).enableIntents(GatewayIntent.GUILD_MEMBERS)
.setActivity(Activity.watching("Loading users...")).setIdle(true)
.addEventListeners(new GuildMessageReceivedListener()).build().awaitReady();
} catch (LoginException e) {
Log.crash(e);
} catch (InterruptedException e) {
e.printStackTrace();
.addEventListeners(new GuildMessageReceivedListener()).addEventListeners(new DirectMessageReceivedListener()) .build().awaitReady();
} catch (Exception e) {
LogHelper.crash(e);
}
bot.getPresence().setActivity(Activity.listening("Infected Mushroom"));
long bootTime = System.currentTimeMillis() - preBootTime;
Log.boot("Taken "+bootTime+"ms to boot");
LogHelper.boot("Taken " + bootTime + "ms to boot");
}
}

19
src/pkg/deepCurse/nopalmo/database/DatabaseTools.java
View file

@ -13,37 +13,26 @@ import org.jetbrains.annotations.Nullable;
import pkg.deepCurse.nopalmo.core.Boot;
import pkg.deepCurse.nopalmo.database.DatabaseTools.Tools.Global;
import pkg.deepCurse.simpleLoggingGarbage.core.Log;
public class DatabaseTools {
private static Connection connection = null;
public DatabaseTools(String password) throws SQLException {
public DatabaseTools(String password) throws SQLException, ClassNotFoundException {
connection = createConnection(password);
Global.updatePrefix();
}
@SuppressWarnings("deprecation")
public static Connection createConnection(String password) throws SQLException {
public static Connection createConnection(String password) throws SQLException, ClassNotFoundException {
String dbName = Boot.isProd ? "nopalmo" : "chaos";
String driver = "com.mysql.cj.jdbc.Driver";
String url = "jdbc:mysql://localhost/" + dbName;
String username = "nopalmo";
try {
Class.forName(driver);
} catch (ClassNotFoundException e) {
Log.crash(e);
}
try {
return DriverManager.getConnection(url, username, password);
} catch (SQLException e) {
SQLCode.sqlTranslate("Generate connection", e);
throw new SQLException(e);
}
Class.forName(driver);
return DriverManager.getConnection(url, username, password);
}
private static void checkUpdateCounts(PreparedStatement pstmt, int[] updateCounts) {

11
src/pkg/deepCurse/nopalmo/database/SQLCode.java
View file

@ -4,23 +4,22 @@ import java.sql.PreparedStatement;
import java.sql.SQLException;
public class SQLCode {
public static String getMessage(String action, int errorCode) {
switch (errorCode) {
case 1062:
System.err.println("Failed to execute; errorCode=" + errorCode + "; ER_DUP_ENTRY; On action " + action);
return "";
case 1054:
System.err.println("Failed to execute; errorCode=" + errorCode + "; ER_BAD_FIELD_ERROR; On action " + action);
System.err
.println("Failed to execute; errorCode=" + errorCode + "; ER_BAD_FIELD_ERROR; On action " + action);
return "";
default:
System.err.println("Failed to execute; errorCode=" + errorCode + "; Unknown code; On action " + action);
return "";
}
}
@Deprecated
public static void sqlTranslate(String action, SQLException e) {
SQLCode.getMessage(action, e.getErrorCode());
@ -29,5 +28,5 @@ public class SQLCode {
public static void sqlTranslate(PreparedStatement pstmt, SQLException e) {
SQLCode.getMessage(pstmt.toString(), e.getErrorCode());
}
}

16
src/pkg/deepCurse/nopalmo/global/Reactions.java
View file

@ -3,23 +3,23 @@ package pkg.deepCurse.nopalmo.global;
import java.util.HashMap;
public class Reactions {
private static HashMap<String, Long> reactionMap = new HashMap<String, Long>();
public static void init() {
insert("galaxyThumb", 801657838358495232L);
}
public static void insert(String input, long id) {
reactionMap.put(input, id);
}
public static String getReaction(String id) {
return ":"+id+":"+reactionMap.get(id);
return ":" + id + ":" + reactionMap.get(id);
}
public static String getEmote(String id) {
return "<:"+id+":"+reactionMap.get(id)+">";
return "<:" + id + ":" + reactionMap.get(id) + ">";
}
}

6
src/pkg/deepCurse/nopalmo/global/Tools.java
View file

@ -1,6 +1,8 @@
package pkg.deepCurse.nopalmo.global;
import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.entities.TextChannel;
import pkg.deepCurse.nopalmo.command.DirectCommand;
import pkg.deepCurse.nopalmo.command.GuildCommand;
public class Tools {
@ -9,4 +11,8 @@ public class Tools {
tc.sendMessage("Wrong Command Usage!\n" + c.getUsage()).queue();
}
public static void wrongUsage(MessageChannel tc, DirectCommand c) {
tc.sendMessage("Wrong Command Usage!\n" + c.getUsage()).queue();
}
}

64
src/pkg/deepCurse/nopalmo/listener/DirectMessageReceivedListener.java Normal file
View file

@ -0,0 +1,64 @@
package pkg.deepCurse.nopalmo.listener;
import javax.annotation.Nonnull;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.events.ReadyEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import pkg.deepCurse.nopalmo.core.Boot;
import pkg.deepCurse.nopalmo.database.DatabaseTools;
import pkg.deepCurse.nopalmo.database.DatabaseTools.Tools.Global;
public class DirectMessageReceivedListener extends ListenerAdapter {
@Override
public void onReady(@Nonnull ReadyEvent event) {
System.out.println("DirectMessageReceivedListener is now ready. . .");
}
@Override
public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
Message message = event.getMessage();
String messageRaw = message.getContentRaw();
System.out.println(messageRaw + "\n<@!" + event.getJDA().getSelfUser().getIdLong() + ">");
if (messageRaw.contentEquals(Global.prefix + Global.prefix)
&& DatabaseTools.Tools.Developers.canPowerOffBot(event.getAuthor().getIdLong())) {
// message.addReaction(Reactions.getReaction("galaxyThumb")).complete(); TODO re
// enable
// message.delete().complete();
// pause thread as last resort
event.getJDA().shutdown();
System.exit(0);
}
String[] prefixArray = new String[] { Global.prefix, "<@! " + event.getJDA().getSelfUser().getIdLong() + ">" };
// FIXME BROKEN PING PREFIX
boolean shouldReturn = true;
for (String i : prefixArray) { // TODO switch to [] to skip for loop?
if (messageRaw.startsWith(i)) {
// System.out.println("breaking");
shouldReturn = false;
}
}
// TODO add pre manager commands
if (shouldReturn) {
return;
}
if (!event.getAuthor().isBot() && !event.isFromGuild()) {
Boot.directCommandManager.startCommand(event);
}
}
}

11
src/pkg/deepCurse/nopalmo/listener/GuildMessageReceivedListener.java
View file

@ -27,8 +27,9 @@ public class GuildMessageReceivedListener extends ListenerAdapter {
if (messageRaw.contentEquals(Global.prefix + Global.prefix)
&& DatabaseTools.Tools.Developers.canPowerOffBot(event.getAuthor().getIdLong())) {
// message.addReaction(Reactions.getReaction("galaxyThumb")).complete(); TODO re enable
// message.addReaction(Reactions.getReaction("galaxyThumb")).complete(); TODO re
// enable
message.delete().complete();
// pause thread as last resort
@ -38,14 +39,14 @@ public class GuildMessageReceivedListener extends ListenerAdapter {
}
String[] prefixArray = new String[] { DatabaseTools.Tools.Guild.Prefix.getPrefix(event.getGuild().getIdLong()),
"<@!" + event.getJDA().getSelfUser().getIdLong() + ">" };
"<@!" + event.getJDA().getSelfUser().getIdLong() + ">" }; // FIXME BROKEN PING PREFIX
boolean shouldReturn = true;
for (String i : prefixArray) { // switch to [] to skip for loop?
for (String i : prefixArray) { // TODO switch to [] to skip for loop?
if (messageRaw.startsWith(i)) {
shouldReturn = false;
break;
}
}

19
src/pkg/deepCurse/nopalmo/manager/Argument.java
View file

@ -1,20 +1,22 @@
package pkg.deepCurse.nopalmo.manager;
public class Argument {
// README
//
// This tool is used simply for now, but it will be worth while if you get used to it
// This tool is used simply for now, but it will be worth while if you get used
// to it
//
// this allows extra organization and ease of use throughout the creation of commands
// this allows extra organization and ease of use throughout the creation of
// commands
// instead of one simple list where if args[1] == "all" do code
// this allows the same functionality, if not more with a little bit of learning
// you can go back to what it was before, but i honestly believe this system is worthwhile
// you can go back to what it was before, but i honestly believe this system is
// worthwhile
// it just needs polish and reports on usage for optimization
//
//// TL;DR ITS A NEW FEATURE, GIVE IT TIME
private int requiredArgs = 0;
private String argName = null;
private Argument[] subArgs = null;
@ -102,16 +104,15 @@ public class Argument {
// this.subArgs = subArgs;
// return this;
// }
public Argument setPrefixRequirement(Boolean bool) {
this.requiresPrefix = bool;
return this;
}
public boolean getPrefixRequirement() {
return this.requiresPrefix;
}
public interface RunnableArg {

32
src/pkg/deepCurse/nopalmo/manager/ArgumentList.java
View file

@ -1,32 +0,0 @@
package pkg.deepCurse.nopalmo.manager;
public class ArgumentList { // ON HOLD FOR NOW, IT MAY BE USELESS
//
// private HashMap<String, Argument> args = new HashMap<String, Argument>();
// private Command command = null;
//
// public ArgumentList(Command command) {
// this.command = command;
// }
//
// public void addArgument(String name) {
//
//
//
// args.put(null, null);
// }
//
// @Nullable
// public ArrayList<Argument> getArguments() {
// return (ArrayList<Argument>) args.values();
// }
//
// public Argument getArgumentFromName(String argumentName) {
// return args.get(argumentName);
// }
//
// @Nullable
// public List<String> getArgumentNames() {
// return (@Nullable List<String>) args.keySet();
// }
}

60
src/pkg/deepCurse/nopalmo/manager/CommandBlob.java
View file

@ -1,60 +0,0 @@
package pkg.deepCurse.nopalmo.manager;
import java.util.ArrayList;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.events.Event;
public abstract class CommandBlob {
private String modifiedRaw = null;
private String modified = null;
private ArrayList<String> args = null;
protected long userID = 0;
Event event = null;
@Deprecated
public CommandBlob(Event event) {
this.event = event;
}
public Event getEvent() {
return event;
}
public String getModifiedMessageContents() {
return this.modified;
}
public String getModifiedRawMessageContents() {
return this.modifiedRaw;
}
@Deprecated
public ArrayList<String> getArgs() {
return args;
}
public CommandBlob setUser(long userID) {
this.userID = userID;
return this;
}
public long getUserID() {
return this.userID;
}
public CommandBlob setJDA(JDA bot) {
return this;
}
public CommandBlob setArgs(ArrayList<String> newArguments) {
this.args = newArguments;
return this;
}
}

63
src/pkg/deepCurse/nopalmo/manager/DirectCommandBlob.java Normal file
View file

@ -0,0 +1,63 @@
package pkg.deepCurse.nopalmo.manager;
import java.util.ArrayList;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
public class DirectCommandBlob {
private DirectCommandManager commandManager = null;
private ArrayList<String> args = null;
private long userID = 0;
private long channelID = 0;
private MessageReceivedEvent event = null;
public DirectCommandBlob(MessageReceivedEvent event) {
setUserID(event.getAuthor().getIdLong());
setChannelID(event.getChannel().getIdLong());this.event = event;
}
public ArrayList<String> getArgs() {
return args;
}
public DirectCommandBlob setArgs(ArrayList<String> newArguments) {
this.args = newArguments;
return this;
}
public DirectCommandBlob setUserID(long userID) {
this.userID = userID;
return this;
}
public long getUserID() {
return this.userID;
}
public DirectCommandManager getCommandManager() {
return commandManager;
}
public void setCommandManager(DirectCommandManager commandManager) {
this.commandManager = commandManager;
}
public long getChannelID() {
return channelID;
}
public void setChannelID(long channelID) {
this.channelID = channelID;
}
public MessageReceivedEvent getEvent() {
return event;
}
public void setEvent(MessageReceivedEvent event) {
this.event = event;
}
}

181
src/pkg/deepCurse/nopalmo/manager/DirectCommandManager.java Normal file
View file

@ -0,0 +1,181 @@
package pkg.deepCurse.nopalmo.manager;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.regex.Pattern;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import pkg.deepCurse.nopalmo.command.DirectCommand;
import pkg.deepCurse.nopalmo.command.directCommand.info.DirectMessagePing;
import pkg.deepCurse.nopalmo.core.Boot;
import pkg.deepCurse.nopalmo.database.DatabaseTools;
import pkg.deepCurse.nopalmo.global.Tools;
public class DirectCommandManager {
private final Map<String, DirectCommand> directCommandMap = new HashMap<>();
private static Executor executor = null;
public DirectCommandManager() {
init();
executor = Executors.newSingleThreadExecutor();
}
public void init() {
addCommand(new DirectMessagePing());
}
private void addCommand(DirectCommand c) {
if (!directCommandMap.containsKey(c.getCommandName())) {
directCommandMap.put(c.getCommandName(), c);
} else {
directCommandMap.remove(c.getCommandName());
directCommandMap.put(c.getCommandName(), c);
}
}
public Collection<DirectCommand> getDirectCommands() {
return directCommandMap.values();
}
public DirectCommand getCommand(String commandName) {
if (commandName != null) {
return directCommandMap.get(commandName);
}
return null;
}
public void startCommand(MessageReceivedEvent messageReceivedEvent) {
final String message = messageReceivedEvent.getMessage().getContentRaw();
final String[] split = message.replaceFirst("(?i)" + Pattern.quote(DatabaseTools.Tools.Global.prefix), "")
.split("\\s+");
final String command = split[0].toLowerCase();
if (directCommandMap.containsKey(command)) {
final List<String> args = Arrays.asList(split).subList(1, split.length);
executor.execute(() -> {
long commandStartTime = System.currentTimeMillis();
try {
// ArrayList<String> newArguments = new ArrayList<String>();
// ArrayList<String> commandFlags = new ArrayList<String>();
DirectCommandBlob commandBlob = new DirectCommandBlob(messageReceivedEvent);
DirectCommand directCommand = directCommandMap.get(command);
HashMap<String, Argument> argumentList = new HashMap<String, Argument>();
boolean printTime = false;
byte argSkipCount = 0;
boolean remainsValid = true;
for (String x : args) {
x = x.toLowerCase();
switch (x) {
case "\\time":
printTime = true;
break;
case "\\perm":
// commandFlags.add("user:380045419381784576");
commandBlob.setUserID(380045419381784576L);
break;
case "\\del":
messageReceivedEvent.getMessage().delete().queue();
break;
default: // in the rewrite process
if (argSkipCount <= 0) {
if (directCommand.getArguments() != null) {
if (x.startsWith(Argument.argumentPrefix)) {
String pre = x.substring(Argument.argumentPrefix.length());
if (directCommand.getArguments().keySet().contains(pre)) {
argumentList.put(pre, directCommand.getArguments().get(pre));
} else {
Tools.wrongUsage(messageReceivedEvent.getChannel(), directCommand);
remainsValid = false;
}
} else {
if (directCommand.getArguments().get(x).getPrefixRequirement()) {
Tools.wrongUsage(messageReceivedEvent.getChannel(), directCommand);
remainsValid = false;
} else {
argumentList.put(x, directCommand.getArguments().get(x));
}
}
}
//
// if (guildCommand.getArguments() != null) {
//
// String newArg = x;
//
// if (!newArg.startsWith(Argument.argumentPrefix)) {
// if (guildCommand.getArguments().get(newArg)!=null) {
//
// }
// }
//
// if (guildCommand.getArguments().containsKey(newArg)) {
//
// argumentList.put(guildCommand.getArguments().get(newArg).getArgName(),
// guildCommand.getArguments().get(newArg));
// } else
//
// argumentList.put(newArg, new Argument(newArg));
// }
}
}
}
commandBlob.setCommandManager(this);
if (remainsValid) {
directCommand.runCommand(commandBlob, argumentList);
}
if (printTime) {
messageReceivedEvent.getChannel()
.sendMessage("Time to run: " + (System.currentTimeMillis() - commandStartTime) + "ms")
.queue();
}
} catch (Exception e) {
if (Boot.isProd) {
messageReceivedEvent.getChannel().sendMessage("```properties\n" + e + "```").queue();
} else {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
e.printStackTrace(pw);
messageReceivedEvent.getChannel().sendMessage("```properties\n" + sw.toString() + "```").queue();
System.err.println("Exception caught in: " + e.toString());
e.printStackTrace();
}
} catch (Throwable t) {
if (Boot.isProd) {
messageReceivedEvent.getChannel().sendMessage("```mathematica\n" + t + "```").queue();
} else {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
t.printStackTrace(pw);
messageReceivedEvent.getChannel().sendMessage("```mathematica\n" + sw.toString() + "```").queue();
System.err.println("Error caught in: " + t.toString());
t.printStackTrace();
}
}
});
}
}
}

59
src/pkg/deepCurse/nopalmo/manager/GuildCommandBlob.java
View file

@ -1,18 +1,61 @@
package pkg.deepCurse.nopalmo.manager;
import java.util.ArrayList;
import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
public class GuildCommandBlob extends CommandBlob {
public class GuildCommandBlob {
String[][] argumentArray = null;
private GuildCommandManager commandManager = null;
private ArrayList<String> args = null;
private long userID = 0;
private long channelID = 0;
private GuildMessageReceivedEvent event = null;
public GuildCommandBlob(GuildMessageReceivedEvent event) {
super(event);
setUser(event.getMessage().getAuthor().getIdLong());
this.event = event;
setUserID(event.getAuthor().getIdLong());
setChannelID(event.getChannel().getIdLong());
}
public GuildMessageReceivedEvent getGuildMessageEvent() {
return (GuildMessageReceivedEvent) this.event;
public ArrayList<String> getArgs() {
return args;
}
public GuildCommandBlob setArgs(ArrayList<String> newArguments) {
this.args = newArguments;
return this;
}
public GuildCommandBlob setUserID(long userID) {
this.userID = userID;
return this;
}
public long getUserID() {
return this.userID;
}
public GuildCommandManager getCommandManager() {
return commandManager;
}
public void setCommandManager(GuildCommandManager commandManager) {
this.commandManager = commandManager;
}
public long getChannelID() {
return channelID;
}
public void setChannelID(long channelID) {
this.channelID = channelID;
}
public GuildMessageReceivedEvent getEvent() {
return event;
}
}

31
src/pkg/deepCurse/nopalmo/manager/GuildCommandManager.java
View file

@ -13,6 +13,7 @@ import java.util.regex.Pattern;
import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
import pkg.deepCurse.nopalmo.command.GuildCommand;
import pkg.deepCurse.nopalmo.command.guildCommand.info.Git;
import pkg.deepCurse.nopalmo.command.guildCommand.info.Help;
import pkg.deepCurse.nopalmo.command.guildCommand.info.Ping;
import pkg.deepCurse.nopalmo.core.Boot;
@ -30,8 +31,9 @@ public class GuildCommandManager {
}
public void init() {
// addCommand(new Help(this)); FIXME
addCommand(new Help(this));
addCommand(new Ping());
addCommand(new Git());
}
private void addCommand(GuildCommand c) {
@ -81,13 +83,14 @@ public class GuildCommandManager {
boolean remainsValid = true;
for (String x : args) {
x = x.toLowerCase();
switch (x) {
case "\\time":
printTime = true;
break;
case "\\perm":
// commandFlags.add("user:380045419381784576");
commandBlob.setUser(380045419381784576L);
commandBlob.setUserID(380045419381784576L);
break;
case "\\del":
guildMessage.getMessage().delete().queue();
@ -99,9 +102,13 @@ public class GuildCommandManager {
if (x.startsWith(Argument.argumentPrefix)) {
String pre = x.substring(Argument.argumentPrefix.length());
argumentList.put(pre, guildCommand.getArguments().get(pre));
if (guildCommand.getArguments().keySet().contains(pre)) {
argumentList.put(pre, guildCommand.getArguments().get(pre));
} else {
Tools.wrongUsage(guildMessage.getChannel(), guildCommand);
remainsValid = false;
}
} else {
if (guildCommand.getArguments().get(x).getPrefixRequirement()) {
Tools.wrongUsage(guildMessage.getChannel(), guildCommand);
@ -133,9 +140,11 @@ public class GuildCommandManager {
}
}
}
commandBlob.setCommandManager(this);
if (remainsValid) {
guildCommand.runCommand(commandBlob, this, argumentList);
guildCommand.runCommand(commandBlob, argumentList);
}
if (printTime) {
@ -146,24 +155,24 @@ public class GuildCommandManager {
} catch (Exception e) {
if (Boot.isProd) {
guildMessage.getChannel().sendMessage("```yaml\n" + e + "```").queue();
guildMessage.getChannel().sendMessage("```properties\n" + e + "```").queue();
} else {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
e.printStackTrace(pw);
guildMessage.getChannel().sendMessage("```yaml\n" + sw.toString() + "```").queue();
guildMessage.getChannel().sendMessage("```properties\n" + sw.toString() + "```").queue();
System.err.println("Exception caught in: " + e.toString());
e.printStackTrace();
}
} catch (Throwable t) {
if (Boot.isProd) {
guildMessage.getChannel().sendMessage("```apache\n" + t + "```").queue();
guildMessage.getChannel().sendMessage("```mathematica\n" + t + "```").queue();
} else {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
t.printStackTrace(pw);
guildMessage.getChannel().sendMessage("```apache\n" + sw.toString() + "```").queue();
guildMessage.getChannel().sendMessage("```mathematica\n" + sw.toString() + "```").queue();
System.err.println("Error caught in: " + t.toString());
t.printStackTrace();
}

8
src/pkg/deepCurse/simpleLoggingGarbage/core/Log.java → src/pkg/deepCurse/nopalmo/utils/LogHelper.java
View file

@ -1,4 +1,4 @@
package pkg.deepCurse.simpleLoggingGarbage.core;
package pkg.deepCurse.nopalmo.utils;
import pkg.deepCurse.nopalmo.core.Boot;
@ -9,7 +9,7 @@ import pkg.deepCurse.nopalmo.core.Boot;
*
* @author deepCurse
*/
public class Log {
public class LogHelper {
public static int loggerLevel = 0;
@ -27,12 +27,14 @@ public class Log {
}
public static void crash(Exception e) {
e.printStackTrace();
System.exit(69420);
}
public static void guildCommandManager(String text) {
guildCommandManager(text);
}
public static void guildCommandManager(String text, int level) {
if (guildCommandManagerEnabled && level <= loggerLevel) {
System.out.println(Boot.class + ": " + text);

38
src/pkg/deepCurse/nopalmo/utils/UptimePing.java Normal file
View file

@ -0,0 +1,38 @@
package pkg.deepCurse.nopalmo.utils;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.nio.channels.SocketChannel;
import java.util.Date;
public class UptimePing {
public static long sendPing(String IP) throws Exception {
int port = 80;
long timeToRespond = 0;
InetAddress inetAddress = InetAddress.getByName(IP);
InetSocketAddress socketAddress = new InetSocketAddress(inetAddress, port);
SocketChannel sc = SocketChannel.open();
sc.configureBlocking(true);
Date start = new Date();
if (sc.connect(socketAddress)) {
Date stop = new Date();
timeToRespond = (stop.getTime() - start.getTime());
}
// System.out.println("fix me"); // not sure why this is here
if (socketAddress.getAddress() == null) {
return -1;
} else {
return timeToRespond;
}
}
}

51
src/services/UptimePing.java
View file

@ -1,51 +0,0 @@
package services;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.nio.channels.SocketChannel;
import java.util.Date;
public class UptimePing {
public static long sendPing(String IP) throws UnknownHostException, IOException {
/*
* StopWatch stopWatch = new StopWatch(); stopWatch.start(); InetAddress sender
* = InetAddress.getByName(IP); System.out.println("Pinging: " + IP);
* stopWatch.stop(); long timeP = stopWatch.getTime(TimeUnit.MICROSECONDS);
* System.out.println(timeP); if
* (sender.isReachable(5000)){//.isReachable(5000)) {
* System.out.println("Successfully pinged: " + IP); return timeP; } else {
* System.out.println("Failed to ping: " + IP); return -1; }
*/
try {
int port = 80;
long timeToRespond = 0;
InetAddress inetAddress = InetAddress.getByName(IP);
InetSocketAddress socketAddress = new InetSocketAddress(inetAddress, port);
SocketChannel sc = SocketChannel.open();
sc.configureBlocking(true);
Date start = new Date();
if (sc.connect(socketAddress)) {
Date stop = new Date();
timeToRespond = (stop.getTime() - start.getTime());
}
// System.out.println("fix me"); // not sure why this is here
if (socketAddress.getAddress() == null) {
return -1;
} else {
return timeToRespond;
}
} catch (IOException ex) {
System.out.println(ex.getMessage());
return -1;
}
}
}