update versions and change to std logger

This commit is contained in:
Seraphim Strub 2023-04-23 00:33:20 +02:00
parent aa20d59a0f
commit df441014ed
17 changed files with 212 additions and 147 deletions

View file

@ -3,8 +3,8 @@ package api
import (
"encoding/json"
"fmt"
"github.com/disgoorg/log"
"io"
"log"
"net/http"
"time"
)
@ -113,7 +113,7 @@ func (e EpicStruct) Load() error {
productSlug = element.OfferMappings[0].PageSlug
}
if productSlug == "" {
log.Errorf("product slug not found for: %v", element.Title)
log.Printf("ERROR: product slug not found for: %v", element.Title)
continue
}

View file

@ -9,10 +9,11 @@ import (
"github.com/disgoorg/disgo/discord"
"github.com/disgoorg/disgo/rest"
"github.com/disgoorg/disgo/webhook"
"github.com/disgoorg/log"
"github.com/disgoorg/snowflake/v2"
"github.com/getsentry/sentry-go"
"grow.rievo.dev/discordBots/cmd/dealsbot/api"
"grow.rievo.dev/discordBots/cmd/dealsbot/repository"
"log"
"os"
"os/signal"
"reflect"
@ -36,9 +37,23 @@ func main() {
// - origin
// - check ubisoft works
log.SetLevel(log.LevelInfo)
log.Info("starting dealsbot...")
log.Info("disgo version: ", disgo.Version)
err := sentry.Init(sentry.ClientOptions{
Dsn: "https://0282823b5ee14546a4c154c129109a31@sentry.rvo.one/2",
// Set TracesSampleRate to 1.0 to capture 100%
// of transactions for performance monitoring.
// We recommend adjusting this value in production,
TracesSampleRate: 1.0,
})
if err != nil {
log.Fatalf("sentry.Init: %s", err)
}
// Flush buffered events before the program terminates.
defer sentry.Flush(2 * time.Second)
sentry.CaptureMessage("DEBUG: dealsbot started")
log.Printf("INFO: starting dealsbot...")
log.Printf("INFO: disgo version: %v", disgo.Version)
client := webhook.New(webhookID, webhookToken)
defer client.Close(context.TODO())
@ -59,7 +74,7 @@ func main() {
for _, api := range apis {
err := api.Load()
if err != nil {
log.Error(err)
log.Printf("ERROR: %v", err)
}
}
var deals []api.Deal
@ -72,15 +87,15 @@ func main() {
retrievedDeal, _ := repo.GetValue(deal.Id)
if deal.Id == retrievedDeal.Id {
log.Debugf("%v is already published", deal.Id)
log.Printf("DEBUG: %v is already published", deal.Id)
} else if reflect.DeepEqual(deal, retrievedDeal) {
log.Errorf("%v is published but not equal", deal.Id)
log.Printf("ERROR: %v is published but not equal", deal.Id)
} else {
log.Infof("%v is new and will be published", deal.Id)
log.Printf("INFO: %v is new and will be published", deal.Id)
go sendWebhook(client, deal)
err := repo.SetValue(deal)
if err != nil {
log.Error(err)
log.Printf("ERROR: %v", err)
}
}
}
@ -88,9 +103,9 @@ func main() {
case <-tickerGC.C:
err := repo.RunGC()
if err != nil && !errors.Is(err, badger.ErrNoRewrite) {
log.Errorf("error with GC: %v", err)
log.Printf("ERROR: GC: %v", err)
} else {
log.Debug("GC successful")
log.Printf("DEBUG: GC successful")
}
case <-quit:
ticker.Stop()
@ -100,7 +115,7 @@ func main() {
}
}()
log.Infof("dealsbot is now running. Press CTRL-C to exit.")
log.Printf("INFO: dealsbot is now running. Press CTRL-C to exit.")
s := make(chan os.Signal, 1)
signal.Notify(s, syscall.SIGINT, syscall.SIGTERM, os.Interrupt)
<-s
@ -115,6 +130,6 @@ func sendWebhook(client webhook.Client, deal api.Deal) {
SetContent(status).Build(),
rest.WithDelay(2*time.Second),
); err != nil {
log.Errorf("error sending message %v", err.Error())
log.Printf("ERROR: sending message %v", err.Error())
}
}

View file

@ -3,8 +3,8 @@ package repository
import (
"encoding/json"
"github.com/dgraph-io/badger/v4"
"github.com/disgoorg/log"
"grow.rievo.dev/discordBots/cmd/dealsbot/api"
"log"
)
type Repository interface {

View file

@ -2,13 +2,12 @@ package main
import (
"context"
"fmt"
"github.com/disgoorg/disgo"
"github.com/disgoorg/disgo/bot"
"github.com/disgoorg/disgo/cache"
"github.com/disgoorg/disgo/discord"
"github.com/disgoorg/disgo/gateway"
"github.com/disgoorg/log"
"log"
"os"
)
@ -19,9 +18,8 @@ var (
// this bot should in theory delete all registered commands for a certain bot
func main() {
log.SetLevel(log.LevelDebug)
log.Info("starting delcombot...")
log.Info("disgo version: ", disgo.Version)
log.Printf("INFO: starting delcombot...")
log.Printf("INFO: disgo version: %v", disgo.Version)
// permissions:
// intent:
@ -44,17 +42,17 @@ func main() {
client.Caches().GuildsForEach(func(guild discord.Guild) {
if _, err = client.Rest().SetGuildCommands(client.ApplicationID(), guild.ID, noCommands); err != nil {
log.Info(fmt.Sprintf("error deleting guild commands from %v: ", guild.Name), err)
log.Printf("INFO: error deleting guild commands from %v: %v", guild.Name, err)
}
})
if _, err = client.Rest().SetGlobalCommands(client.ApplicationID(), noCommands); err != nil {
log.Info("error deleting global commands", err)
log.Printf("INFO: error deleting global commands %v", err)
}
if err = client.OpenGateway(context.TODO()); err != nil {
log.Fatal("error while connecting to gateway: ", err)
}
log.Infof("delcombot removed all guild and global commands")
log.Printf("INFO: delcombot removed all guild and global commands")
}

View file

@ -9,11 +9,11 @@ import (
"github.com/disgoorg/disgo/discord"
"github.com/disgoorg/disgo/rest"
"github.com/disgoorg/disgo/webhook"
"github.com/disgoorg/log"
"github.com/disgoorg/snowflake/v2"
"grow.rievo.dev/discordBots/cmd/domaincheckbot/config"
"grow.rievo.dev/discordBots/cmd/domaincheckbot/dns"
"grow.rievo.dev/discordBots/cmd/domaincheckbot/repository"
"log"
"os"
"os/signal"
"reflect"
@ -29,9 +29,8 @@ var (
// TODO: clear db from domains removed from json
func main() {
log.SetLevel(log.LevelInfo)
log.Info("starting domainCheck...")
log.Info("disgo version: ", disgo.Version)
log.Printf("INFO: starting domainCheck...")
log.Printf("INFO: disgo version: %v", disgo.Version)
client := webhook.New(webhookID, webhookToken)
defer client.Close(context.TODO())
@ -54,9 +53,9 @@ func main() {
case <-tickerGC.C:
err := repo.RunGC()
if err != nil && !errors.Is(err, badger.ErrNoRewrite) {
log.Errorf("error with GC: %v", err)
log.Printf("ERROR: with GC: %v", err)
} else {
log.Debug("GC successful")
log.Printf("DEBUG: GC successful")
}
case <-quit:
@ -67,7 +66,7 @@ func main() {
}
}()
log.Infof("domainCheck is now running. Press CTRL-C to exit.")
log.Printf("INFO: domainCheck is now running. Press CTRL-C to exit.")
s := make(chan os.Signal, 1)
signal.Notify(s, syscall.SIGINT, syscall.SIGTERM, os.Interrupt)
<-s
@ -77,10 +76,10 @@ func checkDomain(counter int, d string, repo *repository.DomainRepository, clien
domain := dns.CheckDomain(d)
retrievedDomain, _ := repo.GetValue(d)
if reflect.DeepEqual(domain, retrievedDomain) {
log.Debugf(" %v: did not change", d)
log.Printf("DEBUG: %v: did not change", d)
return
}
log.Infof("!%v: changed", d)
log.Printf("INFO: !%v: changed", d)
counter += 1
if counter >= 2 {
go sendWebhook(client, domain, retrievedDomain)
@ -103,6 +102,6 @@ func sendWebhook(client webhook.Client, domain repository.Domain, oldDomain repo
SetContent(status).Build(),
rest.WithDelay(2*time.Second),
); err != nil {
log.Errorf("error sending message %v", err.Error())
log.Printf("ERROR: sending message %v", err.Error())
}
}

View file

@ -3,7 +3,7 @@ package repository
import (
"encoding/json"
"github.com/dgraph-io/badger/v4"
"github.com/disgoorg/log"
"log"
)
type Domain struct {

View file

@ -5,6 +5,7 @@ import (
"github.com/disgoorg/disgo/discord"
"github.com/disgoorg/disgo/events"
"grow.rievo.dev/discordBots/cmd/funbot/imgur"
"log"
"strings"
)
@ -32,7 +33,7 @@ func handlerImg(event *events.ApplicationCommandInteractionCreate) {
}
}(value)
if err != nil {
event.Client().Logger().Error("error on getting link: ", err)
log.Printf("ERROR: error on getting link: %v", err)
return
}
@ -40,7 +41,7 @@ func handlerImg(event *events.ApplicationCommandInteractionCreate) {
SetContent(link).
SetEphemeral(false).Build())
if err != nil {
event.Client().Logger().Error("error on sending response: ", err)
log.Printf("ERROR: error on sending response: %v", err)
return
}
}

View file

@ -6,9 +6,9 @@ import (
"github.com/disgoorg/disgo/bot"
"github.com/disgoorg/disgo/cache"
"github.com/disgoorg/disgo/gateway"
"github.com/disgoorg/log"
"grow.rievo.dev/discordBots/cmd/funbot/command"
"grow.rievo.dev/discordBots/cmd/funbot/config"
"log"
"os"
"os/signal"
"strings"
@ -16,9 +16,8 @@ import (
)
func main() {
log.SetLevel(log.LevelInfo)
log.Info("starting funbot...")
log.Info("disgo version: ", disgo.Version)
log.Printf("INFO: starting funbot...")
log.Printf("INFO: disgo version: %v", disgo.Version)
// permissions:
// intent:
@ -51,7 +50,7 @@ func main() {
}
if config.RegisterGuildID != 0 {
if _, err = client.Rest().SetGuildCommands(client.ApplicationID(), config.RegisterGuildID, config.NoCommands); err != nil {
log.Info("error deleting guild commands", err)
log.Printf("INFO: error deleting guild commands %v", err)
}
}
} else {
@ -59,7 +58,7 @@ func main() {
log.Fatal("error while registering commands: ", err)
}
if _, err = client.Rest().SetGlobalCommands(client.ApplicationID(), config.NoCommands); err != nil {
log.Info("error deleting global commands", err)
log.Printf("INFO: error deleting global commands %v", err)
}
}
@ -67,7 +66,7 @@ func main() {
log.Fatal("error while connecting to gateway: ", err)
}
log.Infof("funbot is now running. Press CTRL-C to exit.")
log.Printf("INFO: funbot is now running. Press CTRL-C to exit.")
s := make(chan os.Signal, 1)
signal.Notify(s, syscall.SIGINT, syscall.SIGTERM, os.Interrupt)
<-s

View file

@ -6,8 +6,8 @@ import (
"github.com/disgoorg/disgo/bot"
"github.com/disgoorg/disgo/cache"
"github.com/disgoorg/disgo/gateway"
"github.com/disgoorg/log"
"github.com/disgoorg/snowflake/v2"
"log"
"os"
"os/signal"
"syscall"
@ -21,9 +21,8 @@ var (
)
func main() {
log.SetLevel(log.LevelInfo)
log.Info("starting tempbot...")
log.Info("disgo version: ", disgo.Version)
log.Printf("INFO: starting tempbot...")
log.Printf("INFO: disgo version: %v", disgo.Version)
// permissions: Manage Messages
// intent:
@ -62,13 +61,12 @@ func main() {
ticker := time.NewTicker(1 * time.Minute)
quit := make(chan struct{})
go func() {
client.Logger().Debug("does it even run")
for {
select {
case <-ticker.C:
messages, err := client.Rest().GetMessages(channelTempID, 0, 0, 0, 100)
if err != nil {
client.Logger().Error("error getting messages: ", err)
log.Printf("ERROR: getting messages: %v", err)
}
var messageIDs []snowflake.ID
for _, message := range messages {
@ -76,17 +74,17 @@ func main() {
messageIDs = append(messageIDs, message.ID)
}
}
client.Logger().Debug("deleting messages: ", len(messageIDs))
log.Printf("DEBUG: deleting messages: %v", len(messageIDs))
if len(messageIDs) == 1 {
err = client.Rest().DeleteMessage(channelTempID, messageIDs[0])
if err != nil {
client.Logger().Error("error deleting messages: ", err)
log.Printf("ERROR: deleting messages: %v", err)
}
}
if len(messageIDs) > 1 {
err = client.Rest().BulkDeleteMessages(channelTempID, messageIDs)
if err != nil {
client.Logger().Error("error deleting messages: ", err)
log.Printf("ERROR: deleting messages: %v", err)
}
}
case <-quit:
@ -96,7 +94,7 @@ func main() {
}
}()
log.Infof("tempbot is now running. Press CTRL-C to exit.")
log.Printf("INFO: tempbot is now running. Press CTRL-C to exit.")
s := make(chan os.Signal, 1)
signal.Notify(s, syscall.SIGINT, syscall.SIGTERM, os.Interrupt)
<-s

View file

@ -2,8 +2,8 @@ package config
import (
"encoding/json"
"github.com/disgoorg/log"
"io"
"log"
"net/http"
)
@ -35,6 +35,6 @@ func LoadAppleList() error {
return err
}
AppleList = data.Body
log.Debug("loaded apple list of lenght: ", len(AppleList))
log.Printf("DEBUG: loaded apple list of lenght: %v", len(AppleList))
return nil
}

View file

@ -4,10 +4,11 @@ import (
"fmt"
"github.com/disgoorg/disgo/events"
"grow.rievo.dev/discordBots/cmd/vcbot/helper"
"log"
)
func JoinEvent(event *events.GuildVoiceJoin) {
event.Client().Logger().Debug("JoinEvent")
log.Printf("DEBUG: JoinEvent")
channelId := *event.VoiceState.ChannelID
channel, _ := event.Client().Rest().GetChannel(channelId)
channelName := channel.Name()
@ -26,7 +27,7 @@ func MoveEvent(event *events.GuildVoiceMove) {
// no that's not a move event
return
}
event.Client().Logger().Debug("MoveEvent")
log.Printf("DEBUG: MoveEvent")
channelOldId := *event.OldVoiceState.ChannelID
channelOld, _ := event.Client().Rest().GetChannel(channelOldId)
channelOldName := channelOld.Name()
@ -44,9 +45,9 @@ func MoveEvent(event *events.GuildVoiceMove) {
}
func LeaveEvent(event *events.GuildVoiceLeave) {
event.Client().Logger().Debug("LeaveEvent")
log.Printf("DEBUG: LeaveEvent")
if event.OldVoiceState.ChannelID == nil {
event.Client().Logger().Error("OldVoiceState.ChannelID missing")
log.Printf("ERROR: OldVoiceState.ChannelID missing")
return
}
channelOldId := *event.OldVoiceState.ChannelID

View file

@ -7,6 +7,7 @@ import (
"github.com/disgoorg/disgo/discord"
"github.com/disgoorg/snowflake/v2"
"grow.rievo.dev/discordBots/cmd/vcbot/config"
"log"
"math/rand"
)
@ -14,14 +15,14 @@ func SendNoMention(client bot.Client, msg, msgEdit string) {
message, err := client.Rest().CreateMessage(config.ChannelVoiceLogID, discord.NewMessageCreateBuilder().
SetContent(msg).Build())
if err != nil {
client.Logger().Error("unable to send channel message: ", err)
log.Printf("ERROR: unable to send channel message: %v", err)
return
}
_, err = client.Rest().UpdateMessage(config.ChannelVoiceLogID,
message.ID,
discord.NewMessageUpdateBuilder().ClearContent().SetContent(msgEdit).Build())
if err != nil {
client.Logger().Error("unable to update channel message: ", err)
log.Printf("ERROR: unable to update channel message: %v", err)
return
}
}
@ -70,7 +71,7 @@ func UpdateVoiceChannels(client bot.Client, deleteChannels bool) {
voiceChannels, err := GetVoiceChannels(client)
if err != nil {
client.Logger().Error("error in getVoiceChannels: ", err)
log.Printf("ERROR: error in getVoiceChannels: %v", err)
}
voiceChannelsWithState := make(map[snowflake.ID]string)
voiceChannelsEmpty := make(map[snowflake.ID]string)
@ -93,16 +94,16 @@ func UpdateVoiceChannels(client bot.Client, deleteChannels bool) {
})
if len(voiceChannels) == 2 && len(voiceChannelsWithState) == 0 {
client.Logger().Debug("all channels are empty")
log.Printf("DEBUG: all channels are empty")
return
}
if len(voiceChannelsWithState) >= len(voiceChannels) {
// if there are no empty voiceChannels create one
client.Logger().Debug("new channel has to be created")
log.Printf("DEBUG: new channel has to be created")
name, err := GetName(voiceChannels)
if err != nil {
client.Logger().Error("no empty channels")
log.Printf("ERROR: no empty channels")
return
}
_, err = client.Rest().CreateGuildChannel(config.RegisterGuildID, discord.GuildVoiceChannelCreate{
@ -118,15 +119,15 @@ func UpdateVoiceChannels(client bot.Client, deleteChannels bool) {
if len(voiceChannels)-len(voiceChannelsWithState) > 1 && deleteChannels {
// if there are more than one empty voiceChannels delete all but 1
client.Logger().Debug("channel has to be deleted")
client.Logger().Debug("empty channels: ", voiceChannelsEmpty)
log.Printf("DEBUG: channel has to be deleted")
log.Printf("DEBUG: empty channels: %v", voiceChannelsEmpty)
for id, s := range voiceChannelsEmpty {
// get the oldest channel and delete it
client.Logger().Debug("deleting: ", s)
log.Printf("DEBUG: deleting: %v", s)
err := client.Rest().DeleteChannel(id)
if err != nil {
client.Logger().Error("not able to delete: ", err)
log.Printf("ERROR: not able to delete: %v", err)
return
}
break

View file

@ -6,18 +6,17 @@ import (
"github.com/disgoorg/disgo/bot"
"github.com/disgoorg/disgo/cache"
"github.com/disgoorg/disgo/gateway"
"github.com/disgoorg/log"
"grow.rievo.dev/discordBots/cmd/vcbot/config"
"grow.rievo.dev/discordBots/cmd/vcbot/event"
"log"
"os"
"os/signal"
"syscall"
)
func main() {
log.SetLevel(log.LevelInfo)
log.Info("starting vcbot...")
log.Info("disgo version: ", disgo.Version)
log.Printf("INFO: starting vcbot...")
log.Printf("INFO: disgo version: %v", disgo.Version)
err := config.LoadAppleList()
if err != nil {
@ -66,7 +65,7 @@ func main() {
log.Fatal("couldn't find needed channel")
}
log.Infof("vcbot is now running. Press CTRL-C to exit.")
log.Printf("ERROR: vcbot is now running. Press CTRL-C to exit.")
s := make(chan os.Signal, 1)
signal.Notify(s, syscall.SIGINT, syscall.SIGTERM, os.Interrupt)
<-s

View file

@ -5,6 +5,7 @@ import (
"github.com/disgoorg/disgo/discord"
"github.com/disgoorg/disgo/events"
"grow.rievo.dev/discordBots/cmd/welcomebot/config"
"log"
"time"
)
@ -12,12 +13,12 @@ func JoinEvent(event *events.GuildMemberJoin) {
// on join send message in welcome
user := event.Member.User
if event.GuildID.String() != config.RegisterGuildID.String() {
event.Client().Logger().Error("join from an other guild")
log.Printf("ERROR: join from an other guild")
return
}
guild, err := event.Client().Rest().GetGuild(config.RegisterGuildID, false)
if err != nil {
event.Client().Logger().Error("could not find guild: ", err)
log.Printf("ERRPR: could not find guild: %v", err)
return
}
@ -38,7 +39,7 @@ func JoinEvent(event *events.GuildMemberJoin) {
Build(),
)
if err != nil {
event.Client().Logger().Error("on sending join message: ", err)
log.Printf("ERROR: on sending join message: %v", err)
return
}
}
@ -47,12 +48,12 @@ func LeaveEvent(event *events.GuildMemberLeave) {
user := event.User
if event.GuildID.String() != config.RegisterGuildID.String() {
event.Client().Logger().Error("leave from an other guild")
log.Printf("ERROR: leave from an other guild")
return
}
guild, err := event.Client().Rest().GetGuild(config.RegisterGuildID, false)
if err != nil {
event.Client().Logger().Error("could not find guild: ", err)
log.Printf("ERROR: could not find guild: %v", err)
return
}
@ -63,14 +64,14 @@ func LeaveEvent(event *events.GuildMemberLeave) {
Build(),
)
if err != nil {
event.Client().Logger().Error("on sending leave message: ", err)
log.Printf("ERROR: on sending leave message: %v", err)
return
}
}
func ReactionEvent(event *events.ComponentInteractionCreate) {
if event.ChannelID() != config.ChannelWelcomeID {
if event.Channel().ID != config.ChannelWelcomeID {
// reaction is not in welcome chat
return
}
@ -86,7 +87,7 @@ func ReactionEvent(event *events.ComponentInteractionCreate) {
}
approver, err := event.Client().Rest().GetMember(config.RegisterGuildID, approverID)
if err != nil {
event.Client().Logger().Error("could not find user: ", err)
log.Printf("ERROR: could not find user: %v", err)
return
}
hasPermission := func() bool {
@ -104,7 +105,7 @@ func ReactionEvent(event *events.ComponentInteractionCreate) {
SetContent("you don't have permissions to do this").
Build())
if err != nil {
event.Client().Logger().Error("could not respond to reaction: ", err)
log.Printf("ERROR: could not respond to reaction: %v", err)
return
}
return
@ -113,7 +114,7 @@ func ReactionEvent(event *events.ComponentInteractionCreate) {
messageID := event.Message.ID
message, err := event.Client().Rest().GetMessage(config.ChannelWelcomeID, messageID)
if err != nil {
event.Client().Logger().Error("could not find message: ", err)
log.Printf("ERROR: could not find message: %v", err)
return
}
if len(message.Mentions) != 1 {
@ -125,7 +126,7 @@ func ReactionEvent(event *events.ComponentInteractionCreate) {
// add role to user (bot role needs to be above roleAppleID)
err = event.Client().Rest().AddMemberRole(config.RegisterGuildID, user.ID, config.RoleAppleID)
if err != nil {
event.Client().Logger().Error("not able to add role: ", err)
log.Printf("ERROR: not able to add role: %v", err)
return
}
@ -149,7 +150,7 @@ func ReactionEvent(event *events.ComponentInteractionCreate) {
ClearContainerComponents().
Build())
if err != nil {
event.Client().Logger().Error("could not update message: ", err)
log.Printf("ERROR: could not update message: %v", err)
return
}
}

View file

@ -6,18 +6,17 @@ import (
"github.com/disgoorg/disgo/bot"
"github.com/disgoorg/disgo/cache"
"github.com/disgoorg/disgo/gateway"
"github.com/disgoorg/log"
"grow.rievo.dev/discordBots/cmd/welcomebot/config"
"grow.rievo.dev/discordBots/cmd/welcomebot/event"
"log"
"os"
"os/signal"
"syscall"
)
func main() {
log.SetLevel(log.LevelInfo)
log.Info("starting welcomebot...")
log.Info("disgo version: ", disgo.Version)
log.Printf("INFO: starting welcomebot...")
log.Printf("INFO: disgo version: %v", disgo.Version)
// permissions: Manage Roles
// intent: Server Members Intent
@ -73,7 +72,7 @@ func main() {
log.Fatal("couldn't find needed role")
}
log.Infof("welcomebot is now running. Press CTRL-C to exit.")
log.Printf("INFO: welcomebot is now running. Press CTRL-C to exit.")
s := make(chan os.Signal, 1)
signal.Notify(s, syscall.SIGINT, syscall.SIGTERM, os.Interrupt)
<-s