From 98d2f5d411936352bed081397826bcb7476f3bf7 Mon Sep 17 00:00:00 2001 From: anthorob Date: Wed, 27 Oct 2021 12:16:34 -0400 Subject: [PATCH] scuffed push --- .mvn/wrapper/MavenWrapperDownloader.java | 117 +++++++ .mvn/wrapper/maven-wrapper.properties | 2 + Dockerfile | 12 + bot.config.example | 20 +- docker-compose.yml | 38 +++ mvnw | 310 ++++++++++++++++++ mvnw.cmd | 182 ++++++++++ pom.xml | 19 +- netneutrality.sql => sql/netneutrality.sql | 1 + src/main/java/netneutrality/GuildManager.java | 65 ++++ src/main/java/netneutrality/MusicBot.java | 23 +- .../java/netneutrality/ThreadManager.java | 8 +- .../command/PermissionManager.java | 3 - .../command/bot/ConfigureCommand.java | 60 ++++ .../java/netneutrality/db/DBController.java | 2 +- .../java/netneutrality/db/MysqlDatabase.java | 19 +- .../netneutrality/db/entities/OGuild.java | 19 +- .../handler/MessageRateLimit.java | 44 --- .../handler/NewCommandListener.java | 24 +- .../handler/ServerJoinHandler.java | 3 +- .../ratelimiter/IMessageRateLimiter.java | 16 + .../ratelimiter/MessageRateLimiterImpl.java | 51 +++ .../http/server/ActionHandler.java | 2 +- .../netneutrality/music/TrackScheduler.java | 5 +- .../netneutrality/utils/MessageFunction.java | 2 +- .../java/netneutrality/utils/Settings.java | 27 +- src/main/resources/log4j2.xml | 6 +- 27 files changed, 971 insertions(+), 109 deletions(-) create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 Dockerfile create mode 100644 docker-compose.yml create mode 100644 mvnw create mode 100644 mvnw.cmd rename netneutrality.sql => sql/netneutrality.sql (99%) create mode 100644 src/main/java/netneutrality/GuildManager.java create mode 100644 src/main/java/netneutrality/command/bot/ConfigureCommand.java delete mode 100644 src/main/java/netneutrality/handler/MessageRateLimit.java create mode 100644 src/main/java/netneutrality/handler/ratelimiter/IMessageRateLimiter.java create mode 100644 src/main/java/netneutrality/handler/ratelimiter/MessageRateLimiterImpl.java diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..b901097 --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present 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 + * + * http://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. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..642d572 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..77ba04c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM openjdk:11-jdk-slim + +WORKDIR /app + +COPY .mvn/ .mvn +COPY mvnw pom.xml ./ +COPY src ./src +COPY bot.config.example bot.config ./ + +RUN ./mvnw -q -Dmaven.test.skip=true package + +CMD ["java", "-jar", "target/netneutrality-jar-with-dependencies.jar"] \ No newline at end of file diff --git a/bot.config.example b/bot.config.example index 76fa6b1..5495ed4 100644 --- a/bot.config.example +++ b/bot.config.example @@ -1,11 +1,11 @@ -bot.token= -bot.prefix= -bot.owner= -bot.ownerguild= -bot.errorchannel= +BOT_TOKEN= +BOT_PREFIX= +BOT_OWNER= +BOT_OWNERGUILD= +BOT_ERRORCHANNEL= -mysql.host=localhost -mysql.user=root -mysql.password= -mysql.database= -mysql.port=3306 \ No newline at end of file +MYSQL_HOST= +MYSQL_USER= +MYSQL_PASSWORD= +MYSQL_DATABASE= +MYSQL_PORT=3306 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..e1f3842 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,38 @@ +version: '3.3' + +services: + db: + image: mysql:5.7 + restart: always + volumes: + - netneutrality-db:/var/lib/mysql + - ./sql/netneutrality.sql:/docker-entrypoint-initdb.d/dump.sql + environment: + MYSQL_DATABASE: 'netneutrality' + MYSQL_USER: 'java' + MYSQL_PASSWORD: 'password' + MYSQL_ROOT_PASSWORD: 'password' + ports: + - "3306" + networks: + - internal + app: + image: netneutrality:dev + restart: always + depends_on: + - db + environment: + MYSQL_HOST: 'db' + MYSQL_USER: 'java' + MYSQL_PASSWORD: 'password' + MYSQL_DATABASE: 'netneutrality' + ports: + - "9000:9000" + networks: + - internal + +volumes: + netneutrality-db: + +networks: + internal: \ No newline at end of file diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..41c0f0c --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + 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 + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + 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 + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..8611571 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml index 3a94aaf..e7f8810 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,6 @@ 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.5.4 - - com.xtremcommunity.discord netneutrality @@ -17,10 +11,20 @@ 11 + UTF-8 + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 11 + UTF-8 + + org.apache.maven.plugins @@ -47,6 +51,9 @@ true true + + true + jar-with-dependencies diff --git a/netneutrality.sql b/sql/netneutrality.sql similarity index 99% rename from netneutrality.sql rename to sql/netneutrality.sql index 62209aa..69be13f 100644 --- a/netneutrality.sql +++ b/sql/netneutrality.sql @@ -14,6 +14,7 @@ SET time_zone = "+00:00"; -- -- Base de données : `netneutrality` -- +USE netneutrality; -- -------------------------------------------------------- diff --git a/src/main/java/netneutrality/GuildManager.java b/src/main/java/netneutrality/GuildManager.java new file mode 100644 index 0000000..2824f91 --- /dev/null +++ b/src/main/java/netneutrality/GuildManager.java @@ -0,0 +1,65 @@ +package netneutrality; +/* + * Copyright (c) anthorob + * + * https://xtremcommunity.com/ + * https://discord.gg/CdFcyQ + */ + +import net.dv8tion.jda.api.entities.Guild; +import netneutrality.db.entities.OGuild; +import netneutrality.db.entities.OGuildSetting; +import netneutrality.handler.ratelimiter.IMessageRateLimiter; +import netneutrality.handler.ratelimiter.MessageRateLimiterImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class GuildManager { + + public static final Logger logger = LoggerFactory.getLogger(GuildManager.class); + private static final Map managers = new ConcurrentHashMap<>(); + private final Guild guild; + private final OGuild guildEntity; + private final IMessageRateLimiter rateLimiter; + + private GuildManager(Guild guild) { + this.guild = guild; + this.guildEntity = new OGuild(guild.getId()); + + this.rateLimiter = new MessageRateLimiterImpl(); + managers.put(guild.getId(), this); + } + + public static GuildManager getManager(Guild guild) { + if (managers.containsKey(guild.getId())) { + return managers.get(guild.getId()); + } else { + return new GuildManager(guild); + } + } + + public String getSetting(String key) { + return guildEntity.getSettings().getSettingByKey(key); + } + + public void reloadSettings() { + guildEntity.reloadSettings(); + } + + public IMessageRateLimiter getRateLimiter() { + return rateLimiter; + } + + public Guild getGuild() { + return guild; + } + + + + private void load() { + + } +} diff --git a/src/main/java/netneutrality/MusicBot.java b/src/main/java/netneutrality/MusicBot.java index 8c3c02b..b734615 100644 --- a/src/main/java/netneutrality/MusicBot.java +++ b/src/main/java/netneutrality/MusicBot.java @@ -13,6 +13,9 @@ import netneutrality.http.server.WebApi; import netneutrality.music.MusicManager; import netneutrality.utils.Settings; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.config.Configurator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,29 +32,36 @@ public class MusicBot { DBController.init(); try { - jda = JDABuilder.createDefault(Settings.getInstance().get("bot.token")) + jda = JDABuilder.createDefault(Settings.getInstance().get("BOT_TOKEN")) .enableIntents(GatewayIntent.GUILD_MEMBERS, GatewayIntent.GUILD_MESSAGE_REACTIONS, GatewayIntent.GUILD_VOICE_STATES) .build(); jda.awaitReady(); } catch (LoginException | IllegalArgumentException | InterruptedException e) { logger.error(e.getMessage()); - shutdown(); + System.exit(0); } - jda.getPresence().setActivity(Activity.watching("me load...")); jda.addEventListener(new NewCommandListener(), new EditHandler()); new WebApi(); jda.getPresence().setActivity(Activity.watching("you")); + Runtime.getRuntime().addShutdownHook(new Thread(() -> { + if( LogManager.getContext() instanceof LoggerContext) { + logger.debug("Shutting down log4j2"); + Configurator.shutdown((LoggerContext)LogManager.getContext()); + } + + MusicBot.shutdown(); + })); ConsoleHandler consoleInput = new ConsoleHandler(); switch (consoleInput.init()) { case "quit": - shutdown(); + System.exit(0); break; } @@ -59,13 +69,12 @@ public class MusicBot { } public static void shutdown() { - logger.info("[Net Neutrality] Shutting down..."); + System.out.println("[Net Neutrality] Shutting down..."); MusicManager.disconnectPlayers(); ThreadManager.shutdownExecutor(); disconnect(); DBController.shutdown(); - logger.info("[Net Neutrality] Shutdown complete"); - System.exit(0); + System.out.println("[Net Neutrality] Shutdown complete"); } public static JDA getJDA() { diff --git a/src/main/java/netneutrality/ThreadManager.java b/src/main/java/netneutrality/ThreadManager.java index 7fb860a..8225af1 100644 --- a/src/main/java/netneutrality/ThreadManager.java +++ b/src/main/java/netneutrality/ThreadManager.java @@ -65,7 +65,7 @@ public class ThreadManager { } public static void shutdownExecutor() { - logger.debug("[Executor] Shutting down..."); + System.out.println("[Executor] Shutting down..."); try { for (ExecutorService ex : executors.values()) { @@ -74,19 +74,19 @@ public class ThreadManager { } } catch (InterruptedException e) { - logger.warn("[Executor] Running tasks interrupted"); + System.err.println("[Executor] Running tasks interrupted"); } finally { executors.forEach((name, ex) -> { if (!ex.isTerminated()) { - logger.warn("[Executor: " + name + "] Forcing shutdown of running tasks.."); + System.err.println("[Executor: " + name + "] Forcing shutdown of running tasks.."); ex.shutdownNow(); } }); } - logger.debug("[Executor] Shutdown finished!"); + System.out.println("[Executor] Shutdown finished!"); } diff --git a/src/main/java/netneutrality/command/PermissionManager.java b/src/main/java/netneutrality/command/PermissionManager.java index dec8203..d2c799e 100644 --- a/src/main/java/netneutrality/command/PermissionManager.java +++ b/src/main/java/netneutrality/command/PermissionManager.java @@ -8,9 +8,6 @@ package netneutrality.command;/* import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; -import netneutrality.db.DBController; -import netneutrality.db.entities.Permission; -import netneutrality.db.models.MTableModel; import java.util.List; diff --git a/src/main/java/netneutrality/command/bot/ConfigureCommand.java b/src/main/java/netneutrality/command/bot/ConfigureCommand.java new file mode 100644 index 0000000..9918add --- /dev/null +++ b/src/main/java/netneutrality/command/bot/ConfigureCommand.java @@ -0,0 +1,60 @@ +package netneutrality.command.bot;/* + * Copyright (c) anthorob + * + * https://xtremcommunity.com/ + * https://discord.gg/CdFcyQ + */ + +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import netneutrality.command.AbstractCommand; +import netneutrality.command.CommandType; +import netneutrality.command.Visibility; + +public class ConfigureCommand extends AbstractCommand { + @Override + public boolean needAdmin() { + return true; + } + + @Override + public boolean isEnabled() { + return true; + } + + @Override + public String getCommand() { + return "configure"; + } + + @Override + public String[] getAlias() { + return new String[] { + "conf" + }; + } + + @Override + public String getUsage() { + return null; + } + + @Override + public String getDescription() { + return "Used to configure the bot on this server"; + } + + @Override + public Visibility getVisibility() { + return Visibility.CHANNEL; + } + + @Override + public CommandType getType() { + return CommandType.ADMINISTRATION; + } + + @Override + public String execute(MessageReceivedEvent event, String args) { + return null; + } +} diff --git a/src/main/java/netneutrality/db/DBController.java b/src/main/java/netneutrality/db/DBController.java index e572608..19d0041 100644 --- a/src/main/java/netneutrality/db/DBController.java +++ b/src/main/java/netneutrality/db/DBController.java @@ -28,7 +28,7 @@ public class DBController { private final static HashMap controllers = new HashMap<>(); private final static Logger logger = LoggerFactory.getLogger(DBController.class); - private static final MysqlDatabase database = new MysqlDatabase(Settings.getInstance().get("mysql.database", "netneutrality")); + private static final MysqlDatabase database = new MysqlDatabase(Settings.getInstance().get("MYSQL_DATABASE", "netneutrality")); /** * @param controller The name of the controller as defined in the {@link AbstractController#getControllerName()}'s method diff --git a/src/main/java/netneutrality/db/MysqlDatabase.java b/src/main/java/netneutrality/db/MysqlDatabase.java index 78b49a2..1ab401f 100644 --- a/src/main/java/netneutrality/db/MysqlDatabase.java +++ b/src/main/java/netneutrality/db/MysqlDatabase.java @@ -42,16 +42,16 @@ public class MysqlDatabase { protected MysqlDatabase(String dbName) { this.dbName = dbName; - String dbUser = Settings.getInstance().get("mysql.user", "root"); - String dbPass = Settings.getInstance().get("mysql.password", ""); - String dbHost = Settings.getInstance().get("mysql.host", "localhost"); + String dbUser = Settings.getInstance().get("MYSQL_USER", "root"); + String dbPass = Settings.getInstance().get("MYSQL_PASSWORD", ""); + String dbHost = Settings.getInstance().get("MYSQL_HOST", "localhost"); try { - logger.info(String.format("Connecting to database '%1$s' at %2$s:3306", dbName, dbHost)); + logger.info(String.format("Connecting to database '%1$s' at %2$s:3306 with user '%3$s'", dbName, dbHost, dbUser)); connection = new MysqlConnector(dbName, dbUser, dbHost, dbPass).connect().getConnection(); } catch (SQLException e) { logger.error("Error connecting to database. Shutting down..", e); - MusicBot.shutdown(); + System.exit(0); } } @@ -147,8 +147,7 @@ public class MysqlDatabase { ResultSet rs = query.executeQuery(); return rs; } catch (SQLException e) { - logger.error(e.getMessage()); - e.printStackTrace(); + logger.error(e.getMessage(), e); } return null; @@ -221,13 +220,15 @@ public class MysqlDatabase { * Recreate and reconnect the MySQL connection. */ public void reconnect() { + String dbUser = Settings.getInstance().get("MYSQL_USER", "root"); + String dbPass = Settings.getInstance().get("MYSQL_PASSWORD", ""); + String dbHost = Settings.getInstance().get("MYSQL_HOST", "localhost"); try { logger.info("Reconnecting to database..."); - connection = new MysqlConnector(dbName, "root", "localhost", "").connect().getConnection(); + connection = new MysqlConnector(dbName, dbUser, dbHost, dbPass).connect().getConnection(); } catch (SQLException e) { logger.error("Error connecting to database. Shutting down.."); - MusicBot.shutdown(); System.exit(0); } } diff --git a/src/main/java/netneutrality/db/entities/OGuild.java b/src/main/java/netneutrality/db/entities/OGuild.java index 5d8decd..557dab0 100644 --- a/src/main/java/netneutrality/db/entities/OGuild.java +++ b/src/main/java/netneutrality/db/entities/OGuild.java @@ -6,6 +6,7 @@ package netneutrality.db.entities;/* */ +import netneutrality.GuildManager; import netneutrality.db.models.MTableModel; public class OGuild extends AbstractEntity { @@ -14,7 +15,7 @@ public class OGuild extends AbstractEntity { public boolean logging; public String logchannel; - public OGuildSetting settings; + private OGuildSetting settings; public OGuild(String guildId) { super(guildId); @@ -22,15 +23,24 @@ public class OGuild extends AbstractEntity { this.settings = new OGuildSetting(this); } - @Override - public boolean exists() { - return guildID != null; + public void reloadSettings() { + GuildManager.logger.debug("Reloading settings for guild: " + guildID); + this.settings = new OGuildSetting(this); } public String getGuildID() { return guildID; } + public OGuildSetting getSettings() { + return settings; + } + + @Override + public boolean exists() { + return guildID != null; + } + @Override public String getTableName() { return "guilds"; @@ -49,5 +59,4 @@ public class OGuild extends AbstractEntity { this.logchannel = (String) table.getRow(0).get(2); } - } diff --git a/src/main/java/netneutrality/handler/MessageRateLimit.java b/src/main/java/netneutrality/handler/MessageRateLimit.java deleted file mode 100644 index 3e19285..0000000 --- a/src/main/java/netneutrality/handler/MessageRateLimit.java +++ /dev/null @@ -1,44 +0,0 @@ -package netneutrality.handler; - -import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.entities.Message; -import net.dv8tion.jda.api.entities.MessageChannel; -import net.dv8tion.jda.api.entities.PrivateChannel; -import netneutrality.ThreadManager; - -import java.time.OffsetDateTime; - -public class MessageRateLimit { - - private static Member lastSender; - private static OffsetDateTime timestamp; - private static final long cooldown = 500000000L; // 1 seconds = 1000000000 nanoseconds - - public synchronized static boolean check(Member member, Message message, MessageChannel channel) { - - if (channel instanceof PrivateChannel) - return false; - - if (lastSender == null || timestamp == null) { - lastSender = member; - timestamp = message.getTimeCreated(); - return false; - } - - if (member.getUser().getId().equals(lastSender.getUser().getId())) { - if (message.getTimeCreated().minusNanos(cooldown).isBefore(timestamp)) { - lastSender = member; - timestamp = message.getTimeCreated(); - message.delete().queue(); - return true; - } - } - - lastSender = member; - timestamp = message.getTimeCreated(); - - return false; - - } - -} diff --git a/src/main/java/netneutrality/handler/NewCommandListener.java b/src/main/java/netneutrality/handler/NewCommandListener.java index cf7b4a8..fd86c05 100644 --- a/src/main/java/netneutrality/handler/NewCommandListener.java +++ b/src/main/java/netneutrality/handler/NewCommandListener.java @@ -4,18 +4,18 @@ package netneutrality.handler; import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; +import netneutrality.GuildManager; import netneutrality.command.AbstractCommand; import netneutrality.command.CommandManager; import netneutrality.command.Visibility; -import netneutrality.command.basic.HelpCommand; import netneutrality.db.DBController; import netneutrality.db.controllers.DBMessage; import netneutrality.utils.MessageFunction; import netneutrality.utils.Settings; import netneutrality.utils.UserFunction; - -import java.time.format.DateTimeFormatter; +import org.jetbrains.annotations.NotNull; public class NewCommandListener extends ListenerAdapter { @@ -24,11 +24,21 @@ public class NewCommandListener extends ListenerAdapter { } @Override - public void onMessageReceived(MessageReceivedEvent event) { + public void onGuildMessageReceived(@NotNull GuildMessageReceivedEvent event) { + if (event.getAuthor().isBot()) return; + if (event.isWebhookMessage()) return; + GuildManager.getManager(event.getGuild()).getRateLimiter().check(event.getMember(), event.getMessage(), event.getChannel()); + + + } + + @Override + public void onMessageReceived(@NotNull MessageReceivedEvent event) { if (event.getAuthor().isBot()) return; if (event.isWebhookMessage()) return; - if (MessageRateLimit.check(event.getMember(), event.getMessage(), event.getChannel())) return; + + if (event.getMessage().isEdited()) if (event.isFromType(ChannelType.TEXT)) { ((DBMessage) DBController.get("message")).log(event.getGuild(), event.getTextChannel(), event.getAuthor(), event.getMessage()); @@ -37,8 +47,8 @@ public class NewCommandListener extends ListenerAdapter { Message message = event.getMessage(); String msg = message.getContentDisplay().trim(); - if (msg.startsWith(Settings.getInstance().get("bot.prefix"))) { - msg = msg.substring(1); + if (msg.startsWith(Settings.getInstance().get("BOT_PREFIX", "$"))) { + msg = msg.substring(Settings.getInstance().get("BOT_PREFIX", "$").length()); String cmd = msg.split(" ", 2)[0]; if (CommandManager.commands.containsKey(cmd) || CommandManager.commandsAlias.containsKey(cmd)) { diff --git a/src/main/java/netneutrality/handler/ServerJoinHandler.java b/src/main/java/netneutrality/handler/ServerJoinHandler.java index 3cb8b6b..7b33992 100644 --- a/src/main/java/netneutrality/handler/ServerJoinHandler.java +++ b/src/main/java/netneutrality/handler/ServerJoinHandler.java @@ -9,11 +9,12 @@ package netneutrality.handler; import net.dv8tion.jda.api.events.guild.GuildJoinEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; +import org.jetbrains.annotations.NotNull; public class ServerJoinHandler extends ListenerAdapter { @Override - public void onGuildJoin(GuildJoinEvent event){ + public void onGuildJoin(@NotNull GuildJoinEvent event){ diff --git a/src/main/java/netneutrality/handler/ratelimiter/IMessageRateLimiter.java b/src/main/java/netneutrality/handler/ratelimiter/IMessageRateLimiter.java new file mode 100644 index 0000000..4ce8d7b --- /dev/null +++ b/src/main/java/netneutrality/handler/ratelimiter/IMessageRateLimiter.java @@ -0,0 +1,16 @@ +package netneutrality.handler.ratelimiter; +/* + * Copyright (c) anthorob + * + * https://xtremcommunity.com/ + * https://discord.gg/CdFcyQ + */ + +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.Message; +import net.dv8tion.jda.api.entities.TextChannel; + +public interface IMessageRateLimiter { + + void check(Member member, Message message, TextChannel channel); +} diff --git a/src/main/java/netneutrality/handler/ratelimiter/MessageRateLimiterImpl.java b/src/main/java/netneutrality/handler/ratelimiter/MessageRateLimiterImpl.java new file mode 100644 index 0000000..6a4bdbf --- /dev/null +++ b/src/main/java/netneutrality/handler/ratelimiter/MessageRateLimiterImpl.java @@ -0,0 +1,51 @@ +package netneutrality.handler.ratelimiter;/* + * Copyright (c) anthorob + * + * https://xtremcommunity.com/ + * https://discord.gg/CdFcyQ + */ + +/* + * Copyright (c) anthorob + * + * https://xtremcommunity.com/ + * https://discord.gg/CdFcyQ + */ + +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.Message; +import net.dv8tion.jda.api.entities.TextChannel; +import netneutrality.handler.ratelimiter.IMessageRateLimiter; + +import java.time.OffsetDateTime; + +public class MessageRateLimiterImpl implements IMessageRateLimiter { + private int messagePerSecond = 5; + private static Member lastSender; + private static OffsetDateTime timestamp; + private static final long cooldown = 500000000L; // 1 seconds = 1000000000 nanoseconds + + @Override + public void check(Member member, Message message, TextChannel channel) { + + if (lastSender == null || timestamp == null) { + lastSender = member; + timestamp = message.getTimeCreated(); + return; + } + + if (member.getUser().getId().equals(lastSender.getUser().getId())) { + if (message.getTimeCreated().minusNanos(cooldown).isBefore(timestamp)) { + lastSender = member; + timestamp = message.getTimeCreated(); + message.delete().queue(); + return; + } + } + + lastSender = member; + timestamp = message.getTimeCreated(); + + return; + } +} diff --git a/src/main/java/netneutrality/http/server/ActionHandler.java b/src/main/java/netneutrality/http/server/ActionHandler.java index c36f4dc..5d99f42 100644 --- a/src/main/java/netneutrality/http/server/ActionHandler.java +++ b/src/main/java/netneutrality/http/server/ActionHandler.java @@ -22,7 +22,7 @@ public class ActionHandler implements HttpHandler { if (path.equals("/actions/shutdown")) { LogManager.getLogger(MusicBot.class).info("Request to shutdown received"); WebApi.sendStringResponse(exchange, "Shutting down.."); - MusicBot.shutdown(); + System.exit(0); return; } diff --git a/src/main/java/netneutrality/music/TrackScheduler.java b/src/main/java/netneutrality/music/TrackScheduler.java index 05bf815..cc9d1e7 100644 --- a/src/main/java/netneutrality/music/TrackScheduler.java +++ b/src/main/java/netneutrality/music/TrackScheduler.java @@ -33,10 +33,11 @@ public class TrackScheduler extends AudioEventAdapter { // something is playing, it returns false and does nothing. In that case the player was already playing so this // track goes to the queue instead. boolean start = player.startTrack(track, true); + channel.getManager().setTopic(":speaker: Now playing : " + track.getInfo().title).queue(); + if (!start) { queue.offer(track); - } else - channel.getManager().setTopic(":speaker: Now playing : " + track.getInfo().title).queue(); + } } public void setTextChannel(TextChannel channel) { diff --git a/src/main/java/netneutrality/utils/MessageFunction.java b/src/main/java/netneutrality/utils/MessageFunction.java index cde1de6..063d8b6 100644 --- a/src/main/java/netneutrality/utils/MessageFunction.java +++ b/src/main/java/netneutrality/utils/MessageFunction.java @@ -108,7 +108,7 @@ public class MessageFunction { } - message.addField(Settings.getInstance().get("bot.prefix") + command.getCommand() + " - Arguments: " + usage, description, false); + message.addField(Settings.getInstance().get("BOT_PREFIX") + command.getCommand() + " - Arguments: " + usage, description, false); } return message.build(); diff --git a/src/main/java/netneutrality/utils/Settings.java b/src/main/java/netneutrality/utils/Settings.java index 3f1b730..567ef8b 100644 --- a/src/main/java/netneutrality/utils/Settings.java +++ b/src/main/java/netneutrality/utils/Settings.java @@ -6,6 +6,7 @@ import net.dv8tion.jda.api.entities.User; import netneutrality.MusicBot; import java.io.*; +import java.util.Map; import java.util.Properties; public class Settings { @@ -15,21 +16,37 @@ public class Settings { public Settings() { File file = new File("bot.config"); + FileInputStream fis = null; try { file.createNewFile(); - - FileInputStream fis = new FileInputStream(file); + fis = new FileInputStream(file); prop.load(fis); - fis.close(); + + loadEnvironmentVariables(); } catch (IOException e) { e.printStackTrace(); + } finally { + try { + if (fis != null) + fis.close(); + } catch (IOException ignored) { } } } + private void loadEnvironmentVariables() { + Map envs = System.getenv(); + + for (Map.Entry env : envs.entrySet()) { + if (prop.containsKey(env.getKey())) { + prop.setProperty(env.getKey(), env.getValue()); + } + } + } + public static Settings getInstance() { - if(INSTANCE == null) { + if (INSTANCE == null) { INSTANCE = new Settings(); } @@ -43,7 +60,7 @@ public class Settings { public String get(String key, String def) { String property = prop.getProperty(key); - if (property == null) + if (property == null || property.isEmpty()) return def; return property; diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index c27bace..ac416cb 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,16 +1,16 @@ - + - + - \ No newline at end of file +