diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..f7a904fe --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,51 @@ +name: Build + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +env: + path: build/TechDiscordBot.jar + name: TechDiscordBot.jar + build: build-${{ github.run_number }} + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew build + + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ env.build }} + release_name: Release ${{ env.build }} + + - name: Upload Release Asset + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ${{ env.path }} + asset_name: ${{ env.name }} + asset_content_type: application/java-archive \ No newline at end of file diff --git a/.gitignore b/.gitignore index 9e7dd421..9268b2e0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,13 +3,4 @@ .idea/ .gradle/ out/ -build/ -/libs/SpigotAPI.jar -/gradle/wrapper/gradle-wrapper.jar -/gradle/wrapper/gradle-wrapper.properties -/gradlew -/gradlew.bat -/SpigotAPI/ - -# Dont include that file with sensitive credentials -build.properties +build/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index a74f2dda..00000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "SpigotAPI"] - path = SpigotAPI - url = https://github.com/TechsCode/SpigotAPI.git - branch = master diff --git a/SpigotAPI b/SpigotAPI deleted file mode 160000 index 6b11fed9..00000000 --- a/SpigotAPI +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6b11fed9cb7fab85c8de3e0936e8a11d0776f6ca diff --git a/build.gradle b/build.gradle index 7704046e..18f22397 100644 --- a/build.gradle +++ b/build.gradle @@ -1,61 +1,36 @@ -apply plugin: 'idea' apply plugin: 'java' apply plugin: 'com.github.johnrengelman.shadow' -apply plugin: 'org.hidetake.ssh' group = "me.TechsCode" sourceCompatibility = 1.8 targetCompatibility = 1.8 +assemble.dependsOn shadowJar + repositories { jcenter() mavenLocal() mavenCentral() + + maven { url 'https://www.jitpack.io' } } dependencies { - shadow project(":SpigotAPI") + implementation 'com.github.techscode:spigotapi:build-9' - shadow ('net.dv8tion:JDA:4.2.0_175') { + implementation ('net.dv8tion:JDA:4.2.0_175') { exclude module: 'opus-java' //No audio. } - shadow 'org.jsoup:jsoup:1.8.3' - shadow 'org.apache.commons:commons-lang3:3.7' - shadow 'mysql:mysql-connector-java:5.1.17' - shadow 'com.j2html:j2html:1.4.0' - shadow "com.googlecode.json-simple:json-simple:1.1.1" - shadow 'net.sourceforge.htmlunit:htmlunit:2.29' - shadow 'com.google.code.gson:gson:2.8.6' - shadow group: 'org.kohsuke', name: 'github-api', version: '1.115' -} - -def props = new Properties() -file("build.properties").withInputStream { props.load(it) } - -ssh.remotes { - server { - host = props.getProperty("host") - port = Integer.valueOf(props.getProperty("port")) - user = props.getProperty("user") - password = props.getProperty("password") - } -} - -ssh.settings { - knownHosts = allowAnyHosts - dryRun = false -} - -task uploadBot { - doLast { - ssh.run { - session(ssh.remotes.server) { - put from: files('build/TechDiscordBot.jar'), into: props.getProperty("location") - } - } - } + implementation 'org.jsoup:jsoup:1.8.3' + implementation 'org.apache.commons:commons-lang3:3.7' + implementation 'mysql:mysql-connector-java:5.1.17' + implementation 'com.j2html:j2html:1.4.0' + implementation "com.googlecode.json-simple:json-simple:1.1.1" + implementation 'net.sourceforge.htmlunit:htmlunit:2.29' + implementation 'com.google.code.gson:gson:2.8.6' + implementation group: 'org.kohsuke', name: 'github-api', version: '1.115' } buildscript { @@ -64,16 +39,12 @@ buildscript { } dependencies { classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4' - classpath 'org.hidetake:gradle-ssh-plugin:2.10.1' } } shadowJar { archiveName = 'TechDiscordBot.jar' - destinationDir = file('build') - - dependsOn 'build' - configurations = [project.configurations.shadow] + destinationDir = file("build") } jar { @@ -81,8 +52,4 @@ jar { attributes 'Class-Path': '/libs/a.jar' attributes 'Main-Class': 'me.TechsCode.TechDiscordBot.TechDiscordBot' } -} - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' } \ No newline at end of file diff --git a/build.properties.template b/build.properties.template deleted file mode 100644 index 0ed2550c..00000000 --- a/build.properties.template +++ /dev/null @@ -1,8 +0,0 @@ -# SSH Credentials for direct uploading after compiling -host=somehost.com -port=22 -user=someuser -password=somepassword - -# Export Location on Server -location=/path/to/folder \ 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 00000000..f3d88b1c 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 00000000..1b16c34a --- /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.1.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..2fe81a7d --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/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 00000000..9618d8d9 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@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 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 init + +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 init + +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 + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +: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/src/main/java/me/TechsCode/TechDiscordBot/github/GitHubUtil.java b/src/main/java/me/TechsCode/TechDiscordBot/github/GitHubUtil.java index 2684e2c5..853bd370 100644 --- a/src/main/java/me/TechsCode/TechDiscordBot/github/GitHubUtil.java +++ b/src/main/java/me/TechsCode/TechDiscordBot/github/GitHubUtil.java @@ -18,6 +18,8 @@ public static GithubRelease getLatestRelease(String repo) { GHRepository ghrepo = getGithub().getRepository("TechsCode/" + repo); GHRelease release = ghrepo.getLatestRelease(); + if(release == null) return null; + return new GithubRelease(release); } catch (IOException e) { e.printStackTrace(); diff --git a/src/main/java/me/TechsCode/TechDiscordBot/module/modules/PluginLabModule.java b/src/main/java/me/TechsCode/TechDiscordBot/module/modules/PluginLabModule.java index a8dbcf3f..3a2bb451 100644 --- a/src/main/java/me/TechsCode/TechDiscordBot/module/modules/PluginLabModule.java +++ b/src/main/java/me/TechsCode/TechDiscordBot/module/modules/PluginLabModule.java @@ -118,8 +118,10 @@ public void detectRelease() { } public void uploadFile(TextChannel channel, GithubRelease release, String pluginName) { - List msgs = channel.getHistory().retrieveFuture(100).complete().stream().filter(msg -> msg.getAuthor().isBot() && msg.isPinned()).collect(Collectors.toList()); - msgs.forEach(msg -> msg.unpin().queue()); + try { + List msgs = channel.getHistory().retrieveFuture(100).complete().stream().filter(msg -> msg.getAuthor().isBot() && msg.isPinned()).collect(Collectors.toList()); + msgs.forEach(msg -> msg.unpin().queue()); + } catch (IllegalStateException ignored){} if(release.getAsset() != null && release.getRelease() != null && release.getFile() != null) { new TechEmbedBuilder("Ready to Test: " + WordUtils.capitalize(release.getRelease().getName().replace(".jar", ""))) diff --git a/src/main/java/me/TechsCode/TechDiscordBot/util/Plugin.java b/src/main/java/me/TechsCode/TechDiscordBot/util/Plugin.java index 6d392842..e82ea3f4 100644 --- a/src/main/java/me/TechsCode/TechDiscordBot/util/Plugin.java +++ b/src/main/java/me/TechsCode/TechDiscordBot/util/Plugin.java @@ -16,12 +16,11 @@ public enum Plugin { - ULTRA_PERMISSIONS("Ultra Permissions","42678", "416194311080771596", "330053303050436608", new Color(0,235,229), "UltraPermissions", "https://ultrapermissions.com/wiki", "https://www.spigotmc.org/data/resource_icons/42/42678.jpg?1551053784"), - //YOUTUBE_BRIDGE("Youtube Bridge", "35928", "416194347294392321", "311178282278322176", new Color(216, 56, 43),"YoutubeBridge", "", "https://www.spigotmc.org/data/resource_icons/35/35928.jpg?1551053840"), - ULTRA_CUSTOMIZER("Ultra Customizer", "49330", "416194287567372298", "380133603683860480", new Color(184, 103, 243), "UltraCustomizer", "https://ultracustomizer.com/wiki", "https://www.spigotmc.org/data/resource_icons/49/49330.jpg?1552009867"), - ULTRA_REGIONS("Ultra Regions", "58317", "465975554101739520", "465975795433734155", new Color(57, 135, 153), "UltraRegions", "https://ultraregions.com/wiki", "https://www.spigotmc.org/data/resource_icons/58/58317.jpg?1557800307"), - ULTRA_PUNISHMENTS("Ultra Punishments", "63511", "531255363505487872", "531251918291599401", new Color(247, 119, 39), "UltraPunishments", "https://ultrapunishments.com/wiki", "https://www.spigotmc.org/data/resource_icons/63/63511.jpg?1551053820"), - INSANE_SHOPS("Insane Shops", "67352", "531255363505487872", "576813543698202624", new Color(114, 185, 77), "InsaneShops", "https://insaneshops.com/wiki", "https://www.spigotmc.org/data/resource_icons/67/67352.jpg?1557794141"); + ULTRA_PERMISSIONS("Ultra Permissions","42678", "416194311080771596", "330053303050436608", new Color(0,235,229), "UltraPermissions", "https://ultrapermissions.com/wiki", "https://www.spigotmc.org/data/resource_icons/42/42678.jpg?75455775"), + ULTRA_CUSTOMIZER("Ultra Customizer", "49330", "416194287567372298", "380133603683860480", new Color(184, 103, 243), "UltraCustomizer", "https://ultracustomizer.com/wiki", "https://www.spigotmc.org/data/resource_icons/49/49330.jpg?575757457475"), + ULTRA_REGIONS("Ultra Regions", "58317", "465975554101739520", "465975795433734155", new Color(57, 135, 153), "UltraRegions", "https://ultraregions.com/wiki", "https://www.spigotmc.org/data/resource_icons/58/58317.jpg?5775757457"), + ULTRA_PUNISHMENTS("Ultra Punishments", "63511", "531255363505487872", "531251918291599401", new Color(247, 119, 39), "UltraPunishments", "https://ultrapunishments.com/wiki", "https://www.spigotmc.org/data/resource_icons/63/63511.jpg?1597561836"), + INSANE_SHOPS("Insane Shops", "67352", "531255363505487872", "576813543698202624", new Color(114, 185, 77), "InsaneShops", "https://insaneshops.com/wiki", "https://www.spigotmc.org/data/resource_icons/67/67352.jpg?1597561788"); private final String resourceId, channelId, roleName, roleId, emojiName, wiki, logo; private final Color color;