From 21b541bdc1686a51db9af8626b4e6ce99c48f7be Mon Sep 17 00:00:00 2001 From: Matte23 Date: Tue, 27 Jun 2023 21:16:10 +0200 Subject: [PATCH] Add more logs --- autoCreate.go | 70 ++++++++++++++++++++++++++++++++++++++++----------- go.mod | 15 ++++++++--- go.sum | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++ log.go | 36 ++++++++++++++++++++++++++ main.go | 9 +++---- utils.go | 7 +++++- 6 files changed, 183 insertions(+), 24 deletions(-) create mode 100644 log.go diff --git a/autoCreate.go b/autoCreate.go index af857f2..c2fe0f0 100644 --- a/autoCreate.go +++ b/autoCreate.go @@ -26,37 +26,56 @@ var createdChannels = make(map[string]map[string][]string) var categoryName = "Gaming🎮" func initChannels(s *discordgo.Session, guildID string) { + log.Debugf("Preparing guild %s for automatic channel management", guildID) + category := searchChannel(s, guildID, categoryName, "") if category == nil { + log.Errorf("Cannot find category %s in guild %s", categoryName, guildID) return } deleteAllChannelsUnderCategory(s, guildID, category.ID) - createNewChannelEndpoint(s, guildID) + createNewChannelEndpoint(s, guildID, category.ID) createdChannels[guildID] = make(map[string][]string) } -func createNewChannelEndpoint(s *discordgo.Session, guildID string) { - category := searchChannel(s, guildID, categoryName, "") - if category == nil { - return - } +func createNewChannelEndpoint(s *discordgo.Session, guildID string, channelParent string) { newChannelData := discordgo.GuildChannelCreateData{ Name: "Crea nuovo canale", Type: discordgo.ChannelTypeGuildVoice, - ParentID: category.ID} + ParentID: channelParent} - newChannelEndpoint[guildID], _ = s.GuildChannelCreateComplex(guildID, newChannelData) + var err error + newChannelEndpoint[guildID], err = s.GuildChannelCreateComplex(guildID, newChannelData) + + if err != nil { + log.Errorf("Cannot create channel with name %s in guild %s. This guild is in a corrupted state", newChannelData.Name, guildID) + return + } + + log.Debugf("Created channel with name %s in guild %s", newChannelData.Name, guildID) } func createNewChannel(s *discordgo.Session, vs *discordgo.VoiceStateUpdate) { - channelName := getActivity(s.State, vs.GuildID, vs.UserID) - s.ChannelEdit(vs.ChannelID, channelName) - createdChannels[vs.GuildID][vs.ChannelID] = []string{vs.UserID} + category := searchChannel(s, vs.GuildID, categoryName, "") + if category == nil { + log.Errorf("Cannot find category %s in guild %s", categoryName, vs.GuildID) + return + } - createNewChannelEndpoint(s, vs.GuildID) + channelName := getActivity(s.State, vs.GuildID, vs.UserID) + editChannelData := discordgo.ChannelEdit{Name: channelName} + _, err := s.ChannelEdit(vs.ChannelID, &editChannelData) + if err != nil { + log.Errorf("Cannot rename channel %s with new name %s in guild %s", vs.ChannelID, channelName, vs.GuildID) + return + } + createdChannels[vs.GuildID][vs.ChannelID] = []string{vs.UserID} + log.Debugf("Renamed channel %s to %s in guild %s", vs.ChannelID, channelName, vs.GuildID) + + createNewChannelEndpoint(s, vs.GuildID, category.ID) } func removeUserFromChannels(s *discordgo.Session, vs *discordgo.VoiceStateUpdate) { @@ -65,7 +84,13 @@ func removeUserFromChannels(s *discordgo.Session, vs *discordgo.VoiceStateUpdate if index != -1 { if len(channel) == 1 { - s.ChannelDelete(channelID) + _, err := s.ChannelDelete(channelID) + if err != nil { + log.Errorf("Cannot delete channel %s in guild %s", channelID, vs.GuildID) + } else { + log.Debugf("Channel %s deleted in guild %s", channelID, vs.GuildID) + delete(createdChannels[vs.GuildID], channelID) + } } else { createdChannels[vs.GuildID][channelID] = remove(channel, index) } @@ -90,7 +115,24 @@ func updateChannelName(s *discordgo.Session, guildID string, channelID string) { } } - s.ChannelEdit(channelID, name) + channel, err := s.Channel(channelID) + if err != nil { + log.Errorf("Channel %s not found in guild %s", channelID, guildID) + return + } + + oldName := channel.Name + + if oldName == name { + return + } + + editChannelData := discordgo.ChannelEdit{Name: name} + _, err = s.ChannelEdit(channelID, &editChannelData) + if err != nil { + log.Errorf("Cannot rename channel %s with new name %s in guild %s", channelID, name, guildID) + } + log.Debugf("Renamed channel %s from %s to %s in guild %s", channelID, oldName, name, guildID) } func getActivity(st *discordgo.State, guildID string, userID string) string { diff --git a/go.mod b/go.mod index 873fb24..b68a730 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,16 @@ module github.com/Matte23/InnkeeperBot -go 1.17 +go 1.20 require ( - github.com/bwmarrin/discordgo v0.23.2 - github.com/gorilla/websocket v1.4.0 // indirect - golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16 // indirect + github.com/bwmarrin/discordgo v0.27.1 + go.uber.org/zap v1.24.0 +) + +require ( + github.com/gorilla/websocket v1.5.0 // indirect + go.uber.org/atomic v1.11.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/crypto v0.10.0 // indirect + golang.org/x/sys v0.9.0 // indirect ) diff --git a/go.sum b/go.sum index 28dbed2..3c3fca2 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,76 @@ +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/bwmarrin/discordgo v0.23.2 h1:BzrtTktixGHIu9Tt7dEE6diysEF9HWnXeHuoJEt2fH4= github.com/bwmarrin/discordgo v0.23.2/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= +github.com/bwmarrin/discordgo v0.27.1 h1:ib9AIc/dom1E/fSIulrBwnez0CToJE113ZGt4HoliGY= +github.com/bwmarrin/discordgo v0.27.1/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= +go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.20.0 h1:N4oPlghZwYG55MlU6LXk/Zp00FVNE9X9wrYO8CEs4lc= +go.uber.org/zap v1.20.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16 h1:y6ce7gCWtnH+m3dCjzQ1PCuwl28DDIc3VNnvY29DlIA= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= +golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= +golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +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= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/log.go b/log.go new file mode 100644 index 0000000..f5554dd --- /dev/null +++ b/log.go @@ -0,0 +1,36 @@ +package main + +import ( + "os" + "time" + + "go.uber.org/zap" + "go.uber.org/zap/zapcore" +) + +var log *zap.SugaredLogger + +func newDefaultProductionLogEncoder(colorize bool) zapcore.Encoder { + encCfg := zap.NewProductionEncoderConfig() + // if interactive terminal, make output more human-readable by default + encCfg.EncodeTime = func(ts time.Time, encoder zapcore.PrimitiveArrayEncoder) { + encoder.AppendString(ts.UTC().Format("2006/01/02 15:04:05.000")) + } + if colorize { + encCfg.EncodeLevel = zapcore.CapitalColorLevelEncoder + } + return zapcore.NewConsoleEncoder(encCfg) +} + +func setupLogging() { + consoleStream := zapcore.Lock(os.Stderr) + consoleEncoder := newDefaultProductionLogEncoder(true) + noPriority := zap.LevelEnablerFunc(func(lvl zapcore.Level) bool { + return true + }) + consoleCore := zapcore.NewCore(consoleEncoder, consoleStream, noPriority) + + logger := zap.New(consoleCore) + defer logger.Sync() // flushes buffer, if any + log = logger.Sugar().Named("InnkeeperBot") +} diff --git a/main.go b/main.go index 5655f3b..5c05f1b 100644 --- a/main.go +++ b/main.go @@ -18,7 +18,6 @@ package main import ( "flag" - "fmt" "os" "os/signal" "strings" @@ -39,11 +38,11 @@ func init() { } func main() { - + setupLogging() // Create a new Discord session using the provided bot token. dg, err := discordgo.New("Bot " + Token) if err != nil { - fmt.Println("error creating Discord session,", err) + log.Fatal("Error creating Discord session,", err) return } @@ -56,12 +55,12 @@ func main() { // Open a websocket connection to Discord and begin listening. err = dg.Open() if err != nil { - fmt.Println("error opening connection,", err) + log.Fatal("Error opening connection,", err) return } // Wait here until CTRL-C or other term signal is received. - fmt.Println("Bot is now running. Press CTRL-C to exit.") + log.Info("InnkeeperBot is now running. Press CTRL-C to exit.") sc := make(chan os.Signal, 1) signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt) <-sc diff --git a/utils.go b/utils.go index ef74c9f..b98a19d 100644 --- a/utils.go +++ b/utils.go @@ -48,7 +48,12 @@ func getAllChannelsUnderCategory(s *discordgo.Session, guildID string, channelPa func deleteAllChannelsUnderCategory(s *discordgo.Session, guildID string, channelParent string) { for _, channel := range getAllChannelsUnderCategory(s, guildID, channelParent) { - s.ChannelDelete(channel.ID) + _, err := s.ChannelDelete(channel.ID) + if err != nil { + log.Errorf("Cannot delete channel %s in guild %s", channel.ID, guildID) + } else { + log.Debugf("Channel %s deleted in guild %s", channel.ID, guildID) + } } }