From 9a823dd83456b993df619451ad988fbeda01ff04 Mon Sep 17 00:00:00 2001 From: Big-Iron-Cheems <52252627+Big-Iron-Cheems@users.noreply.github.com> Date: Sun, 8 Sep 2024 13:49:53 +0200 Subject: [PATCH 01/10] Golang rewrite TODO: - verify dockerfile - checkout GH actions --- .editorconfig | 12 - .github/workflows/dockerhub.yml | 8 +- .gitignore | 3 +- Dockerfile | 25 +- build.gradle | 25 -- cmd/meteor-bot/main.go | 46 +++ go.mod | 17 + go.sum | 30 ++ gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 5 - gradlew | 234 ------------- gradlew.bat | 89 ----- internal/app/commands/commands.go | 72 ++++ internal/app/commands/help/faq.go | 62 ++++ internal/app/commands/help/installation.go | 62 ++++ internal/app/commands/help/logs.go | 62 ++++ internal/app/commands/help/oldversion.go | 62 ++++ internal/app/commands/link.go | 134 ++++++++ internal/app/commands/moderation/ban.go | 75 ++++ internal/app/commands/moderation/close.go | 93 +++++ internal/app/commands/moderation/mute.go | 191 +++++++++++ internal/app/commands/moderation/unmute.go | 102 ++++++ internal/app/commands/silly/capy.go | 89 +++++ internal/app/commands/silly/cat.go | 78 +++++ internal/app/commands/silly/dog.go | 78 +++++ internal/app/commands/silly/monkey.go | 42 +++ internal/app/commands/silly/panda.go | 84 +++++ internal/app/commands/stats.go | 126 +++++++ internal/app/common/command.go | 50 +++ internal/app/common/commandbuilder.go | 28 ++ internal/app/config/config.go | 42 +++ internal/app/config/logger.go | 45 +++ internal/app/events/events.go | 320 ++++++++++++++++++ settings.gradle | 2 - .../java/org/meteordev/meteorbot/Env.java | 18 - .../org/meteordev/meteorbot/InfoChannels.java | 49 --- .../org/meteordev/meteorbot/MeteorBot.java | 90 ----- .../java/org/meteordev/meteorbot/Metrics.java | 78 ----- .../java/org/meteordev/meteorbot/Uptime.java | 26 -- .../java/org/meteordev/meteorbot/Utils.java | 94 ----- .../meteordev/meteorbot/command/Command.java | 32 -- .../meteordev/meteorbot/command/Commands.java | 76 ----- .../command/commands/LinkCommand.java | 47 --- .../command/commands/StatsCommand.java | 57 ---- .../command/commands/help/FaqCommand.java | 14 - .../command/commands/help/HelpCommand.java | 33 -- .../commands/help/InstallationCommand.java | 14 - .../command/commands/help/LogsCommand.java | 14 - .../commands/help/OldVersionCommand.java | 14 - .../commands/moderation/BanCommand.java | 39 --- .../commands/moderation/CloseCommand.java | 36 -- .../commands/moderation/MuteCommand.java | 70 ---- .../commands/moderation/UnmuteCommand.java | 36 -- .../command/commands/silly/CapyCommand.java | 24 -- .../command/commands/silly/CatCommand.java | 24 -- .../command/commands/silly/DogCommand.java | 24 -- .../command/commands/silly/MonkeyCommand.java | 26 -- .../command/commands/silly/PandaCommand.java | 28 -- src/main/resources/logback.xml | 12 - 59 files changed, 2012 insertions(+), 1356 deletions(-) delete mode 100644 .editorconfig delete mode 100644 build.gradle create mode 100644 cmd/meteor-bot/main.go create mode 100644 go.mod create mode 100644 go.sum delete mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 gradle/wrapper/gradle-wrapper.properties delete mode 100755 gradlew delete mode 100644 gradlew.bat create mode 100644 internal/app/commands/commands.go create mode 100644 internal/app/commands/help/faq.go create mode 100644 internal/app/commands/help/installation.go create mode 100644 internal/app/commands/help/logs.go create mode 100644 internal/app/commands/help/oldversion.go create mode 100644 internal/app/commands/link.go create mode 100644 internal/app/commands/moderation/ban.go create mode 100644 internal/app/commands/moderation/close.go create mode 100644 internal/app/commands/moderation/mute.go create mode 100644 internal/app/commands/moderation/unmute.go create mode 100644 internal/app/commands/silly/capy.go create mode 100644 internal/app/commands/silly/cat.go create mode 100644 internal/app/commands/silly/dog.go create mode 100644 internal/app/commands/silly/monkey.go create mode 100644 internal/app/commands/silly/panda.go create mode 100644 internal/app/commands/stats.go create mode 100644 internal/app/common/command.go create mode 100644 internal/app/common/commandbuilder.go create mode 100644 internal/app/config/config.go create mode 100644 internal/app/config/logger.go create mode 100644 internal/app/events/events.go delete mode 100644 settings.gradle delete mode 100644 src/main/java/org/meteordev/meteorbot/Env.java delete mode 100644 src/main/java/org/meteordev/meteorbot/InfoChannels.java delete mode 100644 src/main/java/org/meteordev/meteorbot/MeteorBot.java delete mode 100644 src/main/java/org/meteordev/meteorbot/Metrics.java delete mode 100644 src/main/java/org/meteordev/meteorbot/Uptime.java delete mode 100644 src/main/java/org/meteordev/meteorbot/Utils.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/Command.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/Commands.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/LinkCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/StatsCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/help/FaqCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/help/HelpCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/help/InstallationCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/help/LogsCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/help/OldVersionCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/moderation/BanCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/moderation/CloseCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/moderation/MuteCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/moderation/UnmuteCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/silly/CapyCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/silly/CatCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/silly/DogCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/silly/MonkeyCommand.java delete mode 100644 src/main/java/org/meteordev/meteorbot/command/commands/silly/PandaCommand.java delete mode 100644 src/main/resources/logback.xml diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index b722415..0000000 --- a/.editorconfig +++ /dev/null @@ -1,12 +0,0 @@ -[*] -charset = utf-8 -indent_style = space -insert_final_newline = true -trim_trailing_whitespace = true -indent_size = 4 - -[*.{json, yml}] -indent_size = 2 - -[*.md] -trim_trailing_whitespace = false diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index e55fb8d..82b7f38 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -9,19 +9,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 diff --git a/.gitignore b/.gitignore index 87c7310..a9869cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ -.gradle .idea build .DS_Store .env -bin \ No newline at end of file +logs \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index a99ab29..6d0fff5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,22 @@ -FROM webhippie/temurin:18 +# Start from the official Go image +FROM golang:1.23-alpine AS builder +# Set the Current Working Directory inside the container WORKDIR /app -COPY gradle ./gradle -COPY src ./src -COPY build.gradle . -COPY gradlew . -COPY settings.gradle . +# Copy go.mod and go.sum files to the workspace +COPY go.mod go.sum ./ -RUN ./gradlew build +# Download all dependencies. Dependencies will be cached if the go.mod and go.sum files are not changed +RUN go mod download -ENTRYPOINT java $JAVA_OPTS -jar build/libs/meteor-bot-all.jar +# Copy the source code from the current directory to the Working Directory inside the container +COPY . . + +# Build the Go app +RUN go build -ldflags="-s -w" -o build/meteor-bot cmd/meteor-bot/main.go + +FROM alpine:latest + +# Run the binary program produced by `go build` +CMD ["/app/meteor-bot"] \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index ee8ae2b..0000000 --- a/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -plugins { - id "com.github.johnrengelman.shadow" version "8.1.1" - id "application" - id "java" -} - -sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17 - -repositories { - mavenCentral() -} - -dependencies { - implementation "net.dv8tion:JDA:5.0.0-beta.19" - implementation "com.konghq:unirest-java:3.14.5:standalone" - implementation "ch.qos.logback:logback-classic:1.4.14" -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -shadowJar { - setMainClassName("org.meteordev.meteorbot.MeteorBot") -} diff --git a/cmd/meteor-bot/main.go b/cmd/meteor-bot/main.go new file mode 100644 index 0000000..c65d8f7 --- /dev/null +++ b/cmd/meteor-bot/main.go @@ -0,0 +1,46 @@ +package main + +import ( + "github.com/bwmarrin/discordgo" + "github.com/rs/zerolog/log" + "meteor-bot/internal/app/commands" + "meteor-bot/internal/app/config" + "meteor-bot/internal/app/events" + "os" + "os/signal" +) + +func main() { + // Close the log file when the program exits + defer config.CloseLogFile() + + // Create a new Discord session + s, err := discordgo.New("Bot " + config.GlobalConfig.DiscordToken) + if err != nil { + log.Panic().Err(err).Msg("Error creating Discord session") + } + // Enable the intents required for the bot + s.Identify.Intents |= discordgo.IntentsGuildMessages | discordgo.IntentsGuildMembers + + // Initialize the events and register them to the Discord API + // Must be done BEFORE opening the session to make discordgo.Ready handlers work + events.Init(s) + + // Bot is ready, open the session + if err = s.Open(); err != nil { + log.Panic().Err(err).Msg("Error opening Discord session") + } + defer s.Close() + + // Initialize the commands and handlers, and register them to the Discord API + // Must be done AFTER opening the session to add the commands to the API + commands.Init(s) + + // Wait until the bot is stopped + stop := make(chan os.Signal, 1) + signal.Notify(stop, os.Interrupt) + log.Info().Msg("Press Ctrl+C to exit") + <-stop + + log.Info().Msg("Gracefully shutting down.") +} diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..bee175b --- /dev/null +++ b/go.mod @@ -0,0 +1,17 @@ +module meteor-bot + +go 1.23 + +require ( + github.com/bwmarrin/discordgo v0.28.1 + github.com/joho/godotenv v1.5.1 + github.com/rs/zerolog v1.33.0 +) + +require ( + github.com/gorilla/websocket v1.4.2 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect + golang.org/x/sys v0.25.0 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..2cc13b5 --- /dev/null +++ b/go.sum @@ -0,0 +1,30 @@ +github.com/bwmarrin/discordgo v0.28.1 h1:gXsuo2GBO7NbR6uqmrrBDplPUx2T3nzu775q/Rd1aG4= +github.com/bwmarrin/discordgo v0.28.1/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= +github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index db9a6b8..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew deleted file mode 100755 index 1b6c787..0000000 --- a/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/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/master/subprojects/plugins/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 - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${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 "$*" -} >&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 - 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" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - 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 - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# 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 deleted file mode 100644 index 107acd3..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/internal/app/commands/commands.go b/internal/app/commands/commands.go new file mode 100644 index 0000000..fa89937 --- /dev/null +++ b/internal/app/commands/commands.go @@ -0,0 +1,72 @@ +package commands + +import ( + "github.com/bwmarrin/discordgo" + "github.com/rs/zerolog/log" + "meteor-bot/internal/app/commands/help" + "meteor-bot/internal/app/commands/moderation" + "meteor-bot/internal/app/commands/silly" + "meteor-bot/internal/app/common" + "meteor-bot/internal/app/config" +) + +var ( + commands []*discordgo.ApplicationCommand + commandHandlers map[string]func(s *discordgo.Session, i *discordgo.InteractionCreate) + + registeredCommands []*discordgo.ApplicationCommand +) + +func Init(s *discordgo.Session) { + // Initialize the commands and handlers map + if commandHandlers == nil { + commandHandlers = make(map[string]func(s *discordgo.Session, i *discordgo.InteractionCreate)) + } + + // Initialize the commands and handlers + initCommands( + moderation.NewBanCommand(), + moderation.NewMuteCommand(), + moderation.NewUnmuteCommand(), + moderation.NewCloseCommand(), + help.NewFaqCommand(), + help.NewInstallationCommand(), + help.NewLogsCommand(), + help.NewOldVersionCommand(), + silly.NewCapyCommand(), + silly.NewCatCommand(), + silly.NewDogCommand(), + silly.NewMonkeyCommand(), + silly.NewPandaCommand(), + NewLinkCommand(), + NewStatsCommand(), + ) + + // Add the handlers to the Discord session + s.AddHandler(func(s *discordgo.Session, i *discordgo.InteractionCreate) { + if h, ok := commandHandlers[i.ApplicationCommandData().Name]; ok { + h(s, i) + } + }) + + // Register the commands to the Discord API + registerCommands(s) +} + +func initCommands(cmds ...common.Command) { + for _, cmd := range cmds { + commands = append(commands, cmd.Build()) + commandHandlers[cmd.Name()] = cmd.Handle + } +} + +// registerCommands registers the commands to the Discord API +func registerCommands(s *discordgo.Session) { + var err error + registeredCommands, err = s.ApplicationCommandBulkOverwrite(s.State.User.ID, config.GlobalConfig.GuildId, commands) + if err != nil { + log.Panic().Err(err).Msg("Cannot register commands") + } + + log.Info().Msgf("%d commands registered successfully", len(registeredCommands)) +} diff --git a/internal/app/commands/help/faq.go b/internal/app/commands/help/faq.go new file mode 100644 index 0000000..fe1330d --- /dev/null +++ b/internal/app/commands/help/faq.go @@ -0,0 +1,62 @@ +package help + +import ( + "fmt" + "github.com/bwmarrin/discordgo" + "meteor-bot/internal/app/common" +) + +type FaqCommand struct { + common.BaseCommand +} + +func NewFaqCommand() *FaqCommand { + return &FaqCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("faq"). + SetDescription("Tells someone to read the FAQ"). + Build(), + } +} + +func (c *FaqCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + Options: []*discordgo.ApplicationCommandOption{ + { + Name: "member", + Description: "The member to tell to read the FAQ", + Type: discordgo.ApplicationCommandOptionUser, + Required: true, + }, + }, + } +} + +func (c *FaqCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + targetMember := i.ApplicationCommandData().Options[0].UserValue(s) + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Embeds: []*discordgo.MessageEmbed{ + { + Title: "Read the FAQ", + Description: fmt.Sprintf("%s The FAQ answers your question, please read it.", targetMember.Mention()), + Color: common.EmbedColor, + }, + }, + Components: []discordgo.MessageComponent{ + discordgo.ActionsRow{ + Components: []discordgo.MessageComponent{ + discordgo.Button{ + Label: "FAQ", + Style: discordgo.LinkButton, + URL: "https://meteorclient.com/faq", + }, + }, + }, + }, + }, + }) +} diff --git a/internal/app/commands/help/installation.go b/internal/app/commands/help/installation.go new file mode 100644 index 0000000..e9eb754 --- /dev/null +++ b/internal/app/commands/help/installation.go @@ -0,0 +1,62 @@ +package help + +import ( + "fmt" + "github.com/bwmarrin/discordgo" + "meteor-bot/internal/app/common" +) + +type InstallationCommand struct { + common.BaseCommand +} + +func NewInstallationCommand() *InstallationCommand { + return &InstallationCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("installation"). + SetDescription("Tells someone to read the installation guide"). + Build(), + } +} + +func (c *InstallationCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + Options: []*discordgo.ApplicationCommandOption{ + { + Name: "member", + Description: "The member to tell to read the installation guide", + Type: discordgo.ApplicationCommandOptionUser, + Required: true, + }, + }, + } +} + +func (c *InstallationCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + targetMember := i.ApplicationCommandData().Options[0].UserValue(s) + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Embeds: []*discordgo.MessageEmbed{ + { + Title: "Read the Installation Guide", + Description: fmt.Sprintf("%s The installation guide answers your question, please read it.", targetMember.Mention()), + Color: common.EmbedColor, + }, + }, + Components: []discordgo.MessageComponent{ + discordgo.ActionsRow{ + Components: []discordgo.MessageComponent{ + discordgo.Button{ + Label: "Guide", + Style: discordgo.LinkButton, + URL: "https://meteorclient.com/faq/installation", + }, + }, + }, + }, + }, + }) +} diff --git a/internal/app/commands/help/logs.go b/internal/app/commands/help/logs.go new file mode 100644 index 0000000..b1b414e --- /dev/null +++ b/internal/app/commands/help/logs.go @@ -0,0 +1,62 @@ +package help + +import ( + "fmt" + "github.com/bwmarrin/discordgo" + "meteor-bot/internal/app/common" +) + +type LogsCommand struct { + common.BaseCommand +} + +func NewLogsCommand() *LogsCommand { + return &LogsCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("logs"). + SetDescription("Tells someone how to find the Minecraft logs"). + Build(), + } +} + +func (c *LogsCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + Options: []*discordgo.ApplicationCommandOption{ + { + Name: "member", + Description: "The member to tell how to find the Minecraft logs", + Type: discordgo.ApplicationCommandOptionUser, + Required: true, + }, + }, + } +} + +func (c *LogsCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + targetMember := i.ApplicationCommandData().Options[0].UserValue(s) + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Embeds: []*discordgo.MessageEmbed{ + { + Title: "Find the Minecraft Logs", + Description: fmt.Sprintf("%s The logs guide explains how to find and share your Minecraft logs, please read it.", targetMember.Mention()), + Color: common.EmbedColor, + }, + }, + Components: []discordgo.MessageComponent{ + discordgo.ActionsRow{ + Components: []discordgo.MessageComponent{ + discordgo.Button{ + Label: "Guide", + Style: discordgo.LinkButton, + URL: "https://meteorclient.com/faq/getting-log", + }, + }, + }, + }, + }, + }) +} diff --git a/internal/app/commands/help/oldversion.go b/internal/app/commands/help/oldversion.go new file mode 100644 index 0000000..b1eb916 --- /dev/null +++ b/internal/app/commands/help/oldversion.go @@ -0,0 +1,62 @@ +package help + +import ( + "fmt" + "github.com/bwmarrin/discordgo" + "meteor-bot/internal/app/common" +) + +type OldVersionCommand struct { + common.BaseCommand +} + +func NewOldVersionCommand() *OldVersionCommand { + return &OldVersionCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("old-versions"). + SetDescription("Tells someone how to play on older versions of Minecraft"). + Build(), + } +} + +func (c *OldVersionCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + Options: []*discordgo.ApplicationCommandOption{ + { + Name: "member", + Description: "The member to tell how to play on older versions of Minecraft", + Type: discordgo.ApplicationCommandOptionUser, + Required: true, + }, + }, + } +} + +func (c *OldVersionCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + targetMember := i.ApplicationCommandData().Options[0].UserValue(s) + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Embeds: []*discordgo.MessageEmbed{ + { + Title: "Old Versions Guide", + Description: fmt.Sprintf("%s The old version guide explains how to play on older versions of Minecraft, please read it.", targetMember.Mention()), + Color: common.EmbedColor, + }, + }, + Components: []discordgo.MessageComponent{ + discordgo.ActionsRow{ + Components: []discordgo.MessageComponent{ + discordgo.Button{ + Label: "Guide", + Style: discordgo.LinkButton, + URL: "https://meteorclient.com/faq/old-versions", + }, + }, + }, + }, + }, + }) +} diff --git a/internal/app/commands/link.go b/internal/app/commands/link.go new file mode 100644 index 0000000..2f60732 --- /dev/null +++ b/internal/app/commands/link.go @@ -0,0 +1,134 @@ +package commands + +import ( + "encoding/json" + "fmt" + "github.com/bwmarrin/discordgo" + "meteor-bot/internal/app/common" + "meteor-bot/internal/app/config" + "net/http" + "net/url" + "strings" +) + +type LinkCommand struct { + common.BaseCommand +} + +func NewLinkCommand() *LinkCommand { + return &LinkCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("link"). + SetDescription("Links your Discord account to your Meteor account"). + Build(), + } +} + +func (c *LinkCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + Options: []*discordgo.ApplicationCommandOption{ + { + Name: "token", + Description: "The token generated on the Meteor website", + Type: discordgo.ApplicationCommandOptionString, + Required: true, + ChannelTypes: []discordgo.ChannelType{discordgo.ChannelTypeDM}, + }, + }, + } +} + +func (c *LinkCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + // If this is not a DM, respond with an ephemeral message + if i.GuildID != "" { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "This command can only be used in DMs.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Get the token from the options + token := i.ApplicationCommandData().Options[0].StringValue() + if len(token) == 0 { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "You must provide a valid token.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // API request to link the Discord account + // TODO: make a util function for the request + userId := i.User.ID + req, err := http.NewRequest("POST", fmt.Sprintf("%s/account/linkDiscord", config.GlobalConfig.ApiBase), strings.NewReader(url.Values{ + "id": {userId}, + "token": {token}, + }.Encode())) + if err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to create request.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + req.Header.Set("Authorization", config.GlobalConfig.BackendToken) + + resp, err := http.DefaultClient.Do(req) + if err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to link your Discord account. Please try again later.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + defer resp.Body.Close() + + // Decode the response + var jsonResponse map[string]any + if err = json.NewDecoder(resp.Body).Decode(&jsonResponse); err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to decode the response.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Check for errors in response + if _, ok := jsonResponse["error"]; ok { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to link your Discord account. Try generating a new token by refreshing the account page and clicking the link button again.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Respond to the interaction + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Successfully linked your Discord account.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) +} diff --git a/internal/app/commands/moderation/ban.go b/internal/app/commands/moderation/ban.go new file mode 100644 index 0000000..05e73af --- /dev/null +++ b/internal/app/commands/moderation/ban.go @@ -0,0 +1,75 @@ +package moderation + +import ( + "fmt" + "github.com/bwmarrin/discordgo" + "meteor-bot/internal/app/common" +) + +type BanCommand struct { + common.BaseCommand +} + +func NewBanCommand() *BanCommand { + return &BanCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("ban"). + SetDescription("Bans a member"). + Build(), + } +} + +func (c *BanCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + DefaultMemberPermissions: &common.BanMemberPermission, + Options: []*discordgo.ApplicationCommandOption{ + { + Name: "member", + Description: "The member to ban", + Type: discordgo.ApplicationCommandOptionUser, + Required: true, + }, + }, + } +} + +func (c *BanCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + if i.Member.Permissions&common.BanMemberPermission != common.BanMemberPermission { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "You do not have the required permissions to ban members.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + targetMember := i.ApplicationCommandData().Options[0].UserValue(s) + if err := s.GuildBanCreate(i.GuildID, targetMember.ID, 0); err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "An error occurred while banning the member.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Respond to the interaction + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Embeds: []*discordgo.MessageEmbed{ + { + Title: "Member Banned", + Description: fmt.Sprintf("Banned %s.", targetMember.Mention()), + Color: common.EmbedColor, + }, + }, + }, + }) +} diff --git a/internal/app/commands/moderation/close.go b/internal/app/commands/moderation/close.go new file mode 100644 index 0000000..0928eb4 --- /dev/null +++ b/internal/app/commands/moderation/close.go @@ -0,0 +1,93 @@ +package moderation + +import ( + "github.com/bwmarrin/discordgo" + "meteor-bot/internal/app/common" +) + +type CloseCommand struct { + common.BaseCommand +} + +func NewCloseCommand() *CloseCommand { + return &CloseCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("close"). + SetDescription("Locks the current forum post"). + Build(), + } +} + +func (c *CloseCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + DefaultMemberPermissions: &common.ManageThreadsPermission, + } +} + +func (c *CloseCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + if i.Member.Permissions&common.ManageThreadsPermission != common.ManageThreadsPermission { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "You do not have the required permissions to close threads.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Check if the command was used in a forum channel + channel, err := s.State.Channel(i.ChannelID) + if err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "An error occurred while fetching the channel.", + }, + }) + return + } + if channel.Type != discordgo.ChannelTypeGuildForum { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "This command can only be used in forum channels.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + locked := true + archived := true + _, err = s.ChannelEdit(i.ChannelID, &discordgo.ChannelEdit{ + Locked: &locked, + Archived: &archived, + }) + if err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "An error occurred while closing the thread.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Respond to the interaction + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Embeds: []*discordgo.MessageEmbed{ + { + Title: "Thread Closed", + Description: "This thread is now locked.", + Color: common.EmbedColor, + }, + }, + }, + }) +} diff --git a/internal/app/commands/moderation/mute.go b/internal/app/commands/moderation/mute.go new file mode 100644 index 0000000..7a0b057 --- /dev/null +++ b/internal/app/commands/moderation/mute.go @@ -0,0 +1,191 @@ +package moderation + +import ( + "errors" + "fmt" + "github.com/bwmarrin/discordgo" + "meteor-bot/internal/app/common" + "regexp" + "strconv" + "time" +) + +type MuteCommand struct { + common.BaseCommand +} + +func NewMuteCommand() *MuteCommand { + return &MuteCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("mute"). + SetDescription("Mutes a member"). + Build(), + } +} + +func (c *MuteCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + DefaultMemberPermissions: &common.ModerateMembersPermission, + Options: []*discordgo.ApplicationCommandOption{ + { + Name: "member", + Description: "The member to mute", + Type: discordgo.ApplicationCommandOptionUser, + Required: true, + }, + { + Name: "duration", + Description: "The duration of the mute", + Type: discordgo.ApplicationCommandOptionString, + Required: true, + }, + { + Name: "reason", + Description: "The reason for the mute", + Type: discordgo.ApplicationCommandOptionString, + Required: false, + }, + }, + } +} + +func (c *MuteCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + if i.Member.Permissions&common.ModerateMembersPermission != common.ModerateMembersPermission { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "You do not have the required permissions to mute members.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + targetMember := i.ApplicationCommandData().Options[0].UserValue(s) + durationStr := i.ApplicationCommandData().Options[1].StringValue() + duration, err := parseDuration(durationStr) + if err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Invalid duration format. Please use the format `1s`, `1m`, `1h`, `1d`, or `1w`.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Fetch optional arguments + reason := "Reason unspecified" + for _, opt := range i.ApplicationCommandData().Options { + if opt.Name == "reason" { + reason = opt.StringValue() + break + } + } + + targetGuildMember, err := s.GuildMember(targetMember.ID, i.GuildID) + if err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "An error occurred while fetching the member.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Check if the member is already muted + if targetGuildMember.CommunicationDisabledUntil != nil && targetGuildMember.CommunicationDisabledUntil.After(time.Now()) { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Member is already muted.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Check if the target member cannot be muted + if targetGuildMember.Permissions&common.ModerateMembersPermission == common.ModerateMembersPermission { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "You do not have the required permissions to mute this member.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Mute the member + muteUntil := time.Now().Add(duration) + err = s.GuildMemberTimeout(i.GuildID, targetMember.ID, &muteUntil, discordgo.WithAuditLogReason(reason)) + if err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "An error occurred while muting the member.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Respond to the interaction + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Embeds: []*discordgo.MessageEmbed{ + { + Title: "Member Muted", + Description: fmt.Sprintf("Muted %s for %s.", targetMember.Mention(), durationStr), + Color: common.EmbedColor, + }, + }, + }, + }) + +} + +// parseDuration parses the duration string and return the time.Duration value +func parseDuration(durationStr string) (time.Duration, error) { + re := regexp.MustCompile(`^(\d+)([smhdw])$`) + matches := re.FindStringSubmatch(durationStr) + if matches == nil { + return 0, errors.New("invalid duration format") + } + + value, err := strconv.Atoi(matches[1]) + if err != nil || value <= 0 { + return 0, errors.New("invalid duration value") + } + + unit := matches[2] + var duration time.Duration + switch unit { + case "s": + duration = time.Duration(value) * time.Second + case "m": + duration = time.Duration(value) * time.Minute + case "h": + duration = time.Duration(value) * time.Hour + case "d": + duration = time.Duration(value) * 24 * time.Hour + case "w": + duration = time.Duration(value) * 7 * 24 * time.Hour + default: + return 0, errors.New("invalid duration unit") + } + + // Check if the duration is within the allowed range + if duration > 2419200*time.Second { + return 0, errors.New("duration exceeds the maximum allowed value of 4 weeks") + } + + return duration, nil +} diff --git a/internal/app/commands/moderation/unmute.go b/internal/app/commands/moderation/unmute.go new file mode 100644 index 0000000..610942e --- /dev/null +++ b/internal/app/commands/moderation/unmute.go @@ -0,0 +1,102 @@ +package moderation + +import ( + "fmt" + "github.com/bwmarrin/discordgo" + "meteor-bot/internal/app/common" + "time" +) + +type UnmuteCommand struct { + common.BaseCommand +} + +func NewUnmuteCommand() *UnmuteCommand { + return &UnmuteCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("unmute"). + SetDescription("Unmutes a member"). + Build(), + } +} + +func (c *UnmuteCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + DefaultMemberPermissions: &common.ModerateMembersPermission, + Options: []*discordgo.ApplicationCommandOption{ + { + Name: "member", + Description: "The member to unmute", + Type: discordgo.ApplicationCommandOptionUser, + Required: true, + }, + }, + } +} + +func (c *UnmuteCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + if i.Member.Permissions&common.ModerateMembersPermission != common.ModerateMembersPermission { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "You do not have the required permissions to unmute members.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + targetMember := i.ApplicationCommandData().Options[0].UserValue(s) + targetGuildMember, err := s.GuildMember(targetMember.ID, i.GuildID) + if err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "An error occurred while fetching the member.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Check if the member is not muted, if so, return + if targetGuildMember.CommunicationDisabledUntil == nil || targetGuildMember.CommunicationDisabledUntil.Before(time.Now()) { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Member is not muted.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Unmute the member + err = s.GuildMemberTimeout(i.GuildID, targetMember.ID, nil) + if err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "An error occurred while unmuting the member.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Respond to the interaction + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Embeds: []*discordgo.MessageEmbed{ + { + Title: "Member Unmuted", + Description: fmt.Sprintf("Unmuted %s.", targetMember.Mention()), + Color: common.EmbedColor, + }, + }, + }, + }) +} diff --git a/internal/app/commands/silly/capy.go b/internal/app/commands/silly/capy.go new file mode 100644 index 0000000..24af344 --- /dev/null +++ b/internal/app/commands/silly/capy.go @@ -0,0 +1,89 @@ +package silly + +import ( + "encoding/json" + "github.com/bwmarrin/discordgo" + "meteor-bot/internal/app/common" + "net/http" +) + +type CapyCommand struct { + common.BaseCommand +} + +func NewCapyCommand() *CapyCommand { + return &CapyCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("capybara"). + SetDescription("pulls up"). + Build(), + } +} + +func (c *CapyCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + } +} + +func (c *CapyCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + // Fetch the capybara image + resp, err := http.Get("https://api.capy.lol/v1/capybara?json=true") + if err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to fetch capybara image", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + defer resp.Body.Close() + + // Decode the response + var jsonResponse map[string]any + if err = json.NewDecoder(resp.Body).Decode(&jsonResponse); err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to decode the response", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Extract the image URL + data, ok := jsonResponse["data"].(map[string]any) + if !ok { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to parse the response", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + url, ok := data["url"].(string) + if !ok { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to parse the response", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Respond to the interaction + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: url, + }, + }) +} diff --git a/internal/app/commands/silly/cat.go b/internal/app/commands/silly/cat.go new file mode 100644 index 0000000..4295150 --- /dev/null +++ b/internal/app/commands/silly/cat.go @@ -0,0 +1,78 @@ +package silly + +import ( + "encoding/json" + "github.com/bwmarrin/discordgo" + "meteor-bot/internal/app/common" + "net/http" +) + +type CatCommand struct { + common.BaseCommand +} + +func NewCatCommand() *CatCommand { + return &CatCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("cat"). + SetDescription("gato"). + Build(), + } +} + +func (c *CatCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + } +} + +func (c *CatCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + // Fetch the cat image + resp, err := http.Get("https://some-random-api.com/img/cat") + if err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to fetch cat image", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + defer resp.Body.Close() + + // Decode the response + var jsonResponse map[string]any + if err = json.NewDecoder(resp.Body).Decode(&jsonResponse); err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to decode the response", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Extract the image URL + url, ok := jsonResponse["link"].(string) + if !ok { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to parse the response", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Respond to the interaction + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: url, + }, + }) +} diff --git a/internal/app/commands/silly/dog.go b/internal/app/commands/silly/dog.go new file mode 100644 index 0000000..7af67fe --- /dev/null +++ b/internal/app/commands/silly/dog.go @@ -0,0 +1,78 @@ +package silly + +import ( + "encoding/json" + "github.com/bwmarrin/discordgo" + "meteor-bot/internal/app/common" + "net/http" +) + +type DogCommand struct { + common.BaseCommand +} + +func NewDogCommand() *DogCommand { + return &DogCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("dog"). + SetDescription("dawg"). + Build(), + } +} + +func (c *DogCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + } +} + +func (c *DogCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + // Fetch the dog image + resp, err := http.Get("https://some-random-api.com/img/dog") + if err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to fetch dog image", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + defer resp.Body.Close() + + // Decode the response + var jsonResponse map[string]any + if err = json.NewDecoder(resp.Body).Decode(&jsonResponse); err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to decode the response", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Extract the image URL + url, ok := jsonResponse["link"].(string) + if !ok { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to parse the response", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Respond to the interaction + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: url, + }, + }) +} diff --git a/internal/app/commands/silly/monkey.go b/internal/app/commands/silly/monkey.go new file mode 100644 index 0000000..71edb2e --- /dev/null +++ b/internal/app/commands/silly/monkey.go @@ -0,0 +1,42 @@ +package silly + +import ( + "fmt" + "github.com/bwmarrin/discordgo" + "math/rand" + "meteor-bot/internal/app/common" +) + +type MonkeyCommand struct { + common.BaseCommand +} + +func NewMonkeyCommand() *MonkeyCommand { + return &MonkeyCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("monkey"). + SetDescription("monke"). + Build(), + } +} + +func (c *MonkeyCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + } +} + +func (c *MonkeyCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + w := rand.Intn(801) + 200 + h := rand.Intn(801) + 200 + + url := fmt.Sprintf("https://www.placemonkeys.com/%d/%d?random", w, h) + + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: url, + }, + }) +} diff --git a/internal/app/commands/silly/panda.go b/internal/app/commands/silly/panda.go new file mode 100644 index 0000000..0b02e5a --- /dev/null +++ b/internal/app/commands/silly/panda.go @@ -0,0 +1,84 @@ +package silly + +import ( + "encoding/json" + "github.com/bwmarrin/discordgo" + "math/rand" + "meteor-bot/internal/app/common" + "net/http" +) + +type PandaCommand struct { + common.BaseCommand +} + +func NewPandaCommand() *PandaCommand { + return &PandaCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("panda"). + SetDescription("funny thing"). + Build(), + } +} + +func (c *PandaCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + } +} + +func (c *PandaCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + animal := "panda" + if rand.Intn(2) == 0 { + animal = "red_panda" + } + + // Fetch the panda image + resp, err := http.Get("https://some-random-api.com/img/" + animal) + if err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to fetch panda image", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + defer resp.Body.Close() + + // Decode the response + var jsonResponse map[string]any + if err = json.NewDecoder(resp.Body).Decode(&jsonResponse); err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to decode the response", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Extract the image URL + url, ok := jsonResponse["link"].(string) + if !ok { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to parse the response", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Respond to the interaction + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: url, + }, + }) +} diff --git a/internal/app/commands/stats.go b/internal/app/commands/stats.go new file mode 100644 index 0000000..989d20a --- /dev/null +++ b/internal/app/commands/stats.go @@ -0,0 +1,126 @@ +package commands + +import ( + "encoding/json" + "fmt" + "github.com/bwmarrin/discordgo" + "meteor-bot/internal/app/common" + "meteor-bot/internal/app/config" + "net/http" + "regexp" + "time" +) + +type StatsCommand struct { + common.BaseCommand +} + +func NewStatsCommand() *StatsCommand { + return &StatsCommand{ + BaseCommand: *common.NewCommandBuilder(). + SetName("stats"). + SetDescription("Shows various stats about Meteor"). + Build(), + } +} + +func (c *StatsCommand) Build() *discordgo.ApplicationCommand { + return &discordgo.ApplicationCommand{ + Name: c.Name(), + Description: c.Description(), + Options: []*discordgo.ApplicationCommandOption{ + { + Name: "date", + Description: "The date to fetch the stats for", + Type: discordgo.ApplicationCommandOptionString, + Required: false, + }, + }, + } +} + +func (c *StatsCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { + // Fetch optional arguments + date := time.Now().Format("02-01-2006") + for _, opt := range i.ApplicationCommandData().Options { + if opt.Name == "date" { + dateValue := opt.StringValue() + if dateValue != "" { + if !regexp.MustCompile(`\d{2}-\d{2}-\d{4}`).MatchString(dateValue) { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Invalid date format. Please use DD-MM-YYYY.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + date = dateValue + } + break + } + } + + // Fetch the stats for the given date + // TODO: make a util function for the request + resp, err := http.Get(fmt.Sprintf("%s/stats?date=%s", config.GlobalConfig.ApiBase, date)) + if err != nil || resp.StatusCode != http.StatusOK { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to fetch stats for this date.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + defer resp.Body.Close() + + // Decode the response + var jsonResponse map[string]any + if err = json.NewDecoder(resp.Body).Decode(&jsonResponse); err != nil { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to decode the response.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Check for errors in response + if _, ok := jsonResponse["error"]; ok { + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: "Failed to fetch stats for this date.", + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + return + } + + // Parse the response + respDate := jsonResponse["date"].(string) + joins := int(jsonResponse["joins"].(float64)) + leaves := int(jsonResponse["leaves"].(float64)) + gained := joins - leaves + downloads := int(jsonResponse["downloads"].(float64)) + + // Respond to the interaction + content := fmt.Sprintf("**Date**: %s\n**Joins**: %d\n**Leaves**: %d\n**Gained**: %d\n**Downloads**: %d", respDate, joins, leaves, gained, downloads) + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Embeds: []*discordgo.MessageEmbed{ + { + Title: "Meteor Stats", + Description: content, + Color: common.EmbedColor, + }, + }, + }, + }) +} diff --git a/internal/app/common/command.go b/internal/app/common/command.go new file mode 100644 index 0000000..6e2fa28 --- /dev/null +++ b/internal/app/common/command.go @@ -0,0 +1,50 @@ +package common + +import ( + dg "github.com/bwmarrin/discordgo" + "github.com/rs/zerolog/log" +) + +var ( + ModerateMembersPermission int64 = dg.PermissionModerateMembers + BanMemberPermission int64 = dg.PermissionBanMembers + ManageThreadsPermission int64 = dg.PermissionManageThreads + + EmbedColor = 0x913de2 +) + +// Command interface for all slash commands +type Command interface { + Name() string // Returns the name of the command + Description() string // Returns the description of the command + Build() *dg.ApplicationCommand // Builds the command + Handle(s *dg.Session, i *dg.InteractionCreate) // Func called when command is triggered + HandleInteractionRespond(s *dg.Session, i *dg.InteractionCreate, resp *dg.InteractionResponse) +} + +/* +BaseCommand struct that all commands should embed +This provides default implementations for the Command interface +*/ +type BaseCommand struct { + name string + description string +} + +func (c *BaseCommand) Name() string { + return c.name +} + +func (c *BaseCommand) Description() string { + return c.description +} + +/* +HandleInteractionRespond responds with the given response and logs the error if there is one +Wraps the discordgo.Session#InteractionRespond function +*/ +func (c *BaseCommand) HandleInteractionRespond(s *dg.Session, i *dg.InteractionCreate, resp *dg.InteractionResponse) { + if err := s.InteractionRespond(i.Interaction, resp); err != nil { + log.Error().Err(err).Msg("Error responding to interaction") + } +} diff --git a/internal/app/common/commandbuilder.go b/internal/app/common/commandbuilder.go new file mode 100644 index 0000000..74ba32b --- /dev/null +++ b/internal/app/common/commandbuilder.go @@ -0,0 +1,28 @@ +package common + +// CommandBuilder struct to build a BaseCommand +type CommandBuilder struct { + name string + description string +} + +func NewCommandBuilder() *CommandBuilder { + return &CommandBuilder{} +} + +func (b *CommandBuilder) SetName(name string) *CommandBuilder { + b.name = name + return b +} + +func (b *CommandBuilder) SetDescription(description string) *CommandBuilder { + b.description = description + return b +} + +func (b *CommandBuilder) Build() *BaseCommand { + return &BaseCommand{ + name: b.name, + description: b.description, + } +} diff --git a/internal/app/config/config.go b/internal/app/config/config.go new file mode 100644 index 0000000..21bbd37 --- /dev/null +++ b/internal/app/config/config.go @@ -0,0 +1,42 @@ +package config + +import ( + "github.com/joho/godotenv" + "github.com/rs/zerolog/log" + "os" +) + +// GlobalConfig holds the environment variables required for the bot to run +var GlobalConfig Env + +type Env struct { + DiscordToken string // Discord bot token + ApiBase string // Base URL for the API + BackendToken string // Backend token + ApplicationId string // ID of the application + GuildId string // ID of the guild where the bot is running + CopeNnId string // ID of the CopeNN emoji + MemberCountId string // ID of the member count channel + DownloadCountId string // ID of the download count channel + UptimeUrl string // URL for the uptime monitor + EnableLogFile bool // Enable logging to a file +} + +func init() { + if err := godotenv.Load(); err != nil { + log.Warn().Err(err).Msg("Error loading .env file") + } + + GlobalConfig = Env{ + DiscordToken: os.Getenv("DISCORD_TOKEN"), + ApiBase: os.Getenv("API_BASE"), + BackendToken: os.Getenv("BACKEND_TOKEN"), + ApplicationId: os.Getenv("APPLICATION_ID"), + GuildId: os.Getenv("GUILD_ID"), + CopeNnId: os.Getenv("COPE_NN_ID"), + MemberCountId: os.Getenv("MEMBER_COUNT_ID"), + DownloadCountId: os.Getenv("DOWNLOAD_COUNT_ID"), + UptimeUrl: os.Getenv("UPTIME_URL"), + EnableLogFile: os.Getenv("ENABLE_LOG_FILE") == "true", + } +} diff --git a/internal/app/config/logger.go b/internal/app/config/logger.go new file mode 100644 index 0000000..6bccb80 --- /dev/null +++ b/internal/app/config/logger.go @@ -0,0 +1,45 @@ +package config + +import ( + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + "os" + "path" +) + +// logFile is the file to write logs to +var logFile *os.File + +func init() { + zerolog.TimeFieldFormat = zerolog.TimeFormatUnix + + if GlobalConfig.EnableLogFile { + var err error + logFile, err = os.OpenFile( + path.Join("logs", "meteor-bot.log"), + os.O_APPEND|os.O_CREATE|os.O_WRONLY, + 0664, + ) + if err != nil { + log.Panic().Err(err).Msg("Failed to open log file") + } + + consoleWriter := zerolog.ConsoleWriter{Out: os.Stdout} + multi := zerolog.MultiLevelWriter(consoleWriter, logFile) + + // Set the default logger to write to both console and file + log.Logger = zerolog.New(multi).With().Timestamp().Logger() + } else { + log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout}) + } + log.Debug().Msg("Logger initialized") +} + +// CloseLogFile closes the log file +func CloseLogFile() { + if logFile != nil { + if err := logFile.Close(); err != nil { + log.Error().Err(err).Msg("Failed to close log file") + } + } +} diff --git a/internal/app/events/events.go b/internal/app/events/events.go new file mode 100644 index 0000000..730f2ea --- /dev/null +++ b/internal/app/events/events.go @@ -0,0 +1,320 @@ +package events + +import ( + "context" + "encoding/json" + "errors" + "fmt" + "github.com/bwmarrin/discordgo" + "github.com/rs/zerolog/log" + "math" + "meteor-bot/internal/app/config" + "net/http" + "strconv" + "strings" + "sync/atomic" + "time" +) + +const ( + // infoChannel update period + updatePeriod = 6 * time.Minute +) + +var ( + // Can and must be set only in discordgo.Ready handlers + guild *discordgo.Guild + + // hello event + greetings = []string{"hi", "hello", "howdy", "bonjour", "ciao", "hej", "hola", "yo"} + copeEmoji *discordgo.Emoji + + // infoChannel event + suffixes = []string{"k", "m", "b", "t"} + delay int64 + + // metrics event + metricsServer *http.Server +) + +func Init(s *discordgo.Session) { + registerEventHandlers(s) +} + +// registerEventHandlers registers non-command event handlers to the Discord session +func registerEventHandlers(s *discordgo.Session) { + var err error + if config.GlobalConfig.CopeNnId != "" { + copeEmoji, err = applicationEmoji(s, config.GlobalConfig.ApplicationId, config.GlobalConfig.CopeNnId) + if err != nil { + log.Error().Err(err).Msg("Failed to get emoji") + } + } else { + log.Warn().Msg("CopeNnId is not set, skipping emoji fetch") + } + + s.AddHandler(helloHandler) + s.AddHandler(userJoinedHandler) + s.AddHandler(userLeftHandler) + s.AddHandler(botStartHandler) + s.AddHandler(uptimeReadyHandler) + s.AddHandler(infoChannelHandler) + s.AddHandler(metricsReadyHandler) + s.AddHandler(metricsDisconnectHandler) + + log.Info().Msg("Events registered successfully.") +} + +// helloHandler handles the event when the bot is mentioned +func helloHandler(s *discordgo.Session, m *discordgo.MessageCreate) { + // ignore self messages + if m.Author.ID == s.State.User.ID { + return + } + + // Check if the message is from a text channel and the bot is mentioned + if m.GuildID != config.GlobalConfig.GuildId || !strings.Contains(m.Content, s.State.User.Mention()) { + return + } + + // Check if the message contains a greeting + for _, greeting := range greetings { + if strings.Contains(strings.ToLower(m.Content), greeting) { + _, _ = s.ChannelMessageSendReply(m.ChannelID, greeting+" :)", m.Reference()) + return + } + } + + if strings.Contains(strings.ToLower(m.Content), "cope") && copeEmoji != nil { + _ = s.MessageReactionAdd(m.ChannelID, m.ID, copeEmoji.APIName()) + } else { + _ = s.MessageReactionAdd(m.ChannelID, m.ID, "👋") + } +} + +// userJoinedHandler handles the event when a user joins the server +func userJoinedHandler(_ *discordgo.Session, m *discordgo.GuildMemberAdd) { + if config.GlobalConfig.BackendToken == "" { + return + } + + // POST request to the backend + req, err := http.NewRequest("POST", config.GlobalConfig.ApiBase+"/discord/userJoined?id="+m.User.ID, nil) + if err != nil { + log.Error().Err(err).Msg("Failed to create request") + return + } + req.Header.Set("Authorization", config.GlobalConfig.BackendToken) + + resp, err := http.DefaultClient.Do(req) + if err != nil { + log.Error().Err(err).Msg("Failed to send request") + return + } + defer resp.Body.Close() +} + +// userLeftHandler handles the event when a user leaves the server +func userLeftHandler(_ *discordgo.Session, m *discordgo.GuildMemberRemove) { + if config.GlobalConfig.BackendToken == "" { + return + } + + // POST request to the backend + req, err := http.NewRequest("POST", config.GlobalConfig.ApiBase+"/discord/userLeft?id="+m.User.ID, nil) + if err != nil { + log.Error().Err(err).Msg("Failed to create request") + return + } + req.Header.Set("Authorization", config.GlobalConfig.BackendToken) + + resp, err := http.DefaultClient.Do(req) + if err != nil { + log.Error().Err(err).Msg("Failed to send request") + return + } + defer resp.Body.Close() +} + +// botStartHandler sets up the bot status +func botStartHandler(s *discordgo.Session, _ *discordgo.Ready) { + if err := s.UpdateGameStatus(0, "Meteor Client"); err != nil { + log.Warn().Err(err).Msg("Failed to set game status") + } + log.Info().Msgf("Logged in as: %v#%v", s.State.User.Username, s.State.User.Discriminator) +} + +// uptimeReadyHandler sends an uptime request to the configured URL every 60 seconds +func uptimeReadyHandler(s *discordgo.Session, _ *discordgo.Ready) { + if config.GlobalConfig.UptimeUrl == "" { + log.Warn().Msg("Uptime URL not set, uptime requests will not be made") + return + } + + // Send an uptime request every 60 seconds + ticker := time.NewTicker(60 * time.Second) + go func() { + for { + select { + case <-ticker.C: + url := config.GlobalConfig.UptimeUrl + if strings.HasSuffix(url, "ping=") { + url += fmt.Sprintf("%d", s.HeartbeatLatency().Milliseconds()) + } + + resp, err := http.Get(url) + if err != nil { + log.Error().Err(err).Msg("Failed to send uptime request") + } else { + resp.Body.Close() + } + } + } + }() +} + +// infoChannelHandler updates the member count and download count channels +func infoChannelHandler(s *discordgo.Session, _ *discordgo.Ready) { + var err error + guild, err = s.Guild(config.GlobalConfig.GuildId) + if err != nil || guild == nil { + log.Warn().Msg("Guild not set, info channels will not be updated") + return + } + + if config.GlobalConfig.MemberCountId == "" || config.GlobalConfig.DownloadCountId == "" { + log.Warn().Msg("Member count or download count channel IDs not set, info channels will not be updated") + return + } + + memberCountChannel, err := s.Channel(config.GlobalConfig.MemberCountId) + if err != nil || memberCountChannel == nil { + log.Warn().Err(err).Msg("Failed to get member count channel") + return + } + + downloadCountChannel, err := s.Channel(config.GlobalConfig.DownloadCountId) + if err != nil || downloadCountChannel == nil { + log.Warn().Err(err).Msg("Failed to get download count channel") + return + } + + updateChannel(s, downloadCountChannel, func() int64 { + resp, err := http.Get(config.GlobalConfig.ApiBase + "/stats") + if err != nil { + log.Error().Err(err).Msg("Failed to fetch download stats") + return 0 + } + defer resp.Body.Close() + + var stats map[string]any + if err := json.NewDecoder(resp.Body).Decode(&stats); err != nil { + log.Error().Err(err).Msg("Failed to parse download stats") + return 0 + } + + return stats["downloads"].(int64) + }) + + updateChannel(s, memberCountChannel, func() int64 { + return int64(guild.MemberCount) + }) +} + +// metricsReadyHandler starts the metrics server +func metricsReadyHandler(s *discordgo.Session, _ *discordgo.Ready) { + var err error + guild, err = s.Guild(config.GlobalConfig.GuildId) + if err != nil || guild == nil { + log.Warn().Msg("Guild not set, metrics server will not be started") + return + } + + http.HandleFunc("/metrics", onRequest) + metricsServer = &http.Server{Addr: ":9400"} + + go func() { + if err := metricsServer.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) { + log.Panic().Err(err).Msg("Failed to start metrics server") + } + }() + + log.Info().Msg("Providing metrics on :9400/metrics") +} + +// metricsDisconnectHandler shuts down the metrics server when the bot disconnects +func metricsDisconnectHandler(_ *discordgo.Session, _ *discordgo.Disconnect) { + if metricsServer != nil { + if err := metricsServer.Shutdown(context.Background()); err != nil { + log.Error().Err(err).Msg("Failed to shutdown metrics server") + } else { + log.Info().Msg("Metrics server shutdown gracefully") + } + } +} + +// applicationEmoji fetches an emoji from the application +func applicationEmoji(s *discordgo.Session, applicationID string, emojiID string, options ...discordgo.RequestOption) (emoji *discordgo.Emoji, err error) { + var body []byte + body, err = s.RequestWithBucketID("GET", discordgo.EndpointApplication(applicationID)+"/emojis/"+emojiID, nil, discordgo.EndpointApplication(applicationID), options...) + if err != nil { + return + } + + err = discordgo.Unmarshal(body, &emoji) + return +} + +// updateChannel updates the channel name with the given supplier function +func updateChannel(s *discordgo.Session, channel *discordgo.Channel, supplier func() int64) { + atomic.AddInt64(&delay, int64(updatePeriod/2)) + + go func() { + ticker := time.NewTicker(updatePeriod) + defer ticker.Stop() + + for { + select { + case <-ticker.C: + name := channel.Name + newName := fmt.Sprintf("%s %s", name[:strings.LastIndex(name, ":")+1], formatLong(supplier())) + _, err := s.ChannelEdit(channel.ID, &discordgo.ChannelEdit{Name: newName}) + if err != nil { + log.Error().Err(err).Msg("Failed to update channel name") + } + } + } + }() +} + +// formatLong formats a long number into a human-readable string +func formatLong(value int64) string { + if value < 1000 { + return strconv.FormatInt(value, 10) + } + + exponent := int(math.Log10(float64(value)) / 3) + if exponent > len(suffixes) { + exponent = len(suffixes) + } + + base := math.Pow(1000, float64(exponent)) + first := float64(value) / base + return fmt.Sprintf("%.2f%s", first, suffixes[exponent-1]) +} + +// onRequest handles the metrics request +func onRequest(w http.ResponseWriter, _ *http.Request) { + response := fmt.Sprintf( + `# HELP meteor_discord_users_total Total number of Discord users in our server +# TYPE meteor_discord_users_total gauge +meteor_discord_users_total %d`, + guild.MemberCount) + + w.Header().Set("Content-Type", "text/plain") + w.WriteHeader(http.StatusOK) + _, err := w.Write([]byte(response)) + if err != nil { + log.Error().Err(err).Msg("Failed to write response") + } +} diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index fd572fe..0000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'meteor-bot' - diff --git a/src/main/java/org/meteordev/meteorbot/Env.java b/src/main/java/org/meteordev/meteorbot/Env.java deleted file mode 100644 index 08752fd..0000000 --- a/src/main/java/org/meteordev/meteorbot/Env.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.meteordev.meteorbot; - -public enum Env { - DISCORD_TOKEN("DISCORD_TOKEN"), - API_BASE("API_BASE"), - BACKEND_TOKEN("BACKEND_TOKEN"), - GUILD_ID("GUILD_ID"), - COPE_NN_ID("COPE_NN_ID"), - MEMBER_COUNT_ID("MEMBER_COUNT_ID"), - DOWNLOAD_COUNT_ID("DOWNLOAD_COUNT_ID"), - UPTIME_URL("UPTIME_URL"); - - public final String value; - - Env(String key) { - this.value = System.getenv(key); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/InfoChannels.java b/src/main/java/org/meteordev/meteorbot/InfoChannels.java deleted file mode 100644 index 77c551a..0000000 --- a/src/main/java/org/meteordev/meteorbot/InfoChannels.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.meteordev.meteorbot; - -import net.dv8tion.jda.api.entities.Guild; -import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel; -import net.dv8tion.jda.api.events.session.ReadyEvent; -import net.dv8tion.jda.api.hooks.ListenerAdapter; - -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.function.LongSupplier; - -public class InfoChannels extends ListenerAdapter { - private static final int UPDATE_PERIOD = 6; - private static int delay; - - @Override - public void onReady(ReadyEvent event) { - Guild guild = event.getJDA().getGuildById(Env.GUILD_ID.value); - if (guild == null) { - MeteorBot.LOG.warn("Failed to fetch guild when initialising info channels."); - return; - } - - if (Env.MEMBER_COUNT_ID.value == null || Env.DOWNLOAD_COUNT_ID.value == null) { - MeteorBot.LOG.warn("Must define info channel id's for them to function."); - return; - } - - VoiceChannel memberCount = guild.getVoiceChannelById(Env.MEMBER_COUNT_ID.value); - VoiceChannel downloads = guild.getVoiceChannelById(Env.DOWNLOAD_COUNT_ID.value); - if (memberCount == null || downloads == null) { - MeteorBot.LOG.warn("Failed to fetch channels when initialising info channels."); - return; - } - - updateChannel(downloads, () -> Utils.apiGet("stats").asJson().getBody().getObject().getLong("downloads")); - updateChannel(memberCount, guild::getMemberCount); - } - - private static void updateChannel(VoiceChannel channel, LongSupplier supplier) { - Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(() -> { - String name = channel.getName(); - name = "%s %s".formatted(name.substring(0, name.lastIndexOf(':') + 1), Utils.formatLong(supplier.getAsLong())); - channel.getManager().setName(name).complete(); - }, delay, UPDATE_PERIOD, TimeUnit.MINUTES); - - delay += UPDATE_PERIOD / 2; - } -} diff --git a/src/main/java/org/meteordev/meteorbot/MeteorBot.java b/src/main/java/org/meteordev/meteorbot/MeteorBot.java deleted file mode 100644 index 11d0917..0000000 --- a/src/main/java/org/meteordev/meteorbot/MeteorBot.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.meteordev.meteorbot; - -import net.dv8tion.jda.api.JDA; -import net.dv8tion.jda.api.JDABuilder; -import net.dv8tion.jda.api.entities.Activity; -import net.dv8tion.jda.api.entities.Guild; -import net.dv8tion.jda.api.entities.channel.ChannelType; -import net.dv8tion.jda.api.entities.emoji.Emoji; -import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji; -import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent; -import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent; -import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import net.dv8tion.jda.api.events.session.ReadyEvent; -import net.dv8tion.jda.api.hooks.ListenerAdapter; -import net.dv8tion.jda.api.requests.GatewayIntent; -import net.dv8tion.jda.api.utils.cache.CacheFlag; -import net.dv8tion.jda.internal.utils.JDALogger; -import org.jetbrains.annotations.NotNull; -import org.meteordev.meteorbot.command.Commands; -import org.slf4j.Logger; - -public class MeteorBot extends ListenerAdapter { - private static final String[] HELLOS = {"hi", "hello", "howdy", "bonjour", "ciao", "hej", "hola", "yo"}; - - public static final Logger LOG = JDALogger.getLog("Meteor Bot"); - - private Guild server; - private RichCustomEmoji copeEmoji; - - public static void main(String[] args) { - String token = Env.DISCORD_TOKEN.value; - if (token == null) { - MeteorBot.LOG.error("Must specify discord bot token."); - return; - } - - JDABuilder.createDefault(token) - .enableIntents(GatewayIntent.GUILD_MEMBERS, GatewayIntent.MESSAGE_CONTENT) - .enableCache(CacheFlag.EMOJI) - .addEventListeners(new MeteorBot(), new Commands(), new Uptime(), new InfoChannels(), new Metrics()) - .build(); - } - - @Override - public void onReady(ReadyEvent event) { - JDA bot = event.getJDA(); - bot.getPresence().setActivity(Activity.playing("Meteor Client")); - - server = bot.getGuildById(Env.GUILD_ID.value); - if (server == null) { - MeteorBot.LOG.error("Couldn't find the specified server."); - System.exit(1); - } - - copeEmoji = server.getEmojiById(Env.COPE_NN_ID.value); - - LOG.info("Meteor Bot started"); - } - - @Override - public void onMessageReceived(MessageReceivedEvent event) { - if (!event.isFromType(ChannelType.TEXT) || !event.isFromGuild() || !event.getGuild().equals(server)) return; - - String content = event.getMessage().getContentRaw(); - if (!content.contains(event.getJDA().getSelfUser().getAsMention())) return; - - for (String hello : HELLOS) { - if (content.toLowerCase().contains(hello)) { - event.getMessage().reply(hello + " :)").queue(); - return; - } - } - - event.getMessage().addReaction(content.toLowerCase().contains("cope") ? copeEmoji : Emoji.fromUnicode("\uD83D\uDC4B")).queue(); - } - - @Override - public void onGuildMemberJoin(@NotNull GuildMemberJoinEvent event) { - if (Env.BACKEND_TOKEN.value == null) return; - - Utils.apiPost("discord/userJoined").queryString("id", event.getMember().getId()).asEmpty(); - } - - @Override - public void onGuildMemberRemove(@NotNull GuildMemberRemoveEvent event) { - if (Env.BACKEND_TOKEN.value == null) return; - - Utils.apiPost("discord/userLeft").asEmpty(); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/Metrics.java b/src/main/java/org/meteordev/meteorbot/Metrics.java deleted file mode 100644 index 8463b40..0000000 --- a/src/main/java/org/meteordev/meteorbot/Metrics.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.meteordev.meteorbot; - -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpServer; -import net.dv8tion.jda.api.JDA; -import net.dv8tion.jda.api.entities.Guild; -import net.dv8tion.jda.api.events.session.ReadyEvent; -import net.dv8tion.jda.api.events.session.ShutdownEvent; -import net.dv8tion.jda.api.hooks.ListenerAdapter; - -import java.io.IOException; -import java.io.OutputStream; -import java.net.InetSocketAddress; -import java.nio.charset.StandardCharsets; - -public class Metrics extends ListenerAdapter { - private Guild guild; - private HttpServer server; - - @Override - public void onReady(ReadyEvent event) { - JDA bot = event.getJDA(); - - guild = bot.getGuildById(Env.GUILD_ID.value); - if (guild == null) { - MeteorBot.LOG.error("Couldn't find the specified server."); - System.exit(1); - } - - try { - server = HttpServer.create(new InetSocketAddress(9400), 0); - server.createContext("/metrics", this::onRequest); - server.start(); - } catch (IOException e) { - throw new RuntimeException(e); - } - - MeteorBot.LOG.info("Providing metrics on :9400/metrics"); - } - - @Override - public void onShutdown(ShutdownEvent event) { - server.stop(1000); - } - - private void onRequest(HttpExchange exchange) { - byte[] response = String.format(""" - # HELP meteor_discord_users_total Total number of Discord users in our server - # TYPE meteor_discord_users_total gauge - meteor_discord_users_total %d - """, guild.getMemberCount()).getBytes(StandardCharsets.UTF_8); - - try { - exchange.getResponseHeaders().set("Content-Type", "text/plain"); - exchange.sendResponseHeaders(200, response.length); - } catch (IOException e) { - throw new RuntimeException(e); - } - - OutputStream out = exchange.getResponseBody(); - copy(response, out); - } - - @SuppressWarnings("ThrowFromFinallyBlock") - private static void copy(byte[] in, OutputStream out) { - try { - out.write(in); - } catch (IOException e) { - throw new RuntimeException(e); - } finally { - try { - out.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } -} diff --git a/src/main/java/org/meteordev/meteorbot/Uptime.java b/src/main/java/org/meteordev/meteorbot/Uptime.java deleted file mode 100644 index f7b8d64..0000000 --- a/src/main/java/org/meteordev/meteorbot/Uptime.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.meteordev.meteorbot; - -import kong.unirest.Unirest; -import net.dv8tion.jda.api.events.session.ReadyEvent; -import net.dv8tion.jda.api.hooks.ListenerAdapter; -import org.jetbrains.annotations.NotNull; - -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; - -public class Uptime extends ListenerAdapter { - @Override - public void onReady(@NotNull ReadyEvent event) { - if (Env.UPTIME_URL.value == null) { - MeteorBot.LOG.warn("Uptime URL not configured, uptime requests will not be made"); - return; - } - - Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(() -> { - String url = Env.UPTIME_URL.value; - if (url.endsWith("ping=")) url += event.getJDA().getGatewayPing(); - - Unirest.get(url).asEmpty(); - }, 0, 60, TimeUnit.SECONDS); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/Utils.java b/src/main/java/org/meteordev/meteorbot/Utils.java deleted file mode 100644 index 24436a0..0000000 --- a/src/main/java/org/meteordev/meteorbot/Utils.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.meteordev.meteorbot; - -import kong.unirest.GetRequest; -import kong.unirest.HttpRequestWithBody; -import kong.unirest.Unirest; -import net.dv8tion.jda.api.EmbedBuilder; - -import java.awt.*; -import java.text.NumberFormat; -import java.time.temporal.ChronoUnit; -import java.util.Locale; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public abstract class Utils { - private static final Pattern TIME_PATTERN = Pattern.compile("^(\\d+)(ms|s|m|h|d|w)$"); - private static final Color COLOR = new Color(145, 61, 226); - private static final String[] SUFFIXES = {"k", "m", "b", "t"}; - - private Utils() { - } - - public static long parseAmount(String parse) { - Matcher matcher = TIME_PATTERN.matcher(parse); - if (!matcher.matches() || matcher.groupCount() != 2) return -1; - - try { - return Integer.parseInt(matcher.group(1)); - } catch (NumberFormatException ignored) { - return -1; - } - } - - public static ChronoUnit parseUnit(String parse) { - Matcher matcher = TIME_PATTERN.matcher(parse); - if (!matcher.matches() || matcher.groupCount() != 2) return null; - - return unitFromString(matcher.group(2)); - } - - public static ChronoUnit unitFromString(String string) { - for (ChronoUnit value : ChronoUnit.values()) { - String stringValue = unitToString(value); - if (stringValue == null) continue; - - if (stringValue.equalsIgnoreCase(string)) { - return value; - } - } - - return null; - } - - public static String unitToString(ChronoUnit unit) { - return switch (unit) { - case SECONDS -> "s"; - case MINUTES -> "m"; - case HOURS -> "h"; - case DAYS -> "d"; - case WEEKS -> "w"; - default -> null; - }; - } - - public static String formatLong(long value) { - String formatted = NumberFormat.getNumberInstance(Locale.UK).format(value); - String first = formatted, second = "", suffix = ""; - - if (formatted.contains(",")) { - int firstComma = formatted.indexOf(','); - first = formatted.substring(0, firstComma); - second = "." + formatted.substring(firstComma + 1, firstComma + 3); - suffix = SUFFIXES[formatted.replaceAll("[^\",\"]", "").length() - 1]; - } - - return first + second + suffix; - } - - public static EmbedBuilder embedTitle(String title, String format, Object... args) { - return new EmbedBuilder().setColor(COLOR).setTitle(title).setDescription(String.format(format, args)); - } - - public static EmbedBuilder embed(String format, Object... args) { - return embedTitle(null, format, args); - } - - public static GetRequest apiGet(String path) { - return Unirest.get(Env.API_BASE.value + path); - } - - public static HttpRequestWithBody apiPost(String path) { - return Unirest.post(Env.API_BASE.value + path).header("Authorization", Env.BACKEND_TOKEN.value); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/Command.java b/src/main/java/org/meteordev/meteorbot/command/Command.java deleted file mode 100644 index af8b5d3..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/Command.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.meteordev.meteorbot.command; - -import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import net.dv8tion.jda.api.interactions.commands.OptionMapping; -import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; - -public abstract class Command { - public final String name, description; - - protected Command(String name, String description) { - this.name = name; - this.description = description; - } - - public abstract SlashCommandData build(SlashCommandData data); - - public abstract void run(SlashCommandInteractionEvent event); - - public static Member parseMember(SlashCommandInteractionEvent event) { - OptionMapping memberOption = event.getOption("member"); - if (memberOption == null || memberOption.getAsMember() == null) { - event.reply("Couldn't find that member.").setEphemeral(true).queue(); - return null; - } - - Member member = memberOption.getAsMember(); - if (member == null) event.reply("Couldn't find that member.").setEphemeral(true).queue(); - - return member; - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/Commands.java b/src/main/java/org/meteordev/meteorbot/command/Commands.java deleted file mode 100644 index addab27..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/Commands.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.meteordev.meteorbot.command; - -import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import net.dv8tion.jda.api.events.session.ReadyEvent; -import net.dv8tion.jda.api.hooks.ListenerAdapter; -import net.dv8tion.jda.api.interactions.commands.build.CommandData; -import net.dv8tion.jda.internal.interactions.CommandDataImpl; -import org.jetbrains.annotations.NotNull; -import org.meteordev.meteorbot.Env; -import org.meteordev.meteorbot.MeteorBot; -import org.meteordev.meteorbot.command.commands.LinkCommand; -import org.meteordev.meteorbot.command.commands.StatsCommand; -import org.meteordev.meteorbot.command.commands.help.FaqCommand; -import org.meteordev.meteorbot.command.commands.help.InstallationCommand; -import org.meteordev.meteorbot.command.commands.help.LogsCommand; -import org.meteordev.meteorbot.command.commands.help.OldVersionCommand; -import org.meteordev.meteorbot.command.commands.moderation.BanCommand; -import org.meteordev.meteorbot.command.commands.moderation.CloseCommand; -import org.meteordev.meteorbot.command.commands.moderation.MuteCommand; -import org.meteordev.meteorbot.command.commands.moderation.UnmuteCommand; -import org.meteordev.meteorbot.command.commands.silly.*; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class Commands extends ListenerAdapter { - private static final Map BOT_COMMANDS = new HashMap<>(); - - public static void add(Command command) { - BOT_COMMANDS.put(command.name, command); - } - - @Override - public void onReady(@NotNull ReadyEvent event) { - add(new FaqCommand()); - add(new InstallationCommand()); - add(new LogsCommand()); - add(new OldVersionCommand()); - - add(new BanCommand()); - add(new CloseCommand()); - add(new MuteCommand()); - add(new UnmuteCommand()); - - add(new CapyCommand()); - add(new CatCommand()); - add(new DogCommand()); - add(new MonkeyCommand()); - add(new PandaCommand()); - - add(new StatsCommand()); - if (Env.BACKEND_TOKEN.value != null) { - add(new LinkCommand()); - } - - List commandData = new ArrayList<>(); - - for (Command command : BOT_COMMANDS.values()) { - commandData.add(command.build(new CommandDataImpl(command.name, command.description))); - } - - event.getJDA().updateCommands().addCommands(commandData).complete(); - - MeteorBot.LOG.info("Loaded {} commands", BOT_COMMANDS.size()); - } - - @Override - public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event) { - Command command = BOT_COMMANDS.get(event.getName()); - if (command == null) return; - - command.run(event); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/LinkCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/LinkCommand.java deleted file mode 100644 index b6169c0..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/LinkCommand.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.meteordev.meteorbot.command.commands; - -import kong.unirest.json.JSONObject; -import net.dv8tion.jda.api.entities.channel.ChannelType; -import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import net.dv8tion.jda.api.interactions.commands.OptionMapping; -import net.dv8tion.jda.api.interactions.commands.OptionType; -import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; -import org.meteordev.meteorbot.Utils; -import org.meteordev.meteorbot.command.Command; - -public class LinkCommand extends Command { - public LinkCommand() { - super("link", "Links your Discord account to your Meteor account."); - } - - @Override - public SlashCommandData build(SlashCommandData data) { - return data.addOption(OptionType.STRING, "token", "The token generated on the Meteor website.", true); - } - - @Override - public void run(SlashCommandInteractionEvent event) { - if (!event.getChannel().getType().equals(ChannelType.PRIVATE)) { - event.reply("This action must be in DMs.").setEphemeral(true).queue(); - return; - } - - OptionMapping token = event.getOption("token"); - if (token == null || token.getAsString().isBlank()) { - event.reply("Must specify a valid token.").setEphemeral(true).queue(); - return; - } - - JSONObject json = Utils.apiPost("account/linkDiscord") - .queryString("id", event.getUser().getId()) - .queryString("token", token.getAsString()) - .asJson().getBody().getObject(); - - if (json.has("error")) { - event.reply("Failed to link your Discord account. Try generating a new token by refreshing the account page and clicking the link button again.").setEphemeral(true).queue(); - return; - } - - event.reply("Successfully linked your Discord account.").setEphemeral(true).queue(); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/StatsCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/StatsCommand.java deleted file mode 100644 index 93f595e..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/StatsCommand.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.meteordev.meteorbot.command.commands; - -import kong.unirest.json.JSONObject; -import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import net.dv8tion.jda.api.interactions.commands.OptionMapping; -import net.dv8tion.jda.api.interactions.commands.OptionType; -import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; -import org.meteordev.meteorbot.Utils; -import org.meteordev.meteorbot.command.Command; - -import java.util.Calendar; -import java.util.Date; -import java.util.TimeZone; -import java.util.regex.Pattern; - -public class StatsCommand extends Command { - private static final Pattern DATE_PATTERN = Pattern.compile("\\d{2}-\\d{2}-\\d{4}"); - - public StatsCommand() { - super("stats", "Shows various stats about Meteor."); - } - - @Override - public SlashCommandData build(SlashCommandData data) { - return data.addOption(OptionType.STRING, "date", "The date to fetch stats for."); - } - - @Override - public void run(SlashCommandInteractionEvent event) { - String date; - OptionMapping option = event.getOption("date"); - - if (option != null && DATE_PATTERN.matcher(option.getAsString()).matches()) { - date = option.getAsString(); - } else { - Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); - calendar.setTime(new Date()); - date = "%02d-%02d-%d".formatted(calendar.get(Calendar.DATE), calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.YEAR)); - } - - if (date == null) { - event.reply("Failed to determine date.").setEphemeral(true).queue(); - return; - } - - JSONObject json = Utils.apiGet("stats").queryString("date", date).asJson().getBody().getObject(); - - if (json == null || json.has("error")) { - event.reply("Failed to fetch stats for this date.").setEphemeral(true).queue(); - return; - } - - int joins = json.getInt("joins"), leaves = json.getInt("leaves"); - - event.replyEmbeds(Utils.embed("**Date**: %s\n**Joins**: %d\n**Leaves**: %d\n**Gained**: %d\n**Downloads**: %d".formatted(json.getString("date"), joins, leaves, joins - leaves, json.getInt("downloads"))).build()).queue(); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/help/FaqCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/help/FaqCommand.java deleted file mode 100644 index ff27591..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/help/FaqCommand.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.meteordev.meteorbot.command.commands.help; - -import net.dv8tion.jda.api.interactions.components.buttons.Button; - -public class FaqCommand extends HelpCommand { - public FaqCommand() { - super( - "faq", - "Tells someone to read the faq", - "The FAQ answers your question, please read it.", - Button.link("https://meteorclient.com/faq", "FAQ") - ); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/help/HelpCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/help/HelpCommand.java deleted file mode 100644 index 73e7f98..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/help/HelpCommand.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.meteordev.meteorbot.command.commands.help; - -import net.dv8tion.jda.api.entities.Member; -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.SlashCommandData; -import net.dv8tion.jda.api.interactions.components.ItemComponent; -import org.meteordev.meteorbot.command.Command; - -public abstract class HelpCommand extends Command { - protected final ItemComponent[] components; - protected final String message; - - protected HelpCommand(String name, String description, String message, ItemComponent... components) { - super(name, description); - - this.message = message; - this.components = components == null ? new ItemComponent[0] : components; - } - - @Override - public SlashCommandData build(SlashCommandData data) { - return data.addOption(OptionType.USER, "member", "The member to ping.", true); - } - - @Override - public void run(SlashCommandInteractionEvent event) { - Member member = parseMember(event); - if (member == null) return; - - event.reply("%s %s".formatted(member.getAsMention(), message)).addActionRow(components).queue(); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/help/InstallationCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/help/InstallationCommand.java deleted file mode 100644 index 92ae33e..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/help/InstallationCommand.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.meteordev.meteorbot.command.commands.help; - -import net.dv8tion.jda.api.interactions.components.buttons.Button; - -public class InstallationCommand extends HelpCommand { - public InstallationCommand() { - super( - "installation", - "Tells someone to read the installation guide", - "Please read the installation guide before asking more questions.", - Button.link("https://meteorclient.com/faq/installation", "Guide") - ); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/help/LogsCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/help/LogsCommand.java deleted file mode 100644 index 0c422a1..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/help/LogsCommand.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.meteordev.meteorbot.command.commands.help; - -import net.dv8tion.jda.api.interactions.components.buttons.Button; - -public class LogsCommand extends HelpCommand { - public LogsCommand() { - super( - "logs", - "Tells someone how to find their logs", - "Please read the guide for sending logs before asking more questions.", - Button.link("https://meteorclient.com/faq/getting-log", "Guide") - ); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/help/OldVersionCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/help/OldVersionCommand.java deleted file mode 100644 index feca04e..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/help/OldVersionCommand.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.meteordev.meteorbot.command.commands.help; - -import net.dv8tion.jda.api.interactions.components.buttons.Button; - -public class OldVersionCommand extends HelpCommand { - public OldVersionCommand() { - super( - "old-versions", - "Tells someone how to play on old versions", - "Please read the old versions guide before asking more questions.", - Button.link("https://meteorclient.com/faq/old-versions", "Guide") - ); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/moderation/BanCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/moderation/BanCommand.java deleted file mode 100644 index 19f573c..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/moderation/BanCommand.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.meteordev.meteorbot.command.commands.moderation; - -import net.dv8tion.jda.api.Permission; -import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; -import net.dv8tion.jda.api.interactions.commands.OptionType; -import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; -import org.meteordev.meteorbot.command.Command; - -import java.util.concurrent.TimeUnit; - -public class BanCommand extends Command { - public BanCommand() { - super("ban", "Bans a member"); - } - - @Override - public SlashCommandData build(SlashCommandData data) { - return data - .addOption(OptionType.USER, "member", "The member to ban.", true) - .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.BAN_MEMBERS)); - } - - @Override - public void run(SlashCommandInteractionEvent event) { - if (!event.getMember().hasPermission(Permission.BAN_MEMBERS)) { - event.reply("You don't have permission to ban members.").setEphemeral(true).queue(); - return; - } - - Member member = parseMember(event); - if (member == null) return; - - member.ban(0, TimeUnit.NANOSECONDS).queue(a -> { - event.reply("Banned %s.".formatted(member.getAsMention())).queue(); - }); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/moderation/CloseCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/moderation/CloseCommand.java deleted file mode 100644 index 007aed8..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/moderation/CloseCommand.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.meteordev.meteorbot.command.commands.moderation; - -import net.dv8tion.jda.api.Permission; -import net.dv8tion.jda.api.entities.channel.ChannelType; -import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; -import org.meteordev.meteorbot.command.Command; - -public class CloseCommand extends Command { - public CloseCommand() { - super("close", "Locks the current forum post"); - } - - @Override - public SlashCommandData build(SlashCommandData data) { - return data; - } - - @Override - public void run(SlashCommandInteractionEvent event) { - if (event.getChannelType() != ChannelType.GUILD_PUBLIC_THREAD) { - event.reply("This command can only be used in a forum post.").setEphemeral(true).queue(); - return; - } - - if (!event.getMember().hasPermission(Permission.MANAGE_THREADS)) { - event.reply("You don't have permission to lock threads.").setEphemeral(true).queue(); - return; - } - - event.reply("This post is now locked.").queue(hook -> { - event.getChannel().asThreadChannel().getManager().setLocked(true).setArchived(true).queue(); - }); - - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/moderation/MuteCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/moderation/MuteCommand.java deleted file mode 100644 index 9487d2a..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/moderation/MuteCommand.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.meteordev.meteorbot.command.commands.moderation; - -import net.dv8tion.jda.api.Permission; -import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; -import net.dv8tion.jda.api.interactions.commands.OptionMapping; -import net.dv8tion.jda.api.interactions.commands.OptionType; -import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; -import net.dv8tion.jda.api.requests.restaction.AuditableRestAction; -import org.meteordev.meteorbot.Utils; -import org.meteordev.meteorbot.command.Command; - -import java.time.Duration; -import java.time.temporal.ChronoUnit; - -public class MuteCommand extends Command { - public MuteCommand() { - super("mute", "Mutes a user for a maximum of 27 days."); - } - - @Override - public SlashCommandData build(SlashCommandData data) { - return data - .addOption(OptionType.USER, "member", "The member to mute.", true) - .addOption(OptionType.STRING, "duration", "The duration of the mute.", true) - .addOption(OptionType.STRING, "reason", "The reason for the mute.") - .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.MODERATE_MEMBERS)); - } - - @Override - public void run(SlashCommandInteractionEvent event) { - Member member = parseMember(event); - if (member == null) return; - - if (member.isTimedOut()) { - event.reply("That user is already timed out.").setEphemeral(true).queue(); - return; - } - - if (member.hasPermission(Permission.MODERATE_MEMBERS)) { - event.reply("That member can't be muted.").setEphemeral(true).queue(); - return; - } - - String duration = event.getOption("duration").getAsString(); - long amount = Utils.parseAmount(duration); - ChronoUnit unit = Utils.parseUnit(duration); - - if (amount == -1 || unit == null) { - event.reply("Failed to parse mute duration.").setEphemeral(true).queue(); - return; - } - - if (unit == ChronoUnit.SECONDS && amount < 10) { - event.reply("Please input a minimum duration of 10 seconds.").setEphemeral(true).queue(); - return; - } - - String reason = ""; - OptionMapping reasonOption = event.getOption("reason"); - if (reasonOption != null) reason = reasonOption.getAsString(); - - AuditableRestAction action = member.timeoutFor(Duration.of(amount, unit)); - if (!reason.isBlank()) action.reason(reason); - action.queue(a -> { - event.reply("Timed out %s for %s.".formatted(member.getAsMention(), duration)).queue(); - }); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/moderation/UnmuteCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/moderation/UnmuteCommand.java deleted file mode 100644 index 6c57b60..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/moderation/UnmuteCommand.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.meteordev.meteorbot.command.commands.moderation; - -import net.dv8tion.jda.api.Permission; -import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; -import net.dv8tion.jda.api.interactions.commands.OptionType; -import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; -import org.meteordev.meteorbot.command.Command; - -public class UnmuteCommand extends Command { - public UnmuteCommand() { - super("unmute", "Unmutes the specified member."); - } - - @Override - public SlashCommandData build(SlashCommandData data) { - return data.addOption(OptionType.USER, "member", "The member to unmute.", true) - .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.MODERATE_MEMBERS)); - } - - @Override - public void run(SlashCommandInteractionEvent event) { - Member member = parseMember(event); - if (member == null) return; - - if (!member.isTimedOut()) { - event.reply("Member isn't already muted.").setEphemeral(true).queue(); - return; - } - - member.removeTimeout().queue(a -> { - event.reply("Removed timeout for %s.".formatted(member.getAsMention())).queue(); - }); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/silly/CapyCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/silly/CapyCommand.java deleted file mode 100644 index 980380f..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/silly/CapyCommand.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.meteordev.meteorbot.command.commands.silly; - -import kong.unirest.Unirest; -import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; -import org.meteordev.meteorbot.command.Command; - -public class CapyCommand extends Command { - public CapyCommand() { - super("capybara", "pulls up"); - } - - @Override - public SlashCommandData build(SlashCommandData data) { - return data; - } - - @Override - public void run(SlashCommandInteractionEvent event) { - Unirest.get("https://api.capy.lol/v1/capybara?json=true").asJsonAsync(response -> { - event.reply(response.getBody().getObject().getJSONObject("data").getString("url")).queue(); - }); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/silly/CatCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/silly/CatCommand.java deleted file mode 100644 index 892204a..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/silly/CatCommand.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.meteordev.meteorbot.command.commands.silly; - -import kong.unirest.Unirest; -import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; -import org.meteordev.meteorbot.command.Command; - -public class CatCommand extends Command { - public CatCommand() { - super("cat", "gato"); - } - - @Override - public SlashCommandData build(SlashCommandData data) { - return data; - } - - @Override - public void run(SlashCommandInteractionEvent event) { - Unirest.get("https://some-random-api.com/img/cat").asJsonAsync(response -> { - event.reply(response.getBody().getObject().getString("link")).queue(); - }); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/silly/DogCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/silly/DogCommand.java deleted file mode 100644 index b8349ed..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/silly/DogCommand.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.meteordev.meteorbot.command.commands.silly; - -import kong.unirest.Unirest; -import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; -import org.meteordev.meteorbot.command.Command; - -public class DogCommand extends Command { - public DogCommand() { - super("dog", "dawg"); - } - - @Override - public SlashCommandData build(SlashCommandData data) { - return data; - } - - @Override - public void run(SlashCommandInteractionEvent event) { - Unirest.get("https://some-random-api.com/img/dog").asJsonAsync(response -> { - event.reply(response.getBody().getObject().getString("link")).queue(); - }); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/silly/MonkeyCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/silly/MonkeyCommand.java deleted file mode 100644 index 9f5e4cd..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/silly/MonkeyCommand.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.meteordev.meteorbot.command.commands.silly; - -import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; -import org.meteordev.meteorbot.command.Command; - -import java.util.concurrent.ThreadLocalRandom; - -public class MonkeyCommand extends Command { - public MonkeyCommand() { - super("monkey", "Sends a swag monkey."); - } - - @Override - public SlashCommandData build(SlashCommandData data) { - return data; - } - - @Override - public void run(SlashCommandInteractionEvent event) { - int w = ThreadLocalRandom.current().nextInt(200, 1001); - int h = ThreadLocalRandom.current().nextInt(200, 1001); - - event.reply("https://www.placemonkeys.com/" + w + "/" + h + "?random").queue(); - } -} diff --git a/src/main/java/org/meteordev/meteorbot/command/commands/silly/PandaCommand.java b/src/main/java/org/meteordev/meteorbot/command/commands/silly/PandaCommand.java deleted file mode 100644 index ec9f331..0000000 --- a/src/main/java/org/meteordev/meteorbot/command/commands/silly/PandaCommand.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.meteordev.meteorbot.command.commands.silly; - -import kong.unirest.Unirest; -import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; -import org.meteordev.meteorbot.command.Command; - -import java.util.concurrent.ThreadLocalRandom; - -public class PandaCommand extends Command { - public PandaCommand() { - super("panda", "funny thing"); - } - - @Override - public SlashCommandData build(SlashCommandData data) { - return data; - } - - @Override - public void run(SlashCommandInteractionEvent event) { - String animal = ThreadLocalRandom.current().nextBoolean() ? "red_panda" : "panda"; - - Unirest.get("https://some-random-api.com/img/" + animal).asJsonAsync(response -> { - event.reply(response.getBody().getObject().getString("link")).queue(); - }); - } -} diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml deleted file mode 100644 index c34c0c3..0000000 --- a/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - [%d{HH:mm:ss}] %boldCyan(%-26.-26thread) [%highlight(%-6level) - %boldGreen(%-15.-15logger{0})] %msg%n - - - - - - - \ No newline at end of file From a98d4735ffad7af053fadfe5e3b466bcb0b3de5d Mon Sep 17 00:00:00 2001 From: Big-Iron-Cheems <52252627+Big-Iron-Cheems@users.noreply.github.com> Date: Sun, 8 Sep 2024 14:20:40 +0200 Subject: [PATCH 02/10] Fix close command --- internal/app/commands/moderation/close.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/app/commands/moderation/close.go b/internal/app/commands/moderation/close.go index 0928eb4..3a2ff91 100644 --- a/internal/app/commands/moderation/close.go +++ b/internal/app/commands/moderation/close.go @@ -49,7 +49,7 @@ func (c *CloseCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCrea }) return } - if channel.Type != discordgo.ChannelTypeGuildForum { + if !channel.IsThread() { c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ Type: discordgo.InteractionResponseChannelMessageWithSource, Data: &discordgo.InteractionResponseData{ From 7c64fd8354b98d0fc195b4bfc598d1d24c5e9036 Mon Sep 17 00:00:00 2001 From: Big-Iron-Cheems <52252627+Big-Iron-Cheems@users.noreply.github.com> Date: Sun, 8 Sep 2024 14:34:13 +0200 Subject: [PATCH 03/10] Fix close command, for real this time --- internal/app/commands/moderation/close.go | 31 ++++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/internal/app/commands/moderation/close.go b/internal/app/commands/moderation/close.go index 3a2ff91..2a3ff65 100644 --- a/internal/app/commands/moderation/close.go +++ b/internal/app/commands/moderation/close.go @@ -60,9 +60,24 @@ func (c *CloseCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCrea return } + // Respond to the interaction + c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Embeds: []*discordgo.MessageEmbed{ + { + Title: "Thread Closed", + Description: "This thread is now locked.", + Color: common.EmbedColor, + }, + }, + }, + }) + + // Close the thread locked := true archived := true - _, err = s.ChannelEdit(i.ChannelID, &discordgo.ChannelEdit{ + _, err = s.ChannelEditComplex(i.ChannelID, &discordgo.ChannelEdit{ Locked: &locked, Archived: &archived, }) @@ -76,18 +91,4 @@ func (c *CloseCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCrea }) return } - - // Respond to the interaction - c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ - Type: discordgo.InteractionResponseChannelMessageWithSource, - Data: &discordgo.InteractionResponseData{ - Embeds: []*discordgo.MessageEmbed{ - { - Title: "Thread Closed", - Description: "This thread is now locked.", - Color: common.EmbedColor, - }, - }, - }, - }) } From 7a69228f2ef7d11a786a670ec8e72f9a648ded31 Mon Sep 17 00:00:00 2001 From: Big-Iron-Cheems <52252627+Big-Iron-Cheems@users.noreply.github.com> Date: Sun, 8 Sep 2024 16:37:58 +0200 Subject: [PATCH 04/10] Fix moderation commands perms Need extra testing to be sure --- internal/app/commands/moderation/ban.go | 2 +- internal/app/commands/moderation/close.go | 2 +- internal/app/commands/moderation/mute.go | 8 ++++---- internal/app/commands/moderation/unmute.go | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/app/commands/moderation/ban.go b/internal/app/commands/moderation/ban.go index 05e73af..252f4f4 100644 --- a/internal/app/commands/moderation/ban.go +++ b/internal/app/commands/moderation/ban.go @@ -36,7 +36,7 @@ func (c *BanCommand) Build() *discordgo.ApplicationCommand { } func (c *BanCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { - if i.Member.Permissions&common.BanMemberPermission != common.BanMemberPermission { + if i.Member.Permissions&common.BanMemberPermission == 0 { c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ Type: discordgo.InteractionResponseChannelMessageWithSource, Data: &discordgo.InteractionResponseData{ diff --git a/internal/app/commands/moderation/close.go b/internal/app/commands/moderation/close.go index 2a3ff65..9c465cc 100644 --- a/internal/app/commands/moderation/close.go +++ b/internal/app/commands/moderation/close.go @@ -27,7 +27,7 @@ func (c *CloseCommand) Build() *discordgo.ApplicationCommand { } func (c *CloseCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { - if i.Member.Permissions&common.ManageThreadsPermission != common.ManageThreadsPermission { + if i.Member.Permissions&common.ManageThreadsPermission == 0 { c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ Type: discordgo.InteractionResponseChannelMessageWithSource, Data: &discordgo.InteractionResponseData{ diff --git a/internal/app/commands/moderation/mute.go b/internal/app/commands/moderation/mute.go index 7a0b057..78e89cd 100644 --- a/internal/app/commands/moderation/mute.go +++ b/internal/app/commands/moderation/mute.go @@ -52,7 +52,7 @@ func (c *MuteCommand) Build() *discordgo.ApplicationCommand { } func (c *MuteCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { - if i.Member.Permissions&common.ModerateMembersPermission != common.ModerateMembersPermission { + if i.Member.Permissions&common.ModerateMembersPermission == 0 { c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ Type: discordgo.InteractionResponseChannelMessageWithSource, Data: &discordgo.InteractionResponseData{ @@ -86,8 +86,8 @@ func (c *MuteCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreat } } - targetGuildMember, err := s.GuildMember(targetMember.ID, i.GuildID) - if err != nil { + targetGuildMember, ok := i.ApplicationCommandData().Resolved.Members[targetMember.ID] + if !ok { c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ Type: discordgo.InteractionResponseChannelMessageWithSource, Data: &discordgo.InteractionResponseData{ @@ -111,7 +111,7 @@ func (c *MuteCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreat } // Check if the target member cannot be muted - if targetGuildMember.Permissions&common.ModerateMembersPermission == common.ModerateMembersPermission { + if targetGuildMember.Permissions&common.ModerateMembersPermission != 0 { c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ Type: discordgo.InteractionResponseChannelMessageWithSource, Data: &discordgo.InteractionResponseData{ diff --git a/internal/app/commands/moderation/unmute.go b/internal/app/commands/moderation/unmute.go index 610942e..c490d3b 100644 --- a/internal/app/commands/moderation/unmute.go +++ b/internal/app/commands/moderation/unmute.go @@ -37,7 +37,7 @@ func (c *UnmuteCommand) Build() *discordgo.ApplicationCommand { } func (c *UnmuteCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { - if i.Member.Permissions&common.ModerateMembersPermission != common.ModerateMembersPermission { + if i.Member.Permissions&common.ModerateMembersPermission == 0 { c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ Type: discordgo.InteractionResponseChannelMessageWithSource, Data: &discordgo.InteractionResponseData{ @@ -49,8 +49,8 @@ func (c *UnmuteCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCre } targetMember := i.ApplicationCommandData().Options[0].UserValue(s) - targetGuildMember, err := s.GuildMember(targetMember.ID, i.GuildID) - if err != nil { + targetGuildMember, ok := i.ApplicationCommandData().Resolved.Members[targetMember.ID] + if !ok { c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ Type: discordgo.InteractionResponseChannelMessageWithSource, Data: &discordgo.InteractionResponseData{ @@ -74,7 +74,7 @@ func (c *UnmuteCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCre } // Unmute the member - err = s.GuildMemberTimeout(i.GuildID, targetMember.ID, nil) + err := s.GuildMemberTimeout(i.GuildID, targetMember.ID, nil) if err != nil { c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ Type: discordgo.InteractionResponseChannelMessageWithSource, From 963d3148d0cfda7b016c5b2433cfe0936e763773 Mon Sep 17 00:00:00 2001 From: Big-Iron-Cheems <52252627+Big-Iron-Cheems@users.noreply.github.com> Date: Sun, 8 Sep 2024 16:42:50 +0200 Subject: [PATCH 05/10] Let thread owners use /close --- internal/app/commands/moderation/close.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/internal/app/commands/moderation/close.go b/internal/app/commands/moderation/close.go index 9c465cc..7b24c39 100644 --- a/internal/app/commands/moderation/close.go +++ b/internal/app/commands/moderation/close.go @@ -27,33 +27,34 @@ func (c *CloseCommand) Build() *discordgo.ApplicationCommand { } func (c *CloseCommand) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) { - if i.Member.Permissions&common.ManageThreadsPermission == 0 { + // Check if the command was used in a forum channel + channel, err := s.State.Channel(i.ChannelID) + if err != nil { c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ Type: discordgo.InteractionResponseChannelMessageWithSource, Data: &discordgo.InteractionResponseData{ - Content: "You do not have the required permissions to close threads.", - Flags: discordgo.MessageFlagsEphemeral, + Content: "An error occurred while fetching the channel.", }, }) return } - - // Check if the command was used in a forum channel - channel, err := s.State.Channel(i.ChannelID) - if err != nil { + if !channel.IsThread() { c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ Type: discordgo.InteractionResponseChannelMessageWithSource, Data: &discordgo.InteractionResponseData{ - Content: "An error occurred while fetching the channel.", + Content: "This command can only be used in forum channels.", + Flags: discordgo.MessageFlagsEphemeral, }, }) return } - if !channel.IsThread() { + + // Check if the user has the required permissions, or is the thread owner + if i.Member.Permissions&common.ManageThreadsPermission == 0 && i.Member.User.ID != channel.OwnerID { c.HandleInteractionRespond(s, i, &discordgo.InteractionResponse{ Type: discordgo.InteractionResponseChannelMessageWithSource, Data: &discordgo.InteractionResponseData{ - Content: "This command can only be used in forum channels.", + Content: "You do not have the required permissions to close threads.", Flags: discordgo.MessageFlagsEphemeral, }, }) From 8bf314b7b2f396fcb9d4d6443f90f9a476c40a6f Mon Sep 17 00:00:00 2001 From: MineGame159 Date: Mon, 9 Sep 2024 10:22:36 +0200 Subject: [PATCH 06/10] Fix Dockerfile --- Dockerfile | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d0fff5..d6eb567 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,16 @@ -# Start from the official Go image -FROM golang:1.23-alpine AS builder +# Create a build image +FROM golang:1.23-alpine AS build -# Set the Current Working Directory inside the container WORKDIR /app -# Copy go.mod and go.sum files to the workspace -COPY go.mod go.sum ./ - -# Download all dependencies. Dependencies will be cached if the go.mod and go.sum files are not changed -RUN go mod download - -# Copy the source code from the current directory to the Working Directory inside the container COPY . . - -# Build the Go app RUN go build -ldflags="-s -w" -o build/meteor-bot cmd/meteor-bot/main.go +# Create a runtime image FROM alpine:latest -# Run the binary program produced by `go build` -CMD ["/app/meteor-bot"] \ No newline at end of file +WORKDIR /app + +COPY --from=build /app/build/meteor-bot . + +CMD ["./meteor-bot"] From 8274ee54e88a643ccc63dd54e39eb7a31605bee9 Mon Sep 17 00:00:00 2001 From: MineGame159 Date: Mon, 9 Sep 2024 10:42:49 +0200 Subject: [PATCH 07/10] Fix init order of logger and config Check if .env file exists --- cmd/meteor-bot/main.go | 9 +++++++-- internal/app/{config => common}/logger.go | 19 ++++++++++++------- internal/app/config/config.go | 13 ++++++++++--- 3 files changed, 29 insertions(+), 12 deletions(-) rename internal/app/{config => common}/logger.go (73%) diff --git a/cmd/meteor-bot/main.go b/cmd/meteor-bot/main.go index c65d8f7..32ecf45 100644 --- a/cmd/meteor-bot/main.go +++ b/cmd/meteor-bot/main.go @@ -4,6 +4,7 @@ import ( "github.com/bwmarrin/discordgo" "github.com/rs/zerolog/log" "meteor-bot/internal/app/commands" + "meteor-bot/internal/app/common" "meteor-bot/internal/app/config" "meteor-bot/internal/app/events" "os" @@ -11,8 +12,12 @@ import ( ) func main() { - // Close the log file when the program exits - defer config.CloseLogFile() + // Initialize the logger + common.InitLogger() + defer common.CloseLogger() + + // Initialize config + config.Init() // Create a new Discord session s, err := discordgo.New("Bot " + config.GlobalConfig.DiscordToken) diff --git a/internal/app/config/logger.go b/internal/app/common/logger.go similarity index 73% rename from internal/app/config/logger.go rename to internal/app/common/logger.go index 6bccb80..01daaf7 100644 --- a/internal/app/config/logger.go +++ b/internal/app/common/logger.go @@ -1,19 +1,21 @@ -package config +package common import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "meteor-bot/internal/app/config" "os" "path" + "time" ) // logFile is the file to write logs to var logFile *os.File -func init() { +func InitLogger() { zerolog.TimeFieldFormat = zerolog.TimeFormatUnix - if GlobalConfig.EnableLogFile { + if config.GlobalConfig.EnableLogFile { var err error logFile, err = os.OpenFile( path.Join("logs", "meteor-bot.log"), @@ -30,13 +32,16 @@ func init() { // Set the default logger to write to both console and file log.Logger = zerolog.New(multi).With().Timestamp().Logger() } else { - log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout}) + log.Logger = log.Output(zerolog.ConsoleWriter{ + Out: os.Stdout, + TimeFormat: time.TimeOnly, + }) } - log.Debug().Msg("Logger initialized") + + log.Info().Msg("Logger initialized") } -// CloseLogFile closes the log file -func CloseLogFile() { +func CloseLogger() { if logFile != nil { if err := logFile.Close(); err != nil { log.Error().Err(err).Msg("Failed to close log file") diff --git a/internal/app/config/config.go b/internal/app/config/config.go index 21bbd37..ec82de2 100644 --- a/internal/app/config/config.go +++ b/internal/app/config/config.go @@ -1,6 +1,7 @@ package config import ( + "errors" "github.com/joho/godotenv" "github.com/rs/zerolog/log" "os" @@ -22,9 +23,13 @@ type Env struct { EnableLogFile bool // Enable logging to a file } -func init() { - if err := godotenv.Load(); err != nil { - log.Warn().Err(err).Msg("Error loading .env file") +func Init() { + if _, err := os.Stat(".env"); errors.Is(err, os.ErrNotExist) { + log.Warn().Msg(".env file not found, using current environment") + } else { + if err := godotenv.Load(); err != nil { + log.Panic().Err(err).Msg("Error loading .env file") + } } GlobalConfig = Env{ @@ -39,4 +44,6 @@ func init() { UptimeUrl: os.Getenv("UPTIME_URL"), EnableLogFile: os.Getenv("ENABLE_LOG_FILE") == "true", } + + log.Info().Msg("Config initialized") } From 0e70b4794f918447dc44a1baf35f9a0a946cab0e Mon Sep 17 00:00:00 2001 From: Big-Iron-Cheems <52252627+Big-Iron-Cheems@users.noreply.github.com> Date: Mon, 9 Sep 2024 17:07:55 +0200 Subject: [PATCH 08/10] Fix join/leave counter - added helper to fetch member count - fixed panic on download count type conversion --- internal/app/events/events.go | 51 ++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/internal/app/events/events.go b/internal/app/events/events.go index 730f2ea..26765c0 100644 --- a/internal/app/events/events.go +++ b/internal/app/events/events.go @@ -17,8 +17,11 @@ import ( ) const ( - // infoChannel update period + // infoChannelHandler update period updatePeriod = 6 * time.Minute + + // uptimeReadyHandler request interval + uptimeInterval = 60 * time.Second ) var ( @@ -152,7 +155,7 @@ func uptimeReadyHandler(s *discordgo.Session, _ *discordgo.Ready) { } // Send an uptime request every 60 seconds - ticker := time.NewTicker(60 * time.Second) + ticker := time.NewTicker(uptimeInterval) go func() { for { select { @@ -171,6 +174,8 @@ func uptimeReadyHandler(s *discordgo.Session, _ *discordgo.Ready) { } } }() + + log.Info().Msgf("Sending uptime requests every %.0f seconds", uptimeInterval.Seconds()) } // infoChannelHandler updates the member count and download count channels @@ -213,12 +218,20 @@ func infoChannelHandler(s *discordgo.Session, _ *discordgo.Ready) { return 0 } - return stats["downloads"].(int64) + downloads, ok := stats["downloads"].(float64) + if !ok { + log.Error().Msg("Failed to assert downloads as float64") + return 0 + } + + return int64(downloads) }) updateChannel(s, memberCountChannel, func() int64 { - return int64(guild.MemberCount) + return int64(guildMemberCount(s, guild.ID)) }) + + log.Info().Msgf("Updating info channels every %.0f seconds", updatePeriod.Seconds()) } // metricsReadyHandler starts the metrics server @@ -230,7 +243,9 @@ func metricsReadyHandler(s *discordgo.Session, _ *discordgo.Ready) { return } - http.HandleFunc("/metrics", onRequest) + http.HandleFunc("/metrics", func(w http.ResponseWriter, r *http.Request) { + onRequest(s, w, r) + }) metricsServer = &http.Server{Addr: ":9400"} go func() { @@ -304,12 +319,12 @@ func formatLong(value int64) string { } // onRequest handles the metrics request -func onRequest(w http.ResponseWriter, _ *http.Request) { +func onRequest(s *discordgo.Session, w http.ResponseWriter, _ *http.Request) { response := fmt.Sprintf( `# HELP meteor_discord_users_total Total number of Discord users in our server # TYPE meteor_discord_users_total gauge meteor_discord_users_total %d`, - guild.MemberCount) + guildMemberCount(s, guild.ID)) w.Header().Set("Content-Type", "text/plain") w.WriteHeader(http.StatusOK) @@ -318,3 +333,25 @@ meteor_discord_users_total %d`, log.Error().Err(err).Msg("Failed to write response") } } + +// guildMemberCount returns the number of members in the guild +// NOTE: this is a workaround for discordgo.Session#GuildMembers returning a wrong structure +func guildMemberCount(s *discordgo.Session, guildID string) int { + count := 0 + after := "" + + for { + users, err := s.GuildMembers(guildID, after, 1000) + if err != nil { + log.Panic().Err(err).Msg("Error getting guild members") + } + usrCount := len(users) + if usrCount == 0 { + break + } + count += usrCount + after = users[usrCount-1].User.ID + } + + return count +} From 7eccfac3a916cf64d82479d6bb8011953701b37b Mon Sep 17 00:00:00 2001 From: Big-Iron-Cheems <52252627+Big-Iron-Cheems@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:34:55 +0200 Subject: [PATCH 09/10] Register commands globally Also add a way to clear commands on exit --- cmd/meteor-bot/main.go | 4 ++++ internal/app/commands/commands.go | 12 ++++++++++-- internal/app/config/config.go | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/cmd/meteor-bot/main.go b/cmd/meteor-bot/main.go index 32ecf45..5ea1e64 100644 --- a/cmd/meteor-bot/main.go +++ b/cmd/meteor-bot/main.go @@ -47,5 +47,9 @@ func main() { log.Info().Msg("Press Ctrl+C to exit") <-stop + if config.GlobalConfig.RemoveCommands { + commands.RemoveCommands(s) + } + log.Info().Msg("Gracefully shutting down.") } diff --git a/internal/app/commands/commands.go b/internal/app/commands/commands.go index fa89937..73a3704 100644 --- a/internal/app/commands/commands.go +++ b/internal/app/commands/commands.go @@ -7,7 +7,6 @@ import ( "meteor-bot/internal/app/commands/moderation" "meteor-bot/internal/app/commands/silly" "meteor-bot/internal/app/common" - "meteor-bot/internal/app/config" ) var ( @@ -63,10 +62,19 @@ func initCommands(cmds ...common.Command) { // registerCommands registers the commands to the Discord API func registerCommands(s *discordgo.Session) { var err error - registeredCommands, err = s.ApplicationCommandBulkOverwrite(s.State.User.ID, config.GlobalConfig.GuildId, commands) + registeredCommands, err = s.ApplicationCommandBulkOverwrite(s.State.User.ID, "", commands) if err != nil { log.Panic().Err(err).Msg("Cannot register commands") } log.Info().Msgf("%d commands registered successfully", len(registeredCommands)) } + +// RemoveCommands removes the commands from the Discord API +func RemoveCommands(s *discordgo.Session) { + log.Info().Msgf("Removing %d commands...", len(registeredCommands)) + _, err := s.ApplicationCommandBulkOverwrite(s.State.User.ID, "", nil) + if err != nil { + log.Panic().Err(err).Msg("Cannot remove commands") + } +} diff --git a/internal/app/config/config.go b/internal/app/config/config.go index ec82de2..c43df20 100644 --- a/internal/app/config/config.go +++ b/internal/app/config/config.go @@ -21,6 +21,7 @@ type Env struct { DownloadCountId string // ID of the download count channel UptimeUrl string // URL for the uptime monitor EnableLogFile bool // Enable logging to a file + RemoveCommands bool // Whether to remove commands on exit } func Init() { @@ -43,6 +44,7 @@ func Init() { DownloadCountId: os.Getenv("DOWNLOAD_COUNT_ID"), UptimeUrl: os.Getenv("UPTIME_URL"), EnableLogFile: os.Getenv("ENABLE_LOG_FILE") == "true", + RemoveCommands: os.Getenv("REMOVE_COMMANDS") == "true", } log.Info().Msg("Config initialized") From 1dad942d3bceac40c07204e4b31085959d764b04 Mon Sep 17 00:00:00 2001 From: MineGame159 Date: Fri, 13 Sep 2024 10:28:17 +0200 Subject: [PATCH 10/10] Update Dockerfile to allow caching Go dependencies --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index d6eb567..3cf4eea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,11 @@ FROM golang:1.23-alpine AS build WORKDIR /app +# Download dependencies +COPY go.mod go.sum . +RUN go mod download + +# Build bot COPY . . RUN go build -ldflags="-s -w" -o build/meteor-bot cmd/meteor-bot/main.go