fix nil member chunking filter and ping pong example, rename BotUser …

…field to Bot
disgoorg · Mar 27, 2022 · 252811c · 252811c
1 parent ee4cea6
commit 252811c
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 8 deletions.
diff --git a/_examples/components/example.go b/_examples/components/example.go
@@ -28,7 +28,7 @@ func main() {
 		bot.WithGatewayConfigOpts(gateway.WithGatewayIntents(discord.GatewayIntentGuilds, discord.GatewayIntentGuildMessages, discord.GatewayIntentDirectMessages)),
 		bot.WithEventListeners(&events.ListenerAdapter{
 			OnMessageCreate: func(event *events.MessageCreateEvent) {
-				if event.Message.Author.BotUser || event.Message.Author.System {
+				if event.Message.Author.Bot || event.Message.Author.System {
 					return
 				}
 				if event.Message.Content == "test" {

diff --git a/_examples/message_collector/example.go b/_examples/message_collector/example.go
@@ -49,7 +49,7 @@ func main() {
 }
 
 func onMessageCreate(event *events.MessageCreateEvent) {
-	if event.Message.Author.BotUser || event.Message.Author.System {
+	if event.Message.Author.Bot || event.Message.Author.System {
 		return
 	}
 	if event.Message.Content == "start" {

diff --git a/_examples/ping_pong/example.go b/_examples/ping_pong/example.go
@@ -20,10 +20,10 @@ func main() {
 	log.SetLevel(log.LevelDebug)
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 
-	client, err := disgo.New(os.Getenv("token"),
+	client, err := disgo.New(os.Getenv("disgo_token"),
 		bot.WithGatewayConfigOpts(
 			gateway.WithGatewayIntents(
-				discord.GatewayIntentsNone,
+				discord.GatewayIntentMessageContent,
 			),
 		),
 		bot.WithCacheConfigOpts(cache.WithCacheFlags(cache.FlagsDefault)),
@@ -48,6 +48,9 @@ func main() {
 }
 
 func onMessageCreate(event *events.MessageCreateEvent) {
+	if event.Message.Author.Bot {
+		return
+	}
 	var message string
 	if event.Message.Content == "ping" {
 		message = "pong"

diff --git a/_examples/sharding/example.go b/_examples/sharding/example.go
@@ -64,7 +64,7 @@ func main() {
 }
 
 func onMessageCreate(event *events.MessageCreateEvent) {
-	if event.Message.Author.BotUser {
+	if event.Message.Author.Bot {
 		return
 	}
 	_, _ = event.Client().Rest().Channels().CreateMessage(event.ChannelID, discord.NewMessageCreateBuilder().SetContent(event.Message.Content).Build())

diff --git a/_examples/test/listeners.go b/_examples/test/listeners.go
@@ -132,7 +132,7 @@ func applicationCommandListener(event *events.ApplicationCommandInteractionEvent
 }
 
 func messageListener(event *events.GuildMessageCreateEvent) {
-	if event.Message.Author.BotUser {
+	if event.Message.Author.Bot {
 		return
 	}
 
@@ -204,7 +204,7 @@ func messageListener(event *events.GuildMessageCreateEvent) {
 	case "repeat":
 		go func() {
 			ch, cls := bot.NewEventCollector(event.Client(), func(event *events.MessageCreateEvent) bool {
-				return !event.Message.Author.BotUser && event.ChannelID == event.ChannelID
+				return !event.Message.Author.Bot && event.ChannelID == event.ChannelID
 			})
 
 			var count = 0

diff --git a/bot/config.go b/bot/config.go
@@ -17,6 +17,7 @@ func DefaultConfig(gatewayHandlers map[discord.GatewayEventType]GatewayEventHand
 	return &Config{
 		Logger:                 log.Default(),
 		EventManagerConfigOpts: []EventManagerConfigOpt{WithGatewayHandlers(gatewayHandlers), WithHTTPServerHandler(httpHandler)},
+		MemberChunkingFilter:   MemberChunkingFilterNone,
 	}
 }
 

diff --git a/bot/member_chunking_manager.go b/bot/member_chunking_manager.go
@@ -12,6 +12,9 @@ import (
 var _ MemberChunkingManager = (*memberChunkingManagerImpl)(nil)
 
 func NewMemberChunkingManager(client Client, memberChunkingFilter MemberChunkingFilter) MemberChunkingManager {
+	if memberChunkingFilter == nil {
+		memberChunkingFilter = MemberChunkingFilterNone
+	}
 	return &memberChunkingManagerImpl{
 		bot:                  client,
 		memberChunkingFilter: memberChunkingFilter,

diff --git a/discord/user.go b/discord/user.go
@@ -46,7 +46,7 @@ type User struct {
 	Avatar        *string             `json:"avatar"`
 	Banner        *string             `json:"banner"`
 	AccentColor   *int                `json:"accent_color"`
-	BotUser       bool                `json:"bot"`
+	Bot           bool                `json:"bot"`
 	System        bool                `json:"system"`
 	PublicFlags   UserFlags           `json:"public_flags"`
 }