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

Expose flags on MessageEdit so you can suppress embeds on other messages #973

Merged
merged 10 commits into from Apr 14, 2022
Merged

Expose flags on MessageEdit so you can suppress embeds on other messages #973

Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9b2e7db
Expose Flags on MessageEdit and add SuppressEmbeds
nixxquality Jul 21, 2021
1646e80
Fix deprecation comment
nixxquality Jul 21, 2021
bfba532
Add omitempty to Flags member
nixxquality Jul 21, 2021
666fa59
Make Components omitempty
nixxquality Jul 22, 2021
c0381ef
Remove convenience function for now
nixxquality Jul 22, 2021
0cb0cd8
Move deprecated member out of list
nixxquality Jul 22, 2021
df80c9f
Fix golint issue
nixxquality Jul 22, 2021
992bd12
Change deprecation comment
nixxquality Apr 5, 2022
5255841
feat: code review changes
FedorLap2006 Apr 14, 2022
3a7bd1e
Merge branch 'master' into suppress-embeds
FedorLap2006 Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions message.go
View file
Open in desktop
Expand Up @@ -174,11 +174,16 @@ type MessageFlags int
const (
MessageFlagsCrossPosted MessageFlags = 1 << 0
MessageFlagsIsCrossPosted MessageFlags = 1 << 1
MessageFlagsSupressEmbeds MessageFlags = 1 << 2
MessageFlagsSuppressEmbeds MessageFlags = 1 << 2
MessageFlagsSourceMessageDeleted MessageFlags = 1 << 3
MessageFlagsUrgent MessageFlags = 1 << 4
)

// Deprecated: use MessageFlagsSuppressEmbeds
nixxquality marked this conversation as resolved.
Show resolved Hide resolved
const (
MessageFlagsSupressEmbeds MessageFlags = 1 << 2
)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be best to just put it right after the corrected constant.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason I put it separate was because of a gofmt error in the previous build

0.06s$ diff <(gofmt -d .) <(echo -n)
1,14d0
< diff -u message.go.orig message.go
< --- message.go.orig	2021-07-22 08:05:45.890441692 +0000
< +++ message.go	2021-07-22 08:05:45.890441692 +0000
< @@ -172,8 +172,8 @@
<  
<  // Valid MessageFlags values
<  const (
< -	MessageFlagsCrossPosted          MessageFlags = 1 << 0
< -	MessageFlagsIsCrossPosted        MessageFlags = 1 << 1
< +	MessageFlagsCrossPosted   MessageFlags = 1 << 0
< +	MessageFlagsIsCrossPosted MessageFlags = 1 << 1
<  	// Deprecated: use MessageFlagsSuppressEmbeds
<  	MessageFlagsSupressEmbeds        MessageFlags = 1 << 2
<  	MessageFlagsSuppressEmbeds       MessageFlags = 1 << 2
The command "diff <(gofmt -d .) <(echo -n)" exited with 1.

Between messing up the spacing or extracting it to a separate section I chose the latter.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just put it at the end of the section, like that

const (
   ...
   // TODO: remove when compatibility is not required
   MessageFlagsSupressEmbeds       MessageFlags = 1 << 2
)

// File stores info about files you e.g. send in messages.
type File struct {
Name string
Expand All @@ -204,9 +209,10 @@ type MessageSend struct {
// is also where you should get the instance from.
type MessageEdit struct {
Content *string `json:"content,omitempty"`
Components []MessageComponent `json:"components"`
Components []MessageComponent `json:"components,omitempty"`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was intentional, to allow users to remove components from messages.
Also it would be probably better to move this into a separate PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to add this to make it work. Before I added it, Discord would give an error about "Cannot edit a message authored by another user"

This seems to be mutually exclusive with your current requirements, so I don't know what to do about that.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While it's related to SuppressEmbeds flag, the issue existed before, so I think it would be better to resolve this in a separate PR.

Embed *MessageEmbed `json:"embed,omitempty"`
AllowedMentions *MessageAllowedMentions `json:"allowed_mentions,omitempty"`
Flags MessageFlags `json:"flags,omitempty"`

ID string
Channel string
Expand Down