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

@ -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