From 62e7283f477f1c7afe47d903b6951d3854cdfb2b Mon Sep 17 00:00:00 2001 From: darius Date: Fri, 3 May 2024 22:05:35 +0200 Subject: [PATCH] docker added --- Dockerfile | 16 ++++++++++++++++ docker-compose.yml | 9 +++++++++ handlers/basicCommands.go | 4 ++-- handlers/deleteCommand.go | 2 +- handlers/messageHandler.go | 4 ++-- services/Error.go | 18 +++++++++++++++++- 6 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..92bab46 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,16 @@ +# Use an official Golang runtime as a parent image +FROM golang:latest + +# Set the working directory to /app +WORKDIR . + +COPY . . + +# Download and install any required dependencies +RUN go mod download + +# Build the Go app +RUN go build . + +# Define the command to run the app when the container starts +CMD ["./kleincordBot"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..fe7b95e --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.8' +name: kleincord +services: + bot: + build: + context: . + dockerfile: Dockerfile + container_name: kleincord + restart: unless-stopped diff --git a/handlers/basicCommands.go b/handlers/basicCommands.go index 540f5f2..e16e1a6 100644 --- a/handlers/basicCommands.go +++ b/handlers/basicCommands.go @@ -16,7 +16,7 @@ func ReadBackCommand(data discordgo.ApplicationCommandInteractionData, s *discor }, ) if err != nil { - services.HandleError(err) + services.HandleError(err, s) } } @@ -29,6 +29,6 @@ func Test1Command(s *discordgo.Session, i *discordgo.InteractionCreate) { }, ) if err != nil { - services.HandleError(err) + services.HandleError(err, s) } } diff --git a/handlers/deleteCommand.go b/handlers/deleteCommand.go index fbd9ba1..e24f0a3 100644 --- a/handlers/deleteCommand.go +++ b/handlers/deleteCommand.go @@ -47,6 +47,6 @@ func DeleteCommand(data discordgo.ApplicationCommandInteractionData, s *discordg Content: strconv.Itoa(len(messages)) + " Message deleted", }) if err != nil { - services.HandleError(err) + services.HandleError(err, s) } } diff --git a/handlers/messageHandler.go b/handlers/messageHandler.go index a84cfbf..d7a8062 100644 --- a/handlers/messageHandler.go +++ b/handlers/messageHandler.go @@ -21,7 +21,7 @@ func MessageTest(s *discordgo.Session, m *discordgo.MessageCreate) { Type: discordgo.EmbedTypeArticle, }) if err != nil { - services.HandleError(err) + services.HandleError(err, s) } } @@ -37,6 +37,6 @@ func MessageTest2(s *discordgo.Session, m *discordgo.MessageCreate) { Type: discordgo.EmbedTypeArticle, }) if err != nil { - services.HandleError(err) + services.HandleError(err, s) } } diff --git a/services/Error.go b/services/Error.go index e91155d..609976e 100644 --- a/services/Error.go +++ b/services/Error.go @@ -1,5 +1,21 @@ package services -func HandleError(err error) { +import ( + "github.com/bwmarrin/discordgo" + "strconv" +) +func HandleError(err error, s *discordgo.Session) { + s.ChannelMessageSendComplex(strconv.Itoa(1236038688627101749), &discordgo.MessageSend{ + Content: "@here", + Embed: &discordgo.MessageEmbed{ + Title: "Error", + Color: 0xff0000, + Fields: []*discordgo.MessageEmbedField{ + { + Value: "```" + err.Error() + "```", + }, + }, + }, + }) }