diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1ae33a9..1c4eb87 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,6 +18,9 @@ jobs: run: | touch .env echo BOT_TOKEN=${{ secrets.BOT_TOKEN }} >> .env + echo ERROR_CHANNEL_ID=${{ secrets.ERROR_CHANNEL_ID }} >> .env + echo LOG_CHANNEL_ID=${{ secrets.LOG_CHANNEL_ID }} >> .env + echo ENVIRONMENT=${{ secrets.ENVIRONMENT }} >> .env - name: Docker login run: docker login docker.eria-lifesystems.com -u Darius -p ${{ secrets.DOCKER_PASSWORD }} - name: Build the Docker image diff --git a/handlers/basicCommands.go b/handlers/basicCommands.go index ab44809..ba4123a 100644 --- a/handlers/basicCommands.go +++ b/handlers/basicCommands.go @@ -5,8 +5,11 @@ import ( "github.com/bwmarrin/discordgo" "kleincordBot/services" "log" + "time" ) +var LogChannelID string + func ReadBackCommand(data discordgo.ApplicationCommandInteractionData, s *discordgo.Session, i *discordgo.InteractionCreate) { err := s.InteractionRespond( i.Interaction, @@ -45,6 +48,12 @@ func StopCommand(s *discordgo.Session, i *discordgo.InteractionCreate) { }, }, ) + s.ChannelMessageSendEmbed( + LogChannelID, + &discordgo.MessageEmbed{ + Title: "stopped with command", + Timestamp: time.Now().Format(time.RFC3339), + }) log.Fatalf("stop command") } diff --git a/main.go b/main.go index 57a2ec6..bef5432 100644 --- a/main.go +++ b/main.go @@ -5,11 +5,13 @@ import ( "github.com/bwmarrin/discordgo" "github.com/joho/godotenv" "kleincordBot/commands" + "kleincordBot/handlers" "kleincordBot/routers" "kleincordBot/services" "log" "os" "os/signal" + "time" ) var GuildID = flag.String("guild", "", "Test guild ID. If not passed - bot registers commands globally") @@ -21,6 +23,7 @@ func main() { log.Fatalf(".env not found: %v", err) return } + handlers.LogChannelID = os.Getenv("LOG_CHANNEL_ID") services.InitServers() @@ -35,6 +38,13 @@ func main() { err = discord.Open() if err != nil { log.Fatalf("Cannot open the session: %v", err) + } else { + discord.ChannelMessageSendEmbed( + handlers.LogChannelID, + &discordgo.MessageEmbed{ + Title: "started " + os.Getenv("ENVIRONMENT"), + Timestamp: time.Now().Format(time.RFC3339), + }) } _, err = discord.ApplicationCommandBulkOverwrite(discord.State.User.ID, *GuildID, commands.Commands) diff --git a/services/Error.go b/services/Error.go index 9fd95c0..570fba5 100644 --- a/services/Error.go +++ b/services/Error.go @@ -3,12 +3,15 @@ package services import ( "fmt" "github.com/bwmarrin/discordgo" - "strconv" + "os" "time" ) +var errorChannelID string + func HandleError(err error, s *discordgo.Session) { - _, err = s.ChannelMessageSendComplex(strconv.Itoa(1236038688627101749), &discordgo.MessageSend{ + errorChannelID = os.Getenv("ERROR_CHANNEL_ID") + _, err = s.ChannelMessageSendComplex(errorChannelID, &discordgo.MessageSend{ Content: "@here", Embed: &discordgo.MessageEmbed{ Title: "Error",