improve presence UX

_examples/test/examplebot.go

@@ -33,7 +33,7 @@ func main() {
 	client, err := disgo.New(token,
 		bot.WithGatewayConfigOpts(
 			gateway.WithIntents(gateway.IntentsNonPrivileged, gateway.IntentMessageContent),
-			gateway.WithPresence(gateway.NewListeningPresence("your bullshit", discord.OnlineStatusOnline, false)),
+			gateway.WithPresenceOpts(gateway.WithListeningActivity("your bullshit"), gateway.WithOnlineStatus(discord.OnlineStatusDND)),
 		),
 		bot.WithCacheConfigOpts(
 			cache.WithCacheFlags(cache.FlagsAll),

gateway/gateway_config.go

@@ -60,6 +60,8 @@ func (c *Config) Apply(opts []ConfigOpt) {
 	}
 }
 
+type PresenceOpt func(presenceUpdate *MessageDataPresenceUpdate)
+
 // WithLogger sets the Logger for the Gateway.
 func WithLogger(logger log.Logger) ConfigOpt {
 	return func(config *Config) {
@@ -179,10 +181,14 @@ func WithRateRateLimiterConfigOpts(opts ...RateLimiterConfigOpt) ConfigOpt {
 	}
 }
 
-// WithPresence sets the initial presence the bot should display.
-func WithPresence(presence MessageDataPresenceUpdate) ConfigOpt {
+// WithPresenceOpts allows to pass initial presence data the bot should display.
+func WithPresenceOpts(opts ...PresenceOpt) ConfigOpt {
 	return func(config *Config) {
-		config.Presence = &presence
+		presence := &MessageDataPresenceUpdate{}
+		for _, opt := range opts {
+			opt(presence)
+		}
+		config.Presence = presence
 	}
 }
 

gateway/gateway_messages.go

@@ -437,57 +437,67 @@ type IdentifyCommandDataProperties struct {
 	Device  string `json:"device"`  // library name
 }
 
-// NewPresence creates a new Presence with the provided properties
-func NewPresence(activityType discord.ActivityType, name string, url string, status discord.OnlineStatus, afk bool) MessageDataPresenceUpdate {
-	var since *int64
-	if status == discord.OnlineStatusIdle {
-		unix := time.Now().Unix()
-		since = &unix
-	}
+func WithPlayingActivity(name string) PresenceOpt {
+	return withActivity(discord.Activity{
+		Name: name,
+		Type: discord.ActivityTypeGame,
+	})
+}
 
-	var activities []discord.Activity
-	if name != "" {
-		activity := discord.Activity{
-			Name: name,
-			Type: activityType,
-		}
-		if activityType == discord.ActivityTypeStreaming && url != "" {
-			activity.URL = &url
-		}
-		activities = append(activities, activity)
+func WithStreamingActivity(name string, url string) PresenceOpt {
+	activity := discord.Activity{
+		Name: name,
+		Type: discord.ActivityTypeStreaming,
 	}
-
-	return MessageDataPresenceUpdate{
-		Since:      since,
-		Activities: activities,
-		Status:     status,
-		AFK:        afk,
+	if url != "" {
+		activity.URL = &url
 	}
+	return withActivity(activity)
 }
 
-// NewGamePresence creates a new Presence of type ActivityTypeGame
-func NewGamePresence(name string, status discord.OnlineStatus, afk bool) MessageDataPresenceUpdate {
-	return NewPresence(discord.ActivityTypeGame, name, "", status, afk)
+func WithListeningActivity(name string) PresenceOpt {
+	return withActivity(discord.Activity{
+		Name: name,
+		Type: discord.ActivityTypeListening,
+	})
 }
 
-// NewStreamingPresence creates a new Presence of type ActivityTypeStreaming
-func NewStreamingPresence(name string, url string, status discord.OnlineStatus, afk bool) MessageDataPresenceUpdate {
-	return NewPresence(discord.ActivityTypeStreaming, name, url, status, afk)
+func WithWatchingActivity(name string) PresenceOpt {
+	return withActivity(discord.Activity{
+		Name: name,
+		Type: discord.ActivityTypeWatching,
+	})
 }
 
-// NewListeningPresence creates a new Presence of type ActivityTypeListening
-func NewListeningPresence(name string, status discord.OnlineStatus, afk bool) MessageDataPresenceUpdate {
-	return NewPresence(discord.ActivityTypeListening, name, "", status, afk)
+func WithCompetingActivity(name string) PresenceOpt {
+	return withActivity(discord.Activity{
+		Name: name,
+		Type: discord.ActivityTypeCompeting,
+	})
 }
 
-// NewWatchingPresence creates a new Presence of type ActivityTypeWatching
-func NewWatchingPresence(name string, status discord.OnlineStatus, afk bool) MessageDataPresenceUpdate {
-	return NewPresence(discord.ActivityTypeWatching, name, "", status, afk)
+func withActivity(activity discord.Activity) PresenceOpt {
+	return func(presence *MessageDataPresenceUpdate) {
+		presence.Activities = append(presence.Activities, activity)
+	}
 }
 
-// NewCompetingPresence creates a new Presence of type ActivityTypeCompeting
-func NewCompetingPresence(name string, status discord.OnlineStatus, afk bool) MessageDataPresenceUpdate {
-	return NewPresence(discord.ActivityTypeCompeting, name, "", status, afk)
+func WithOnlineStatus(status discord.OnlineStatus) PresenceOpt {
+	return func(presence *MessageDataPresenceUpdate) {
+		presence.Status = status
+		if status == discord.OnlineStatusIdle {
+			var since *int64
+			unix := time.Now().Unix()
+			since = &unix
+			presence.Since = since
+		}
+	}
+}
+
+func WithAfk(afk bool) PresenceOpt {
+	return func(presence *MessageDataPresenceUpdate) {
+		presence.AFK = afk
+	}
 }
 
 // MessageDataPresenceUpdate is used for updating Client's presence