Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Media Channels #285

Merged
merged 5 commits into from
Aug 4, 2023
Merged

Add Media Channels #285

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bea22f5
Add GuildMediaChannel
Jun 30, 2023
7122cdc
why did this dupe
Jun 30, 2023
9691a56
ThreadChannelTag -> ChannelTag
Jun 30, 2023
a64ec07
use "post" instead of "thread"
sebm253 Aug 2, 2023
d020d9d
rename "LastThreadID" to "LastPostID"
sebm253 Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions cache/caches.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,9 @@ type Caches interface {

// GuildForumChannel returns a discord.GuildForumChannel from the ChannelCache and a bool indicating if it exists.
GuildForumChannel(channelID snowflake.ID) (discord.GuildForumChannel, bool)

// GuildMediaChannel returns a discord.GuildMediaChannel from the ChannelCache and a bool indicating if it exists.
GuildMediaChannel(channelID snowflake.ID) (discord.GuildMediaChannel, bool)
}

// New returns a new default Caches instance with the given ConfigOpt(s) applied.
Expand Down Expand Up @@ -1008,3 +1011,12 @@ func (c *cachesImpl) GuildForumChannel(channelID snowflake.ID) (discord.GuildFor
}
return discord.GuildForumChannel{}, false
}

func (c *cachesImpl) GuildMediaChannel(channelID snowflake.ID) (discord.GuildMediaChannel, bool) {
if ch, ok := c.Channel(channelID); ok {
if cCh, ok := ch.(discord.GuildMediaChannel); ok {
return cCh, true
}
}
return discord.GuildMediaChannel{}, false
}
127 changes: 124 additions & 3 deletions discord/channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const (
ChannelTypeGuildStageVoice
ChannelTypeGuildDirectory
ChannelTypeGuildForum
ChannelTypeGuildMedia
)

type ChannelFlags int
Expand All @@ -40,7 +41,8 @@ const (
_
_
ChannelFlagRequireTag
ChannelFlagsNone ChannelFlags = 0
ChannelFlagHideMediaDownloadOptions ChannelFlags = 1 << 15
ChannelFlagsNone ChannelFlags = 0
)

// Add allows you to add multiple bits together, producing a new bit
Expand Down Expand Up @@ -208,6 +210,11 @@ func (u *UnmarshalChannel) UnmarshalJSON(data []byte) error {
err = json.Unmarshal(data, &v)
channel = v

case ChannelTypeGuildMedia:
var v GuildMediaChannel
err = json.Unmarshal(data, &v)
channel = v

default:
err = fmt.Errorf("unknown channel with type %d received", cType.Type)
}
Expand Down Expand Up @@ -1039,7 +1046,7 @@ type GuildForumChannel struct {
NSFW bool
RateLimitPerUser int
Flags ChannelFlags
AvailableTags []ForumTag
AvailableTags []ChannelTag
DefaultReactionEmoji *DefaultReactionEmoji
DefaultThreadRateLimitPerUser int
DefaultSortOrder *DefaultSortOrder
Expand Down Expand Up @@ -1136,6 +1143,117 @@ func (c GuildForumChannel) CreatedAt() time.Time {
func (GuildForumChannel) channel() {}
func (GuildForumChannel) guildChannel() {}

var (
_ Channel = (*GuildMediaChannel)(nil)
_ GuildChannel = (*GuildMediaChannel)(nil)
)

type GuildMediaChannel struct {
id snowflake.ID
guildID snowflake.ID
position int
permissionOverwrites PermissionOverwrites
name string
parentID *snowflake.ID
LastThreadID *snowflake.ID
Topic *string
NSFW bool
RateLimitPerUser int
Flags ChannelFlags
AvailableTags []ChannelTag
DefaultReactionEmoji *DefaultReactionEmoji
DefaultThreadRateLimitPerUser int
DefaultSortOrder *DefaultSortOrder
}

func (c *GuildMediaChannel) UnmarshalJSON(data []byte) error {
var v guildMediaChannel
if err := json.Unmarshal(data, &v); err != nil {
return err
}

c.id = v.ID
c.guildID = v.GuildID
c.position = v.Position
c.permissionOverwrites = v.PermissionOverwrites
c.name = v.Name
c.parentID = v.ParentID
c.LastThreadID = v.LastThreadID
c.Topic = v.Topic
c.NSFW = v.NSFW
c.RateLimitPerUser = v.RateLimitPerUser
c.Flags = v.Flags
c.AvailableTags = v.AvailableTags
c.DefaultReactionEmoji = v.DefaultReactionEmoji
c.DefaultThreadRateLimitPerUser = v.DefaultThreadRateLimitPerUser
c.DefaultSortOrder = v.DefaultSortOrder
return nil
}

func (c GuildMediaChannel) MarshalJSON() ([]byte, error) {
return json.Marshal(guildMediaChannel{
ID: c.id,
Type: c.Type(),
GuildID: c.guildID,
Position: c.position,
PermissionOverwrites: c.permissionOverwrites,
Name: c.name,
ParentID: c.parentID,
LastThreadID: c.LastThreadID,
Topic: c.Topic,
NSFW: c.NSFW,
RateLimitPerUser: c.RateLimitPerUser,
Flags: c.Flags,
AvailableTags: c.AvailableTags,
DefaultReactionEmoji: c.DefaultReactionEmoji,
DefaultThreadRateLimitPerUser: c.DefaultThreadRateLimitPerUser,
DefaultSortOrder: c.DefaultSortOrder,
})
}

func (c GuildMediaChannel) String() string {
return channelString(c)
}

func (c GuildMediaChannel) Mention() string {
return ChannelMention(c.ID())
}

func (GuildMediaChannel) Type() ChannelType {
return ChannelTypeGuildMedia
}

func (c GuildMediaChannel) ID() snowflake.ID {
return c.id
}

func (c GuildMediaChannel) Name() string {
return c.name
}

func (c GuildMediaChannel) GuildID() snowflake.ID {
return c.guildID
}

func (c GuildMediaChannel) PermissionOverwrites() PermissionOverwrites {
return c.permissionOverwrites
}

func (c GuildMediaChannel) Position() int {
return c.position
}

func (c GuildMediaChannel) ParentID() *snowflake.ID {
return c.parentID
}

func (c GuildMediaChannel) CreatedAt() time.Time {
return c.id.Time()
}

func (GuildMediaChannel) channel() {}
func (GuildMediaChannel) guildChannel() {}

type FollowedChannel struct {
ChannelID snowflake.ID `json:"channel_id"`
WebhookID snowflake.ID `json:"webhook_id"`
Expand Down Expand Up @@ -1167,7 +1285,7 @@ type ThreadMetadata struct {
CreateTimestamp time.Time `json:"create_timestamp"`
}

type ForumTag struct {
type ChannelTag struct {
ID snowflake.ID `json:"id"`
Name string `json:"name"`
Moderated bool `json:"moderated"`
Expand Down Expand Up @@ -1236,6 +1354,9 @@ func ApplyGuildIDToChannel(channel GuildChannel, guildID snowflake.ID) GuildChan
case GuildForumChannel:
c.guildID = guildID
return c
case GuildMediaChannel:
c.guildID = guildID
return c
default:
return channel
}
Expand Down
32 changes: 31 additions & 1 deletion discord/channel_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ type GuildForumChannelCreate struct {
ParentID snowflake.ID `json:"parent_id,omitempty"`
RateLimitPerUser int `json:"rate_limit_per_user"`
DefaultReactionEmoji DefaultReactionEmoji `json:"default_reaction_emoji"`
AvailableTags []ForumTag `json:"available_tags"`
AvailableTags []ChannelTag `json:"available_tags"`
DefaultSortOrder DefaultSortOrder `json:"default_sort_order"`
DefaultForumLayout DefaultForumLayout `json:"default_forum_layout"`
}
Expand All @@ -211,6 +211,36 @@ func (c GuildForumChannelCreate) MarshalJSON() ([]byte, error) {
func (GuildForumChannelCreate) channelCreate() {}
func (GuildForumChannelCreate) guildChannelCreate() {}

type GuildMediaChannelCreate struct {
Name string `json:"name"`
Topic string `json:"topic,omitempty"`
Position int `json:"position,omitempty"`
PermissionOverwrites []PermissionOverwrite `json:"permission_overwrites,omitempty"`
ParentID snowflake.ID `json:"parent_id,omitempty"`
RateLimitPerUser int `json:"rate_limit_per_user"`
DefaultReactionEmoji DefaultReactionEmoji `json:"default_reaction_emoji"`
AvailableTags []ChannelTag `json:"available_tags"`
DefaultSortOrder DefaultSortOrder `json:"default_sort_order"`
}

func (c GuildMediaChannelCreate) Type() ChannelType {
return ChannelTypeGuildMedia
}

func (c GuildMediaChannelCreate) MarshalJSON() ([]byte, error) {
type guildMediaChannelCreate GuildMediaChannelCreate
return json.Marshal(struct {
Type ChannelType `json:"type"`
guildMediaChannelCreate
}{
Type: c.Type(),
guildMediaChannelCreate: guildMediaChannelCreate(c),
})
}

func (GuildMediaChannelCreate) channelCreate() {}
func (GuildMediaChannelCreate) guildChannelCreate() {}

type DMChannelCreate struct {
RecipientID snowflake.ID `json:"recipient_id"`
}
26 changes: 22 additions & 4 deletions discord/channel_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ type GuildForumChannelUpdate struct {
PermissionOverwrites *[]PermissionOverwrite `json:"permission_overwrites,omitempty"`
ParentID *snowflake.ID `json:"parent_id,omitempty"`
RateLimitPerUser *int `json:"rate_limit_per_user"`
AvailableTags *[]ForumTag `json:"available_tags,omitempty"`
AvailableTags *[]ChannelTag `json:"available_tags,omitempty"`
Flags *ChannelFlags `json:"flags,omitempty"`
DefaultReactionEmoji *json.Nullable[DefaultReactionEmoji] `json:"default_reaction_emoji,omitempty"`
DefaultThreadRateLimitPerUser *int `json:"default_thread_rate_limit_per_user,omitempty"`
Expand All @@ -115,7 +115,25 @@ type GuildForumChannelUpdate struct {
func (GuildForumChannelUpdate) channelUpdate() {}
func (GuildForumChannelUpdate) guildChannelUpdate() {}

type GuildForumThreadChannelUpdate struct {
type GuildMediaChannelUpdate struct {
Name *string `json:"name,omitempty"`
Position *int `json:"position,omitempty"`
Topic *string `json:"topic,omitempty"`
NSFW *bool `json:"nsfw,omitempty"`
PermissionOverwrites *[]PermissionOverwrite `json:"permission_overwrites,omitempty"`
ParentID *snowflake.ID `json:"parent_id,omitempty"`
RateLimitPerUser *int `json:"rate_limit_per_user"`
AvailableTags *[]ChannelTag `json:"available_tags,omitempty"`
Flags *ChannelFlags `json:"flags,omitempty"`
DefaultReactionEmoji *json.Nullable[DefaultReactionEmoji] `json:"default_reaction_emoji,omitempty"`
DefaultThreadRateLimitPerUser *int `json:"default_thread_rate_limit_per_user,omitempty"`
DefaultSortOrder *json.Nullable[DefaultSortOrder] `json:"default_sort_order,omitempty"`
}

func (GuildMediaChannelUpdate) channelUpdate() {}
func (GuildMediaChannelUpdate) guildChannelUpdate() {}

type GuildThreadChannelUpdate struct {
Name *string `json:"name,omitempty"`
Archived *bool `json:"archived,omitempty"`
AutoArchiveDuration *AutoArchiveDuration `json:"auto_archive_duration,omitempty"`
Expand All @@ -126,8 +144,8 @@ type GuildForumThreadChannelUpdate struct {
AppliedTags *[]snowflake.ID `json:"applied_tags,omitempty"`
}

func (GuildForumThreadChannelUpdate) channelUpdate() {}
func (GuildForumThreadChannelUpdate) guildChannelUpdate() {}
func (GuildThreadChannelUpdate) channelUpdate() {}
func (GuildThreadChannelUpdate) guildChannelUpdate() {}

type GuildChannelPositionUpdate struct {
ID snowflake.ID `json:"id"`
Expand Down
37 changes: 36 additions & 1 deletion discord/channels_raw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ type guildForumChannel struct {
NSFW bool `json:"nsfw"`
RateLimitPerUser int `json:"rate_limit_per_user"`
Flags ChannelFlags `json:"flags"`
AvailableTags []ForumTag `json:"available_tags"`
AvailableTags []ChannelTag `json:"available_tags"`
DefaultReactionEmoji *DefaultReactionEmoji `json:"default_reaction_emoji"`
DefaultThreadRateLimitPerUser int `json:"default_thread_rate_limit_per_user"`
DefaultSortOrder *DefaultSortOrder `json:"default_sort_order"`
Expand All @@ -212,6 +212,41 @@ func (t *guildForumChannel) UnmarshalJSON(data []byte) error {
return nil
}

type guildMediaChannel struct {
ID snowflake.ID `json:"id"`
Type ChannelType `json:"type"`
GuildID snowflake.ID `json:"guild_id"`
Position int `json:"position"`
PermissionOverwrites []PermissionOverwrite `json:"permission_overwrites"`
Name string `json:"name"`
ParentID *snowflake.ID `json:"parent_id"`
Topic *string `json:"topic"`
NSFW bool `json:"nsfw"`
RateLimitPerUser int `json:"rate_limit_per_user"`
Flags ChannelFlags `json:"flags"`
AvailableTags []ChannelTag `json:"available_tags"`
DefaultReactionEmoji *DefaultReactionEmoji `json:"default_reaction_emoji"`
DefaultThreadRateLimitPerUser int `json:"default_thread_rate_limit_per_user"`
DefaultSortOrder *DefaultSortOrder `json:"default_sort_order"`

// idk discord name your shit correctly v2
LastThreadID *snowflake.ID `json:"last_message_id"`
}

func (t *guildMediaChannel) UnmarshalJSON(data []byte) error {
type guildMediaChannelAlias guildMediaChannel
var v struct {
PermissionOverwrites []UnmarshalPermissionOverwrite `json:"permission_overwrites"`
guildMediaChannelAlias
}
if err := json.Unmarshal(data, &v); err != nil {
return err
}
*t = guildMediaChannel(v.guildMediaChannelAlias)
t.PermissionOverwrites = parsePermissionOverwrites(v.PermissionOverwrites)
return nil
}

func parsePermissionOverwrites(overwrites []UnmarshalPermissionOverwrite) []PermissionOverwrite {
if len(overwrites) == 0 {
return nil
Expand Down
6 changes: 3 additions & 3 deletions discord/thread.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@ type ThreadCreateFromMessage struct {
RateLimitPerUser int `json:"rate_limit_per_user,omitempty"`
}

type ForumThreadCreate struct {
type ThreadChannelThreadCreate struct {
Name string `json:"name"`
AutoArchiveDuration AutoArchiveDuration `json:"auto_archive_duration,omitempty"`
RateLimitPerUser int `json:"rate_limit_per_user,omitempty"`
Message MessageCreate `json:"message"`
AppliedTags []snowflake.ID `json:"applied_tags,omitempty"`
}

func (c ForumThreadCreate) ToBody() (any, error) {
func (c ThreadChannelThreadCreate) ToBody() (any, error) {
if len(c.Message.Files) > 0 {
c.Message.Attachments = parseAttachments(c.Message.Files)
return PayloadWithFiles(c, c.Message.Files...)
}
return c, nil
}

type ForumThread struct {
type ThreadChannelThread struct {
GuildThread
Message Message `json:"message"`
}
Expand Down
8 changes: 4 additions & 4 deletions rest/threads.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ func NewThreads(client Client) Threads {
}

type Threads interface {
// CreateThreadFromMessage does not work for discord.ChannelTypeGuildForum channels.
// CreateThreadFromMessage does not work for discord.ChannelTypeGuildForum or discord.ChannelTypeGuildMedia channels.
CreateThreadFromMessage(channelID snowflake.ID, messageID snowflake.ID, threadCreateFromMessage discord.ThreadCreateFromMessage, opts ...RequestOpt) (thread *discord.GuildThread, err error)
CreateThreadInForum(channelID snowflake.ID, threadCreateInForum discord.ForumThreadCreate, opts ...RequestOpt) (thread *discord.ForumThread, err error)
CreateThreadInThreadChannel(channelID snowflake.ID, threadCreateInForum discord.ThreadChannelThreadCreate, opts ...RequestOpt) (thread *discord.ThreadChannelThread, err error)
CreateThread(channelID snowflake.ID, threadCreate discord.ThreadCreate, opts ...RequestOpt) (thread *discord.GuildThread, err error)
JoinThread(threadID snowflake.ID, opts ...RequestOpt) error
LeaveThread(threadID snowflake.ID, opts ...RequestOpt) error
Expand All @@ -41,8 +41,8 @@ func (s *threadImpl) CreateThreadFromMessage(channelID snowflake.ID, messageID s
return
}

func (s *threadImpl) CreateThreadInForum(channelID snowflake.ID, threadCreateInForum discord.ForumThreadCreate, opts ...RequestOpt) (thread *discord.ForumThread, err error) {
body, err := threadCreateInForum.ToBody()
func (s *threadImpl) CreateThreadInThreadChannel(channelID snowflake.ID, threadCreateInChannel discord.ThreadChannelThreadCreate, opts ...RequestOpt) (thread *discord.ThreadChannelThread, err error) {
body, err := threadCreateInChannel.ToBody()
if err != nil {
return
}
Expand Down