Feature/rpc rewrite #324
Feature/rpc rewrite #324
Conversation
# Conflicts: # discord/application.go # go.mod # go.sum
# Conflicts: # discord/application.go # go.sum
rpc/embed.go
Outdated
| package rpc | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "github.com/disgoorg/disgo/discord" | ||
| ) | ||
|
|
||
| // The EmbedResource of an Embed.Image/Embed.Thumbnail/Embed.Video | ||
| type EmbedResource struct { | ||
| URL string `json:"url,omitempty"` | ||
| ProxyURL string `json:"proxyURL,omitempty"` | ||
| Height int `json:"height,omitempty"` | ||
| Width int `json:"width,omitempty"` | ||
| } | ||
|
|
||
| type Embed struct { | ||
| ID string `json:"id"` // eg. "embed_N" | ||
| Type discord.EmbedType `json:"type"` // Only seen "rich" so far | ||
| RawTitle string `json:"rawTitle"` | ||
| RawDescription string `json:"rawDescription"` | ||
| Color string `json:"color"` // CSS color, why discord why. | ||
| Fields []discord.EmbedField `json:"fields"` | ||
| URL string `json:"url,omitempty"` | ||
| Timestamp *time.Time `json:"timestamp,omitempty"` | ||
| Footer *discord.EmbedFooter `json:"footer,omitempty"` | ||
| Image *EmbedResource `json:"image,omitempty"` | ||
| Thumbnail *EmbedResource `json:"thumbnail,omitempty"` | ||
| Video *EmbedResource `json:"video,omitempty"` | ||
| Provider *discord.EmbedProvider `json:"provider,omitempty"` | ||
| Author *discord.EmbedAuthor `json:"author,omitempty"` | ||
| } | ||
|
|
||
| type Attachment struct { | ||
| *discord.Attachment | ||
| Spoiler bool `json:"spoiler,omitempty"` | ||
| } |
There was a problem hiding this comment.
is embed so different from discord.Embed?
There was a problem hiding this comment.
changed in fb13deb, looking for more feedback.
| return nil | ||
| } | ||
|
|
||
| type message struct { |
There was a problem hiding this comment.
I would prefer to keep this exported. Kinda annoying that those names clash I agree.
There was a problem hiding this comment.
Would you suggest I rename this or Message (as in ChannelMessage)?
| // Attachment is used for files sent in a Message | ||
| type Attachment struct { | ||
| *discord.Attachment | ||
| Spoiler bool `json:"spoiler,omitempty"` |
There was a problem hiding this comment.
a file is marked as spoiler when the name starts with SPOILER_
so we could perhaps move that into discord.Attachment and work with a custom unmarshaller?
| ) | ||
|
|
||
| // The EmbedResource of an Embed.Image/Embed.Thumbnail/Embed.Video | ||
| type EmbedResource struct { |
| // The EmbedResource of an Embed.Image/Embed.Thumbnail/Embed.Video | ||
| type EmbedResource struct { | ||
| URL string `json:"url,omitempty"` | ||
| ProxyURL string `json:"proxyURL,omitempty"` |
There was a problem hiding this comment.
wtf discord, you are disgusting
| type message Message | ||
| var v struct { | ||
| message | ||
| Timestamp time.Time `json:"timestamp"` // discord.Message.CreatedAt |
There was a problem hiding this comment.
we already use timestamp in discord.Message here. We just changed the field name compared to what the API delivers
| @@ -268,29 +339,147 @@ type CmdArgs interface { | |||
| cmdArgs() | |||
| } | |||
|
|
|||
| type Event string | |||
| type Event struct { | |||
There was a problem hiding this comment.
I'm not sure what the purpose of this is
There was a problem hiding this comment.
Related atm to keeping track of subscribed events (event name + args) and handlers. to be revisited when we decide on the approach for events going forward.
Co-authored-by: Toπ <git@topi.wtf>
No description provided.