From e362b1008468e367c1df415fa8cb555a5f7259be Mon Sep 17 00:00:00 2001 From: mavolin <48887425+mavolin@users.noreply.github.com> Date: Fri, 15 May 2020 19:14:37 +0200 Subject: [PATCH 1/5] API: update docs --- api/message.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/message.go b/api/message.go index 94d545c..8b04271 100644 --- a/api/message.go +++ b/api/message.go @@ -152,7 +152,8 @@ type EditMessageData struct { // Content is the new message contents (up to 2000 characters). Content option.NullableString `json:"content,omitempty"` // Embed contains embedded rich content. - Embed *discord.Embed `json:"embed,omitempty"` + Embed *discord.Embed `json:"embed,omitempty"` + // AllowedMentions are the allowed mentions for a message. AllowedMentions *AllowedMentions `json:"allowed_mentions,omitempty"` // Flags edits the flags of a message (only SUPPRESS_EMBEDS can currently // be set/unset) @@ -161,7 +162,7 @@ type EditMessageData struct { Flags *discord.MessageFlags `json:"flags,omitempty"` } -// EditMessage edits a previously sent message. For more documentation, erfer to +// EditMessage edits a previously sent message. For more documentation, refer to // EditMessageComplex. func (c *Client) EditMessage( channelID, messageID discord.Snowflake, content string, From 11cf1eb769d512f2df055a55b163b91e37ad8436 Mon Sep 17 00:00:00 2001 From: mavolin <48887425+mavolin@users.noreply.github.com> Date: Fri, 15 May 2020 19:17:52 +0200 Subject: [PATCH 2/5] API: implement #63 --- api/message.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/api/message.go b/api/message.go index 8b04271..8d0e07d 100644 --- a/api/message.go +++ b/api/message.go @@ -162,6 +162,26 @@ type EditMessageData struct { Flags *discord.MessageFlags `json:"flags,omitempty"` } +// EditText edits the contents of a previously sent message. For more +// documentation, refer to EditMessageComplex. +func (c *Client) EditText( + channelID, messageID discord.Snowflake, content string) (*discord.Message, error) { + + return c.EditMessageComplex(channelID, messageID, EditMessageData{ + Content: option.NewNullableString(content), + }) +} + +// EditEmbed edits the embed of a previously sent message. For more +// documentation, refer to EditMessageComplex. +func (c *Client) EditEmbed( + channelID, messageID discord.Snowflake, embed discord.Embed) (*discord.Message, error) { + + return c.EditMessageComplex(channelID, messageID, EditMessageData{ + Embed: &embed, + }) +} + // EditMessage edits a previously sent message. For more documentation, refer to // EditMessageComplex. func (c *Client) EditMessage( From 52a7582dabb246bef4ab86a5bc90a2df8fe44706 Mon Sep 17 00:00:00 2001 From: mavolin <48887425+mavolin@users.noreply.github.com> Date: Fri, 15 May 2020 19:19:13 +0200 Subject: [PATCH 3/5] API: remove the pointer of Embed to concur with SendMessage --- api/message.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/message.go b/api/message.go index 8d0e07d..899fd68 100644 --- a/api/message.go +++ b/api/message.go @@ -186,11 +186,11 @@ func (c *Client) EditEmbed( // EditMessageComplex. func (c *Client) EditMessage( channelID, messageID discord.Snowflake, content string, - embed *discord.Embed, suppressEmbeds bool) (*discord.Message, error) { + embed discord.Embed, suppressEmbeds bool) (*discord.Message, error) { var data = EditMessageData{ Content: option.NewNullableString(content), - Embed: embed, + Embed: &embed, } if suppressEmbeds { data.Flags = &discord.SuppressEmbeds From b6fee46f695fc9f3ed0d4c3aa5963175caa6442a Mon Sep 17 00:00:00 2001 From: mavolin <48887425+mavolin@users.noreply.github.com> Date: Fri, 15 May 2020 19:37:10 +0200 Subject: [PATCH 4/5] API: remove comment --- api/user.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/api/user.go b/api/user.go index 9b88bd3..ea00fd3 100644 --- a/api/user.go +++ b/api/user.go @@ -78,7 +78,4 @@ func (c *Client) ChangeOwnNickname( ) } -// shitty SDK, don't care, PR welcomed -// func (c *Client) CreateGroup(tokens []string, nicks map[]) - // func (c *Client) UserConnections() ([]discord.Connection, error) {} From 7cb3520bc7e29cd33018af160cbc3fa2982c7c6b Mon Sep 17 00:00:00 2001 From: mavolin <48887425+mavolin@users.noreply.github.com> Date: Fri, 15 May 2020 19:40:00 +0200 Subject: [PATCH 5/5] API: re-add pointer to embed to preserve optionality --- api/message.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/message.go b/api/message.go index 899fd68..8d0e07d 100644 --- a/api/message.go +++ b/api/message.go @@ -186,11 +186,11 @@ func (c *Client) EditEmbed( // EditMessageComplex. func (c *Client) EditMessage( channelID, messageID discord.Snowflake, content string, - embed discord.Embed, suppressEmbeds bool) (*discord.Message, error) { + embed *discord.Embed, suppressEmbeds bool) (*discord.Message, error) { var data = EditMessageData{ Content: option.NewNullableString(content), - Embed: &embed, + Embed: embed, } if suppressEmbeds { data.Flags = &discord.SuppressEmbeds