diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..eefcd5d --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,60 @@ +name: Discord Bot Deploy +on: + push: + branches: + - main + pull_request: + branches: + - main + paths: + - '.github/workflows/**' + - 'build.gradle' + - 'settings.gradle' + - 'scrpts/**' + - 'src/**' + +jobs: + build: + runs-on: ubuntu-latest + name: Build + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v3 + with: + distribution: 'corretto' + java-version: '21' + + - name: Create application.yml + env: + APPLICATION_YML: ${{ secrets.APPLICATION_YML }} + run: | + echo "$APPLICATION_YML" | envsubst > src/main/resources/application.yml + + - name: Build with Gradle + run: ./gradlew bootJar + + - name: Create deploy package + run: | + mkdir -p scripts + zip -r deployment-package.zip build/libs/cholog.jar appspec.yml scripts/ + + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v4 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ secrets.AWS_REGION }} + + - name: Upload to S3 + run: | + aws s3 cp deployment-package.zip s3://${{ secrets.S3_BUCKET_NAME }}/deployment-package.zip + + - name: Deploy to CodeDeploy + run: | + aws deploy create-deployment \ + --application-name ${{ secrets.APPLICATION_NAME }} \ + --deployment-group-name ${{ secrets.DEPLOYMENT_GROUP_NAME }} \ + --s3-location bucket=${{ secrets.S3_BUCKET_NAME }},key=deployment-package.zip,bundleType=zip diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/appspec.yml b/appspec.yml new file mode 100644 index 0000000..ba91586 --- /dev/null +++ b/appspec.yml @@ -0,0 +1,11 @@ +version: 0.0 +os: linux +files: + - source: /build/libs/discord-bot.jar + destination: /home/ubuntu/ + +hooks: + AfterInstall: + - location: scripts/deploy.sh + timeout: 300 + runas: ubuntu diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..a84845b --- /dev/null +++ b/build.gradle @@ -0,0 +1,57 @@ +plugins { + id 'java' + id 'idea' + id 'application' + id 'org.springframework.boot' version '3.3.1' + id 'io.spring.dependency-management' version '1.1.5' +} + +group = 'cholog' + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +ext { + set('javaVersion', JavaVersion.VERSION_21) +} + +java { + sourceCompatibility = javaVersion + targetCompatibility = javaVersion +} + +dependencyManagement { + imports { + mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.2") + } +} + +dependencies { + runtimeOnly 'com.h2database:h2' + + implementation 'org.springframework.boot:spring-boot-starter' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.cloud:spring-cloud-starter-openfeign' + + implementation 'net.dv8tion:JDA:5.0.0-beta.24' + + implementation 'org.slf4j:slf4j-api' + implementation 'org.slf4j:jcl-over-slf4j' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +springBoot { + mainClass = 'cholog.Application' +} + +test { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 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..a441313 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..b740cf1 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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 POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..7101f8e --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +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% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/scripts/deploy.sh b/scripts/deploy.sh new file mode 100644 index 0000000..4e10969 --- /dev/null +++ b/scripts/deploy.sh @@ -0,0 +1,8 @@ +#!/bin/bash +pm2 stop reaction-game +pm2 start java --name discord-bot -- \ + -Duser.timezone=Asia/Seoul \ + -Dfile.encoding=UTF-8 \ + -Xms1G \ + -Xmx1G \ + -jar /home/ubuntu/discord-bot.jar diff --git a/scripts/ubuntu/install-code-deploy.sh b/scripts/ubuntu/install-code-deploy.sh new file mode 100644 index 0000000..6263d29 --- /dev/null +++ b/scripts/ubuntu/install-code-deploy.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +sudo apt-get update -y +sudo apt-get install -y ruby +cd /home/ubuntu +wget https://aws-codedeploy-ap-northeast-2.s3.amazonaws.com/latest/install +chmod +x ./install +sudo ./install auto diff --git a/scripts/ubuntu/install-jdk-21.sh b/scripts/ubuntu/install-jdk-21.sh new file mode 100644 index 0000000..5c9c269 --- /dev/null +++ b/scripts/ubuntu/install-jdk-21.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +sudo mkdir /usr/lib/jvm +wget https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-aarch64_bin.tar.gz -O /tmp/openjdk-21.0.2_linux-aarch64_bin.tar.gz +sudo tar xfvz /tmp/openjdk-21.0.2_linux-aarch64_bin.tar.gz --directory /usr/lib/jvm +rm -f /tmp/openjdk-21.0.2_linux-aarch64_bin.tar.gz +sudo update-alternatives --install /usr/bin/java java /usr/lib/jvm/jdk-21.0.2/bin/java 100 +sudo update-alternatives --set java /usr/lib/jvm/jdk-21.0.2/bin/java +export JAVA_HOME=/usr/lib/jvm/jdk-21.0.2 +export PATH=$PATH:/usr/lib/jvm/jdk-21.0.2/bin +java -version diff --git a/scripts/ubuntu/install-pm2.sh b/scripts/ubuntu/install-pm2.sh new file mode 100644 index 0000000..dd705f6 --- /dev/null +++ b/scripts/ubuntu/install-pm2.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash - +sudo apt-get install nodejs -y +node --version + +sudo npm install --global pm2 +pm2 --version diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..3b2e351 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'discord-bot' diff --git a/src/main/java/cholog/Application.java b/src/main/java/cholog/Application.java new file mode 100644 index 0000000..1e4a15a --- /dev/null +++ b/src/main/java/cholog/Application.java @@ -0,0 +1,21 @@ +package cholog; + +import net.dv8tion.jda.api.JDA; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.stereotype.Component; + +@Component +@SpringBootApplication +public class Application { + + private final JDA jda; + + public Application(final JDA jda) { + this.jda = jda; + } + + public static void main(final String... args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/src/main/java/cholog/discord/JdaConfiguration.java b/src/main/java/cholog/discord/JdaConfiguration.java new file mode 100644 index 0000000..b976d65 --- /dev/null +++ b/src/main/java/cholog/discord/JdaConfiguration.java @@ -0,0 +1,50 @@ +package cholog.discord; + +import net.dv8tion.jda.api.JDA; +import net.dv8tion.jda.api.JDABuilder; +import net.dv8tion.jda.api.OnlineStatus; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.hooks.ListenerAdapter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.List; + +@Configuration +@EnableConfigurationProperties(JdaProperties.class) +class JdaConfiguration { + + private static final Logger log = LoggerFactory.getLogger(JdaConfiguration.class); + + private final JdaProperties jdaProperties; + + private final List eventListeners; + + JdaConfiguration( + final JdaProperties jdaProperties, + final List eventListeners + ) { + this.jdaProperties = jdaProperties; + this.eventListeners = eventListeners; + } + + @Bean + JDA jda() throws InterruptedException { + final var jda = JDABuilder.createDefault(jdaProperties.token()) + .setStatus(OnlineStatus.ONLINE) + .addEventListeners(eventListeners.toArray()) + .build() + .awaitReady(); + + log.debug("JDA is ready"); + return jda; + } + + @Bean + Guild guild(final JDA jda) { + return jda.getGuildById(jdaProperties.guildId()); + } +} diff --git a/src/main/java/cholog/discord/JdaProperties.java b/src/main/java/cholog/discord/JdaProperties.java new file mode 100644 index 0000000..5291908 --- /dev/null +++ b/src/main/java/cholog/discord/JdaProperties.java @@ -0,0 +1,11 @@ +package cholog.discord; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "cholog.jda") +public record JdaProperties( + String token, + String guildId +) { + +} diff --git a/src/main/java/cholog/discord/SlashCommand.java b/src/main/java/cholog/discord/SlashCommand.java new file mode 100644 index 0000000..5a54fa0 --- /dev/null +++ b/src/main/java/cholog/discord/SlashCommand.java @@ -0,0 +1,19 @@ +package cholog.discord; + +import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; +import net.dv8tion.jda.api.interactions.commands.build.OptionData; + +import java.util.List; + +public interface SlashCommand { + + String commandName(); + + String description(); + + default List options() { + return List.of(); + } + + void onEvent(SlashCommandInteractionEvent event); +} diff --git a/src/main/java/cholog/discord/SlashCommandListenerMapper.java b/src/main/java/cholog/discord/SlashCommandListenerMapper.java new file mode 100644 index 0000000..01b7c1b --- /dev/null +++ b/src/main/java/cholog/discord/SlashCommandListenerMapper.java @@ -0,0 +1,37 @@ +package cholog.discord; + +import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; +import net.dv8tion.jda.api.hooks.ListenerAdapter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.lang.NonNull; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + +import static java.util.stream.Collectors.toMap; + +@Component +public final class SlashCommandListenerMapper extends ListenerAdapter { + + private static final Logger log = LoggerFactory.getLogger(SlashCommandListenerMapper.class); + + private final Map slashCommands; + + public SlashCommandListenerMapper(final List slashCommands) { + this.slashCommands = slashCommands.stream() + .collect(toMap(SlashCommand::commandName, command -> command)); + } + + @Override + public void onSlashCommandInteraction(@NonNull final SlashCommandInteractionEvent event) { + final var commandName = event.getName(); + final var slashCommand = slashCommands.get(commandName); + if (slashCommand == null) { + log.error("Slash command not found: {}", commandName); + return; + } + slashCommand.onEvent(event); + } +} diff --git a/src/main/java/cholog/discord/SlashCommandRegistry.java b/src/main/java/cholog/discord/SlashCommandRegistry.java new file mode 100644 index 0000000..2871cc8 --- /dev/null +++ b/src/main/java/cholog/discord/SlashCommandRegistry.java @@ -0,0 +1,44 @@ +package cholog.discord; + +import jakarta.annotation.PostConstruct; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.interactions.commands.build.Commands; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public final class SlashCommandRegistry { + + private static final Logger log = LoggerFactory.getLogger(SlashCommandRegistry.class); + + private final Guild guild; + + private final List slashCommands; + + SlashCommandRegistry( + final Guild guild, + final List slashCommands + ) { + this.guild = guild; + this.slashCommands = slashCommands; + } + + @PostConstruct + void setUpCommands() { + if (slashCommands.isEmpty()) { + log.warn("No commands"); + return; + } + + log.info("Registering [{}] commands", slashCommands.stream().map(SlashCommand::commandName).toList()); + + final var listOfSlashCommandData = slashCommands.stream() + .map(listener -> Commands.slash(listener.commandName(), listener.description()).addOptions(listener.options())) + .toList(); + guild.updateCommands().addCommands(listOfSlashCommandData).queue(); + log.info("Commands are registered"); + } +} diff --git a/src/main/java/cholog/discord/command/CommandsConfiguration.java b/src/main/java/cholog/discord/command/CommandsConfiguration.java new file mode 100644 index 0000000..3237b87 --- /dev/null +++ b/src/main/java/cholog/discord/command/CommandsConfiguration.java @@ -0,0 +1,10 @@ +package cholog.discord.command; + +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@EnableConfigurationProperties(CommandsProperties.class) +@Configuration +public class CommandsConfiguration { + +} diff --git a/src/main/java/cholog/discord/command/CommandsProperties.java b/src/main/java/cholog/discord/command/CommandsProperties.java new file mode 100644 index 0000000..09276ce --- /dev/null +++ b/src/main/java/cholog/discord/command/CommandsProperties.java @@ -0,0 +1,19 @@ +package cholog.discord.command; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "cholog.jda.commands") +public record CommandsProperties( + PrMergeProperties prMerge +) { + + public String prMergeChannelId() { + return prMerge.channelId(); + } + + public record PrMergeProperties( + String channelId + ) { + + } +} diff --git a/src/main/java/cholog/discord/command/GithubPullRequestMergeCommand.java b/src/main/java/cholog/discord/command/GithubPullRequestMergeCommand.java new file mode 100644 index 0000000..e751af0 --- /dev/null +++ b/src/main/java/cholog/discord/command/GithubPullRequestMergeCommand.java @@ -0,0 +1,108 @@ +package cholog.discord.command; + +import cholog.discord.SlashCommand; +import cholog.github.GithubApi; +import cholog.github.PullRequest; +import cholog.github.PullRequestMergeRequest; +import cholog.github.PullRequestUrl; +import net.dv8tion.jda.api.JDA; +import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; +import net.dv8tion.jda.api.interactions.commands.OptionType; +import net.dv8tion.jda.api.interactions.commands.build.OptionData; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Objects; + +import static java.util.Objects.requireNonNull; + +@Component +public final class GithubPullRequestMergeCommand implements SlashCommand { + + private final CommandsProperties properties; + + private final GithubApi githubApi; + + public GithubPullRequestMergeCommand( + final CommandsProperties properties, + final GithubApi githubApi + ) { + this.properties = properties; + this.githubApi = githubApi; + + } + + @Override + public String commandName() { + return "pr-merge"; + } + + @Override + public String description() { + return "Github PR 머지 요청을 합니다."; + } + + @Override + public List options() { + return List.of( + new OptionData(OptionType.STRING, "PR URL", "Github PR URL", true) + ); + } + + @Override + public void onEvent(final SlashCommandInteractionEvent event) { + final var url = requireNonNull(event.getOption("value")).getAsString(); + final var pullRequestUrl = new PullRequestUrl(url); + + if (!Objects.equals(pullRequestUrl.owner(), "cho-log")) { + event.reply("cholog의 PR만 머지할 수 있습니다.").queue(); + final var warningMessage = "[경고] " + event.getUser().getEffectiveName() + "(" + event.getUser().getName() + ") 유저가 " + url + " PR을 머지하려 했습니다."; + sendToMergeChannel(event.getJDA(), warningMessage); + return; + } + + final var pullRequest = githubApi.getPullRequest( + pullRequestUrl.owner(), + pullRequestUrl.repository(), + pullRequestUrl.pullNumber() + ); + if (pullRequest.state() == PullRequest.PullRequestState.CLOSED) { + event.reply("이미 닫힌 PR입니다.").queue(); + return; + } + + final var targetBranch = pullRequest.base().ref(); + if (targetBranch.contains("main") || targetBranch.contains("master")) { + event.reply("main 또는 master 브랜치에는 머지할 수 없습니다.").queue(); + return; + } + + final var mergeRequest = new PullRequestMergeRequest( + "고생하셨습니다.", + ":tada: PR 머지 완료! :tada:", + pullRequest.head().sha(), + PullRequestMergeRequest.MergeMethod.SQUASH + ); + final var mergeResult = githubApi.mergePullRequest( + pullRequestUrl.owner(), + pullRequestUrl.repository(), + pullRequestUrl.pullNumber(), + mergeRequest + ); + if (mergeResult.merged()) { + event.reply("PR 머지 완료!").queue(); + final var successMessage = event.getUser().getEffectiveName() + "(" + event.getUser().getName() + ") 유저가 " + url + " PR을 머지했습니다."; + sendToMergeChannel(event.getJDA(), successMessage); + } else { + event.reply("[실패] " + mergeResult.message()).queue(); + } + } + + private void sendToMergeChannel( + final JDA jda, + final String message + ) { + final var channel = Objects.requireNonNull(jda.getTextChannelById(properties.prMergeChannelId())); + channel.sendMessage(message).queue(); + } +} diff --git a/src/main/java/cholog/discord/command/PingPongCommand.java b/src/main/java/cholog/discord/command/PingPongCommand.java new file mode 100644 index 0000000..82ea1b1 --- /dev/null +++ b/src/main/java/cholog/discord/command/PingPongCommand.java @@ -0,0 +1,24 @@ +package cholog.discord.command; + +import cholog.discord.SlashCommand; +import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; +import org.springframework.stereotype.Component; + +@Component +public final class PingPongCommand implements SlashCommand { + + @Override + public String commandName() { + return "ping"; + } + + @Override + public String description() { + return "Ping! Pong!"; + } + + @Override + public void onEvent(final SlashCommandInteractionEvent event) { + event.reply("Pong!").queue(); + } +} diff --git a/src/main/java/cholog/github/GithubApi.java b/src/main/java/cholog/github/GithubApi.java new file mode 100644 index 0000000..c619fd2 --- /dev/null +++ b/src/main/java/cholog/github/GithubApi.java @@ -0,0 +1,31 @@ +package cholog.github; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; + +@FeignClient( + name = "github", + url = "https://api.github.com", + configuration = GithubApiConfiguration.class +) +public interface GithubApi { + + // Note: https://docs.github.com/en/rest/pulls/pulls?apiVersion=2022-11-28#get-a-pull-request + @GetMapping("/repos/{owner}/{repo}/pulls/{pull_number}") + PullRequest getPullRequest( + @PathVariable("owner") String owner, + @PathVariable("repo") String repository, + @PathVariable("pull_number") int pullNumber + ); + + // Note: https://docs.github.com/en/rest/pulls/pulls?apiVersion=2022-11-28#merge-a-pull-request + @PutMapping("/repos/{owner}/{repo}/pulls/{pull_number}/merge") + PullRequestMergeResult mergePullRequest( + @PathVariable("owner") String owner, + @PathVariable("repo") String repository, + @PathVariable("pull_number") int pullNumber, + PullRequestMergeRequest mergeRequest + ); +} diff --git a/src/main/java/cholog/github/GithubApiConfiguration.java b/src/main/java/cholog/github/GithubApiConfiguration.java new file mode 100644 index 0000000..fecdda8 --- /dev/null +++ b/src/main/java/cholog/github/GithubApiConfiguration.java @@ -0,0 +1,29 @@ +package cholog.github; + +import feign.RequestInterceptor; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@EnableConfigurationProperties(GithubProperties.class) +@EnableFeignClients(clients = GithubApi.class) +@Configuration +class GithubApiConfiguration { + + private final GithubProperties githubProperties; + + GithubApiConfiguration(final GithubProperties githubProperties) { + this.githubProperties = githubProperties; + } + + @Bean("githubApiRequestInterceptor") + RequestInterceptor githubApiRequestInterceptor() { + return requestTemplate -> { + requestTemplate.header("Content-Type", "application/json"); + requestTemplate.header("Accept", "application/vnd.github.+json"); + requestTemplate.header("Authorization", "token " + githubProperties.token()); + requestTemplate.header("X-Github-Api-Version", githubProperties.apiVersion()); + }; + } +} diff --git a/src/main/java/cholog/github/GithubProperties.java b/src/main/java/cholog/github/GithubProperties.java new file mode 100644 index 0000000..780aed6 --- /dev/null +++ b/src/main/java/cholog/github/GithubProperties.java @@ -0,0 +1,11 @@ +package cholog.github; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "cholog.github") +public record GithubProperties( + String token, + String apiVersion +) { + +} diff --git a/src/main/java/cholog/github/PullRequest.java b/src/main/java/cholog/github/PullRequest.java new file mode 100644 index 0000000..0a7acb8 --- /dev/null +++ b/src/main/java/cholog/github/PullRequest.java @@ -0,0 +1,32 @@ +package cholog.github; + +import com.fasterxml.jackson.annotation.JsonCreator; + +public record PullRequest( + PullRequestState state, + CommitPointer head, + CommitPointer base +) { + + public enum PullRequestState { + OPEN, + CLOSED; + + @JsonCreator + public static PullRequestState fromString(final String state) { + return switch (state) { + case "open" -> OPEN; + case "closed" -> CLOSED; + default -> throw new IllegalArgumentException("Unknown state: " + state); + }; + } + } + + public record CommitPointer( + String label, + String ref, + String sha + ) { + + } +} diff --git a/src/main/java/cholog/github/PullRequestMergeRequest.java b/src/main/java/cholog/github/PullRequestMergeRequest.java new file mode 100644 index 0000000..4bf909f --- /dev/null +++ b/src/main/java/cholog/github/PullRequestMergeRequest.java @@ -0,0 +1,15 @@ +package cholog.github; + +public record PullRequestMergeRequest( + String commitTitle, + String commitMessage, + String sha, + MergeMethod mergeMethod +) { + + public enum MergeMethod { + MERGE, + REBASE, + SQUASH + } +} diff --git a/src/main/java/cholog/github/PullRequestMergeResult.java b/src/main/java/cholog/github/PullRequestMergeResult.java new file mode 100644 index 0000000..38080d0 --- /dev/null +++ b/src/main/java/cholog/github/PullRequestMergeResult.java @@ -0,0 +1,8 @@ +package cholog.github; + +public record PullRequestMergeResult( + boolean merged, + String message +) { + +} diff --git a/src/main/java/cholog/github/PullRequestUrl.java b/src/main/java/cholog/github/PullRequestUrl.java new file mode 100644 index 0000000..004cda9 --- /dev/null +++ b/src/main/java/cholog/github/PullRequestUrl.java @@ -0,0 +1,26 @@ +package cholog.github; + +import java.net.URI; + +public record PullRequestUrl(URI value) { + + public PullRequestUrl(final String value) { + this(URI.create(value)); + } + + public String owner() { + return paths()[1]; + } + + public String repository() { + return paths()[2]; + } + + public int pullNumber() { + return Integer.parseInt(paths()[4]); + } + + private String[] paths() { + return value.getPath().split("/"); + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..db5e245 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,15 @@ +spring: + application.name: discord-bot + profiles: + default: local + +cholog: + github: + token: + api-version: 2022-11-28 + jda: + token: + guild-id: + commands: + pr-merge: + channel-id: diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..367188d --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,53 @@ + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - [%X{requestId}] %msg%n + + + + 500 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/cholog/ApplicationTests.java b/src/test/java/cholog/ApplicationTests.java new file mode 100644 index 0000000..ea6e959 --- /dev/null +++ b/src/test/java/cholog/ApplicationTests.java @@ -0,0 +1,12 @@ +package cholog; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ApplicationTests { + + @Test + void contextLoads() { + } +}