IconURL for GuildPreview and GuildWithCounts

interactions.go

@@ -89,6 +89,19 @@ type Interaction struct {
 	Version int    `json:"version"`
 }
 
+// InGuild is a utility function for checking if the interaction is sent in a guild or in a direct message
+func (i Interaction) InGuild() bool {
+	return i.Member != nil
+}
+
+// GetUser is a utility function for retrieving the User struct
+func (i Interaction) GetUser() *User {
+	if i.InGuild() {
+		return i.Member.User
+	}
+	return i.User
+}
+
 // ApplicationCommandInteractionData contains data received in an interaction event.
 type ApplicationCommandInteractionData struct {
 	ID      string                                     `json:"id"`

restapi.go

@@ -577,9 +577,20 @@ func memberPermissions(guild *Guild, channel *Channel, userID string, roles []st
 // ------------------------------------------------------------------------------------------------
 
 // Guild returns a Guild structure of a specific Guild.
-// guildID   : The ID of a Guild
-func (s *Session) Guild(guildID string) (st *Guild, err error) {
-	body, err := s.RequestWithBucketID("GET", EndpointGuild(guildID), nil, EndpointGuild(guildID))
+// guildID    : The ID of a Guild
+// withCounts : When true, will return approximate member and presence counts for the guild
+//              uses variadic for backwards compatibility
+func (s *Session) Guild(guildID string, withCounts ...bool) (st *Guild, err error) {
+
+	uri := EndpointGuild(guildID)
+
+	if len(withCounts) > 0 && withCounts[0] {
+		queryParams := url.Values{}
+		queryParams.Set("with_counts", "true")
+		uri += "?" + queryParams.Encode()
+	}
+
+	body, err := s.RequestWithBucketID("GET", uri, nil, EndpointGuild(guildID))
 	if err != nil {
 		return
 	}
@@ -631,7 +642,7 @@ func (s *Session) GuildEdit(guildID string, g GuildParams) (st *Guild, err error
 		}
 	}
 
-	//Bounds checking for regions
+	// Bounds checking for regions
 	if g.Region != "" {
 		isValid := false
 		regions, _ := s.VoiceRegions()

structs.go

@@ -572,6 +572,19 @@ type Guild struct {
 	Permissions int64 `json:"permissions,string"`
 }
 
+// IconURL returns a URL to the guild's icon.
+func (g Guild) IconURL() string {
+	if g.Icon == "" {
+		return ""
+	}
+
+	if strings.HasPrefix(g.Icon, "a_") {
+		return EndpointGuildIconAnimated(g.ID, g.Icon)
+	}
+
+	return EndpointGuildIcon(g.ID, g.Icon)
+}
+
 // A GuildPreview holds data related to a specific public Discord Guild, even if the user is not in the guild.
 type GuildPreview struct {
 	// The ID of the guild.
@@ -596,16 +609,29 @@ type GuildPreview struct {
 	// The list of enabled guild features
 	Features []string `json:"features"`
 
-	// Approximate number of members in this guild, returned from the GET /guild/<id> endpoint when with_counts is true
+	// Approximate number of members in this guild
 	ApproximateMemberCount int `json:"approximate_member_count"`
 
-	// Approximate number of non-offline members in this guild, returned from the GET /guild/<id> endpoint when with_counts is true
+	// Approximate number of non-offline members in this guild
 	ApproximatePresenceCount int `json:"approximate_presence_count"`
 
 	// the description for the guild
 	Description string `json:"description"`
 }
 
+// IconURL returns a URL to the guild's icon.
+func (g GuildPreview) IconURL() string {
+	if g.Icon == "" {
+		return ""
+	}
+
+	if strings.HasPrefix(g.Icon, "a_") {
+		return EndpointGuildIconAnimated(g.ID, g.Icon)
+	}
+
+	return EndpointGuildIcon(g.ID, g.Icon)
+}
+
 // MessageNotifications is the notification level for a guild
 // https://discord.com/developers/docs/resources/guild#guild-object-default-message-notification-level
 type MessageNotifications int
@@ -626,19 +652,6 @@ const (
 	SystemChannelFlagsSuppressPremium
 )
 
-// IconURL returns a URL to the guild's icon.
-func (g *Guild) IconURL() string {
-	if g.Icon == "" {
-		return ""
-	}
-
-	if strings.HasPrefix(g.Icon, "a_") {
-		return EndpointGuildIconAnimated(g.ID, g.Icon)
-	}
-
-	return EndpointGuildIcon(g.ID, g.Icon)
-}
-
 // A UserGuild holds a brief version of a Guild
 type UserGuild struct {
 	ID          string `json:"id"`