diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7bec898 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +# Project exclude paths +/.gradle/ \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..ba1ec5c --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..b3e9cbd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..38167d7 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules/dkim19375JDAUtils.iml b/.idea/modules/dkim19375JDAUtils.iml new file mode 100644 index 0000000..93d9caf --- /dev/null +++ b/.idea/modules/dkim19375JDAUtils.iml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..8258050 --- /dev/null +++ b/build.gradle @@ -0,0 +1,19 @@ +plugins { + id 'java' +} + +//noinspection GroovyUnusedAssignment +sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 +compileJava.options.encoding 'UTF-8' + +group 'me.dkim19375' +version '1.0.0' + +repositories { + mavenCentral() + jcenter() +} + +dependencies { + compileOnly 'net.dv8tion:JDA:4.2.0_227' +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..be52383 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..3b2136a --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'dkim19375JDAUtils' + diff --git a/src/main/java/me/dkim19375/dkim19375jdautils/embeds/EmbedManager.java b/src/main/java/me/dkim19375/dkim19375jdautils/embeds/EmbedManager.java new file mode 100644 index 0000000..c13cb74 --- /dev/null +++ b/src/main/java/me/dkim19375/dkim19375jdautils/embeds/EmbedManager.java @@ -0,0 +1,106 @@ +package me.dkim19375.dkim19375jdautils.embeds; + +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.entities.MessageEmbed; +import net.dv8tion.jda.api.entities.User; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.awt.*; +import java.time.Instant; +import java.time.temporal.TemporalAccessor; + +public class EmbedManager { + private final EmbedBuilder embedBuilder = new EmbedBuilder(); + + public EmbedManager(final @Nullable String heading, final @Nullable String headingIcon, final @Nullable Color color, + final @Nullable String cmd, + final @Nullable String title, final @Nullable String titleURL, + final @Nullable CharSequence description, final @Nullable String footerIconURL, final @Nullable String image, + final @Nullable String thumbnail) { + embedBuilder.setAuthor(heading, null, headingIcon); + embedBuilder.setTimestamp(Instant.now()); + embedBuilder.setColor(color); + embedBuilder.setFooter(cmd, footerIconURL); + embedBuilder.setDescription(description); + embedBuilder.setImage(image); + embedBuilder.setThumbnail(thumbnail); + embedBuilder.setTitle(title, titleURL); + } + + public EmbedManager(final @Nullable String heading, final @Nullable String headingIcon, final @Nullable Color color, final @Nullable String cmd, + final @Nullable String title) { + embedBuilder.setAuthor(heading, null, headingIcon); + embedBuilder.setTimestamp(Instant.now()); + embedBuilder.setColor(color); + embedBuilder.setFooter(cmd); + embedBuilder.setTitle(title); + } + + @NotNull + public EmbedBuilder getEmbedBuilder() { + return embedBuilder; + } + + public void setUser(final @NotNull User user) { + embedBuilder.setAuthor(user.getName() + "#" + user.getDiscriminator()); + } + + public void setTimeStamp(TemporalAccessor temporalAccessor) { + embedBuilder.setTimestamp(temporalAccessor); + } + + public void setColor(Color color) { + embedBuilder.setColor(color); + } + + public void setFooter(@Nullable String footer) { + embedBuilder.setFooter(footer); + } + + public void setFooter(@Nullable String footer, @Nullable String footerURL) { + embedBuilder.setFooter(footer, footerURL); + } + + public void setDescription(CharSequence description) { + embedBuilder.setDescription(description); + } + + public void setImage(String imageUrl) { + embedBuilder.setImage(imageUrl); + } + + public void setThumbnail(String imageUrl) { + embedBuilder.setThumbnail(imageUrl); + } + + public void setTitle(String title) { + embedBuilder.setTitle(title); + } + + public void setTitle(String title, String titleUrl) { + embedBuilder.setTitle(title, titleUrl); + } + + public void setEmbedBuilder(final @NotNull EmbedBuilder embedBuilder) { + this.embedBuilder.clear(); + final MessageEmbed messageEmbed = embedBuilder.build(); + this.embedBuilder.setDescription(messageEmbed.getDescription()); + this.embedBuilder.setTitle(messageEmbed.getTitle(), messageEmbed.getUrl()); + this.embedBuilder.setTimestamp(messageEmbed.getTimestamp()); + this.embedBuilder.setColor(messageEmbed.getColor()); + if (messageEmbed.getThumbnail() != null) { + this.embedBuilder.setThumbnail(messageEmbed.getThumbnail().getUrl()); + } + if (messageEmbed.getAuthor() != null) { + this.embedBuilder.setAuthor(messageEmbed.getAuthor().getName(), messageEmbed.getAuthor().getUrl(), messageEmbed.getAuthor().getIconUrl()); + } + if (messageEmbed.getFooter() != null) { + this.embedBuilder.setFooter(messageEmbed.getFooter().getText(), messageEmbed.getFooter().getIconUrl()); + } + if (messageEmbed.getImage() != null) { + this.embedBuilder.setImage(messageEmbed.getImage().getUrl()); + } + this.embedBuilder.getFields().addAll(messageEmbed.getFields()); } + +} \ No newline at end of file diff --git a/src/main/java/me/dkim19375/dkim19375jdautils/embeds/EmbedUtils.java b/src/main/java/me/dkim19375/dkim19375jdautils/embeds/EmbedUtils.java new file mode 100644 index 0000000..b86eccb --- /dev/null +++ b/src/main/java/me/dkim19375/dkim19375jdautils/embeds/EmbedUtils.java @@ -0,0 +1,37 @@ +package me.dkim19375.dkim19375jdautils.embeds; + +import net.dv8tion.jda.api.entities.MessageEmbed; + +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class EmbedUtils { + public static Set getEmbedGroups(Map> set) { + Set fields = new HashSet<>(); + for (Map.Entry> group : set.entrySet()) { + final String name = group.getKey(); + String value = "```\n"; + for (String string : group.getValue()) { + value = combineStrings(value, string + "\n"); + } + value = combineStrings(value, "```"); + fields.add(new MessageEmbed.Field(name, value, true)); + } + return fields; + } + + private static String combineStrings(String first, String second) { + return first + second; + } + + public static MessageEmbed.Field getEmbedGroup(Map.Entry> group) { + final String name = group.getKey(); + String value = "```\n"; + for (String string : group.getValue()) { + value = combineStrings(value, string + "\n"); + } + value = combineStrings(value, "```"); + return new MessageEmbed.Field(name, value, true); + } +} \ No newline at end of file diff --git a/src/main/java/me/dkim19375/dkim19375jdautils/files/FileGetterUtils.java b/src/main/java/me/dkim19375/dkim19375jdautils/files/FileGetterUtils.java new file mode 100644 index 0000000..2b31386 --- /dev/null +++ b/src/main/java/me/dkim19375/dkim19375jdautils/files/FileGetterUtils.java @@ -0,0 +1,33 @@ +package me.dkim19375.dkim19375jdautils.files; + +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Properties; + +public class FileGetterUtils { + public static String getPrefix(Properties properties) { + properties.putIfAbsent("prefix", "?"); + try (OutputStream output = new FileOutputStream("options.properties")) { + properties.store(output, null); + } catch (IOException e) { + e.printStackTrace(); + } + return properties.getProperty("prefix", "?"); + } + + public static String getPrefix(PropertiesFile properties) { + properties.getProperties().putIfAbsent("prefix", "?"); + properties.saveFile(); + return properties.getProperties().getProperty("prefix", "?"); + } + + public static void setPrefix(PropertiesFile properties, String prefix) { + properties.getProperties().put("prefix", prefix); + properties.saveFile(); + } + + public static String getToken(PropertiesFile properties) { + return properties.getProperties().getProperty("token", "TOKEN"); + } +} \ No newline at end of file diff --git a/src/main/java/me/dkim19375/dkim19375jdautils/files/PropertiesFile.java b/src/main/java/me/dkim19375/dkim19375jdautils/files/PropertiesFile.java new file mode 100644 index 0000000..25f8a6d --- /dev/null +++ b/src/main/java/me/dkim19375/dkim19375jdautils/files/PropertiesFile.java @@ -0,0 +1,108 @@ +package me.dkim19375.dkim19375jdautils.files; + +import java.io.*; +import java.util.Properties; + +public class PropertiesFile { + private final String fileName; + private Properties properties; + + public PropertiesFile(String fileName) { + this.fileName = fileName; + } + + public boolean createFile(boolean load) { + try (InputStream input = PropertiesFile.class.getClassLoader().getResourceAsStream(fileName)) { + properties = new Properties(); + if (input == null) { + try (InputStream inputStream = new FileInputStream(fileName)) { + if (load) { + properties.load(inputStream); + } + return true; + } catch (IOException e) { + e.printStackTrace(); + return false; + } + } + if (load) { + properties.load(input); + } + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + public boolean createFile() { + return createFile(false); + } + + public boolean loadFile(InputStream stream) { + try { + properties.load(stream); + } catch (IOException exception) { + exception.printStackTrace(); + return false; + } + return true; + } + + public boolean loadFile() { + if (properties == null) { + return false; + } + try (InputStream inputStream = new FileInputStream(fileName)) { + properties.load(inputStream); + } catch (FileNotFoundException e) { + createFile(true); + try { + properties.load(new FileInputStream(fileName)); + } catch (IOException exception) { + exception.printStackTrace(); + return false; + } + return true; + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + public Properties getProperties() { + return properties; + } + + public boolean saveFile() { + try (OutputStream output = new FileOutputStream(fileName)) { + properties.store(output, null); + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + public boolean saveFile(boolean create) { + try (OutputStream output = new FileOutputStream(fileName)) { + properties.store(output, null); + } catch (FileNotFoundException e) { + if (createFile(true) && create) { + try (OutputStream output = new FileOutputStream(fileName)) { + properties.store(output, null); + } catch (IOException ex) { + ex.printStackTrace(); + return false; + } + return true; + } + return false; + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } +} \ No newline at end of file diff --git a/src/main/java/me/dkim19375/dkim19375jdautils/handlers/CommandHandler.java b/src/main/java/me/dkim19375/dkim19375jdautils/handlers/CommandHandler.java new file mode 100644 index 0000000..064d4cd --- /dev/null +++ b/src/main/java/me/dkim19375/dkim19375jdautils/handlers/CommandHandler.java @@ -0,0 +1,94 @@ +package me.dkim19375.dkim19375jdautils.handlers; + +import me.dkim19375.dkim19375jdautils.files.FileGetterUtils; +import me.dkim19375.dkim19375jdautils.files.PropertiesFile; +import me.dkim19375.dkim19375jdautils.holders.MessageRecievedHolder; +import net.dv8tion.jda.api.JDA; +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent; +import net.dv8tion.jda.api.events.message.priv.PrivateMessageReceivedEvent; +import net.dv8tion.jda.api.hooks.ListenerAdapter; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; + +public class CommandHandler extends ListenerAdapter { + private final JDA jda; + private final PropertiesFile propertiesFile; + + public CommandHandler(JDA jda, PropertiesFile propertiesFile) { + this.jda = jda; + this.propertiesFile = propertiesFile; + } + + @Nullable + public MessageRecievedHolder getMessage(@NotNull String message) { + final String prefix; + if (message.startsWith(jda.getSelfUser().getAsMention().replaceFirst("@", "@!"))) { + prefix = jda.getSelfUser().getAsMention().replaceFirst("@", "@!"); + } else { + prefix = FileGetterUtils.getPrefix(propertiesFile); + } + if (prefix == null) { + return null; + } + if (message.length() <= prefix.length()) { + return null; + } + String command = message; + command = command.substring(prefix.length()); + command = command.trim(); + final String[] allArray = command.split(" "); + command = command.split(" ")[0]; + List argsList = new ArrayList<>(); + boolean first = true; + for (String s : allArray) { + if (!first) { + argsList.add(s); + } + first = false; + } + String[] args = argsList.toArray(new String[0]); + return new MessageRecievedHolder(command, args, prefix, message); + } + + @Override + public void onMessageReceived(@NotNull MessageReceivedEvent event) { + MessageRecievedHolder msg = getMessage(event.getMessage().getContentRaw()); + if (msg != null) { + onMessageReceived(msg.getCommand(), msg.getArgs(), msg.getPrefix(), msg.getAll(), event); + } + } + + @Override + public void onGuildMessageReceived(@NotNull GuildMessageReceivedEvent event) { + MessageRecievedHolder msg = getMessage(event.getMessage().getContentRaw()); + if (msg != null) { + onGuildMessageReceived(msg.getCommand(), msg.getArgs(), msg.getPrefix(), msg.getAll(), event); + } + } + + @Override + public void onPrivateMessageReceived(@NotNull PrivateMessageReceivedEvent event) { + MessageRecievedHolder msg = getMessage(event.getMessage().getContentRaw()); + if (msg != null) { + onPrivateMessageReceived(msg.getCommand(), msg.getArgs(), msg.getPrefix(), msg.getAll(), event); + } + } + + public void onMessageReceived(String cmd, String[] args, String prefix, String all, MessageReceivedEvent event) { } + + public void onGuildMessageReceived(String cmd, String[] args, String prefix, String all, GuildMessageReceivedEvent event) { } + + public void onPrivateMessageReceived(String cmd, String[] args, String prefix, String all, PrivateMessageReceivedEvent event) { } + + public PropertiesFile getPropertiesFile() { + return propertiesFile; + } + + public JDA getJDA() { + return jda; + } +} \ No newline at end of file diff --git a/src/main/java/me/dkim19375/dkim19375jdautils/holders/MessageRecievedHolder.java b/src/main/java/me/dkim19375/dkim19375jdautils/holders/MessageRecievedHolder.java new file mode 100644 index 0000000..2c140f7 --- /dev/null +++ b/src/main/java/me/dkim19375/dkim19375jdautils/holders/MessageRecievedHolder.java @@ -0,0 +1,48 @@ +package me.dkim19375.dkim19375jdautils.holders; + +public class MessageRecievedHolder { + // (String command, String[] args, String prefix, String all) + private String command; + private String[] args; + private String prefix; + private String all; + + public MessageRecievedHolder(String command, String[] args, String prefix, String all) { + this.command = command; + this.args = args; + this.prefix = prefix; + this.all = all; + } + + public String getCommand() { + return command; + } + + public void setCommand(String command) { + this.command = command; + } + + public String[] getArgs() { + return args; + } + + public void setArgs(String[] args) { + this.args = args; + } + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + public String getAll() { + return all; + } + + public void setAll(String all) { + this.all = all; + } +} \ No newline at end of file diff --git a/src/main/java/me/dkim19375/dkim19375jdautils/impl/EntryImpl.java b/src/main/java/me/dkim19375/dkim19375jdautils/impl/EntryImpl.java new file mode 100644 index 0000000..a1ba93e --- /dev/null +++ b/src/main/java/me/dkim19375/dkim19375jdautils/impl/EntryImpl.java @@ -0,0 +1,30 @@ +package me.dkim19375.dkim19375jdautils.impl; + +import java.util.Map; + +public class EntryImpl implements Map.Entry { + private final K key; + private V value; + + public EntryImpl(K key, V value) { + this.key = key; + this.value = value; + } + + @Override + public K getKey() { + return key; + } + + @Override + public V getValue() { + return value; + } + + @Override + public V setValue(V value) { + V oldValue = this.value; + this.value = value; + return oldValue; + } +} \ No newline at end of file