Merge remote-tracking branch 'origin/master'

Author: sebm253

discord/channel.go

@@ -129,6 +129,7 @@ type GuildMessageChannel interface {
 	Topic() *string
 
 	// NSFW returns whether the GuildMessageChannel is marked as not safe for work.
+	// This is always false for GuildThread(s).
 	NSFW() bool
 
 	// DefaultAutoArchiveDuration returns the default AutoArchiveDuration for GuildThread(s) in this GuildMessageChannel.
@@ -882,7 +883,6 @@ type GuildThread struct {
 	channelType      ChannelType
 	guildID          snowflake.ID
 	name             string
-	nsfw             bool
 	lastMessageID    *snowflake.ID
 	lastPinTimestamp *time.Time
 	rateLimitPerUser int
@@ -905,7 +905,6 @@ func (c *GuildThread) UnmarshalJSON(data []byte) error {
 	c.channelType = v.Type
 	c.guildID = v.GuildID
 	c.name = v.Name
-	c.nsfw = v.NSFW
 	c.lastMessageID = v.LastMessageID
 	c.lastPinTimestamp = v.LastPinTimestamp
 	c.rateLimitPerUser = v.RateLimitPerUser
@@ -925,7 +924,6 @@ func (c GuildThread) MarshalJSON() ([]byte, error) {
 		Type:             c.channelType,
 		GuildID:          c.guildID,
 		Name:             c.name,
-		NSFW:             c.nsfw,
 		LastMessageID:    c.lastMessageID,
 		LastPinTimestamp: c.lastPinTimestamp,
 		RateLimitPerUser: c.rateLimitPerUser,
@@ -965,8 +963,9 @@ func (c GuildThread) Topic() *string {
 	return nil
 }
 
+// NSFW always returns false for GuildThread(s) as they do not have their own NSFW flag.
 func (c GuildThread) NSFW() bool {
-	return c.nsfw
+	return false
 }
 
 func (c GuildThread) Name() string {

discord/channels_raw.go

@@ -90,7 +90,6 @@ type guildThread struct {
 	Type             ChannelType    `json:"type"`
 	GuildID          snowflake.ID   `json:"guild_id"`
 	Name             string         `json:"name"`
-	NSFW             bool           `json:"nsfw"`
 	LastMessageID    *snowflake.ID  `json:"last_message_id"`
 	RateLimitPerUser int            `json:"rate_limit_per_user"`
 	OwnerID          snowflake.ID   `json:"owner_id"`