Skip to content

Switch to Disgo #202

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

Draft
merlinfuchs wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Switch to Disgo #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9dd3196
add separate disgo client
merlinfuchs Oct 26, 2025
93f7fa3
start swapping out discordgo with disgo
merlinfuchs Oct 26, 2025
648d93d
refactor all handlers to use disgo
merlinfuchs Oct 27, 2025
c32a1ab
refactor action parser to use disgo
merlinfuchs Oct 27, 2025
fd66204
refactor action handler to to use disgo
merlinfuchs Oct 27, 2025
a3412cd
cleanup old discordgo code
merlinfuchs Oct 27, 2025
29b6550
add back helpers to send and update webhook messages
merlinfuchs Oct 27, 2025
4ca83c7
minor
merlinfuchs Nov 8, 2025
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
71 changes: 36 additions & 35 deletions embedg-server/actions/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,41 @@ package actions
import (
"slices"

"github.com/merlinfuchs/discordgo"
"github.com/disgoorg/disgo/discord"
"github.com/merlinfuchs/embed-generator/embedg-server/util"
)

type MessageWithActions struct {
Content string `json:"content,omitempty"`
Username string `json:"username,omitempty"`
AvatarURL string `json:"avatar_url,omitempty"`
TTS bool `json:"tts,omitempty"`
Embeds []*discordgo.MessageEmbed `json:"embeds,omitempty"`
AllowedMentions *discordgo.MessageAllowedMentions `json:"allowed_mentions,omitempty"`
Components []ComponentWithActions `json:"components,omitempty"`
Actions map[string]ActionSet `json:"actions,omitempty"`
Flags discordgo.MessageFlags `json:"flags,omitempty"`
Content string `json:"content,omitempty"`
Username string `json:"username,omitempty"`
AvatarURL string `json:"avatar_url,omitempty"`
TTS bool `json:"tts,omitempty"`
Embeds []discord.Embed `json:"embeds,omitempty"`
AllowedMentions *discord.AllowedMentions `json:"allowed_mentions,omitempty"`
Components []ComponentWithActions `json:"components,omitempty"`
Actions map[string]ActionSet `json:"actions,omitempty"`
Flags discord.MessageFlags `json:"flags,omitempty"`
}

func (m MessageWithActions) ComponentsV2Enabled() bool {
return m.Flags&(1<<15) != 0
}

type ComponentWithActions struct {
ID int `json:"id,omitempty"`
Type discordgo.ComponentType `json:"type"`
Disabled bool `json:"disabled,omitempty"`
Spoiler bool `json:"spoiler,omitempty"`
ID int `json:"id,omitempty"`
Type discord.ComponentType `json:"type"`
Disabled bool `json:"disabled,omitempty"`
Spoiler bool `json:"spoiler,omitempty"`

// Action Row & Section & Container
Components []ComponentWithActions `json:"components,omitempty"`

// Button
Style discordgo.ButtonStyle `json:"style,omitempty"`
Label string `json:"label,omitempty"`
Emoji *discordgo.ComponentEmoji `json:"emoji,omitempty"`
URL string `json:"url,omitempty"`
ActionSetID string `json:"action_set_id,omitempty"`
Style discord.ButtonStyle `json:"style,omitempty"`
Label string `json:"label,omitempty"`
Emoji *discord.ComponentEmoji `json:"emoji,omitempty"`
URL string `json:"url,omitempty"`
ActionSetID string `json:"action_set_id,omitempty"`

// Select Menu
Placeholder string `json:"placeholder,omitempty"`
Expand Down Expand Up @@ -73,11 +74,11 @@ type UnfurledMediaItem struct {
}

type ComponentSelectOptionWithActions struct {
Label string `json:"label"`
Description string `json:"description"`
Emoji *discordgo.ComponentEmoji `json:"emoji"`
Default bool `json:"default"`
ActionSetID string `json:"action_set_id"`
Label string `json:"label"`
Description string `json:"description"`
Emoji *discord.ComponentEmoji `json:"emoji"`
Default bool `json:"default"`
ActionSetID string `json:"action_set_id"`
}

type ComponentMediaGalleryItem struct {
Expand Down Expand Up @@ -117,25 +118,25 @@ type ActionSet struct {
}

type ActionDerivedPermissions struct {
UserID string `json:"user_id"`
GuildIsOwner bool `json:"guild_is_owner"`
GuildPermissions int64 `json:"guild_permissions"`
ChannelPermissions int64 `json:"channel_permissions"`
AllowedRoleIDs []string `json:"lower_role_ids"`
UserID util.ID `json:"user_id"`
GuildIsOwner bool `json:"guild_is_owner"`
GuildPermissions discord.Permissions `json:"guild_permissions"`
ChannelPermissions discord.Permissions `json:"channel_permissions"`
AllowedRoleIDs []util.ID `json:"lower_role_ids"`
}

func (a *ActionDerivedPermissions) HasChannelPermission(permission int64) bool {
return a.GuildIsOwner || (a.GuildPermissions&discordgo.PermissionAdministrator) != 0 || (a.ChannelPermissions&permission) != 0
func (a *ActionDerivedPermissions) HasChannelPermission(permission discord.Permissions) bool {
return a.GuildIsOwner || (a.GuildPermissions&discord.PermissionAdministrator) != 0 || (a.ChannelPermissions&permission) != 0
}

func (a *ActionDerivedPermissions) HasGuildPermission(permission int64) bool {
return a.GuildIsOwner || (a.GuildPermissions&discordgo.PermissionAdministrator) != 0 || (a.GuildPermissions&permission) != 0
func (a *ActionDerivedPermissions) HasGuildPermission(permission discord.Permissions) bool {
return a.GuildIsOwner || (a.GuildPermissions&discord.PermissionAdministrator) != 0 || (a.GuildPermissions&permission) != 0
}

func (a *ActionDerivedPermissions) CanManageRole(roleID string) bool {
func (a *ActionDerivedPermissions) CanManageRole(roleID util.ID) bool {
if a.GuildIsOwner {
return true
}

return a.HasGuildPermission(discordgo.PermissionManageRoles) && slices.Contains(a.AllowedRoleIDs, roleID)
return a.HasGuildPermission(discord.PermissionManageRoles) && slices.Contains(a.AllowedRoleIDs, roleID)
}
Loading