From 929f48197a1cc0dcd1cb4622d9d5d08dcbdcd8a5 Mon Sep 17 00:00:00 2001 From: zekro Date: Wed, 2 Jan 2019 14:55:08 +0100 Subject: [PATCH] fixed a bug in acceptMessage addon --- util/acceptmessage.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/util/acceptmessage.go b/util/acceptmessage.go index bf6715a8..c8cceb4e 100644 --- a/util/acceptmessage.go +++ b/util/acceptmessage.go @@ -37,9 +37,18 @@ func (am *AcceptMessage) Send(chanID string) (*AcceptMessage, error) { return nil, err } am.eventUnsub = am.Session.AddHandler(func(s *discordgo.Session, e *discordgo.MessageReactionAdd) { - if e.MessageID != msg.ID || e.UserID == s.State.User.ID || (am.UserID != "" && am.UserID != e.UserID) { + if e.MessageID != msg.ID { return } + + if e.UserID != am.Session.State.User.ID { + am.Session.MessageReactionRemove(am.ChannelID, am.ID, e.Emoji.Name, e.UserID) + } + + if e.UserID == s.State.User.ID || (am.UserID != "" && am.UserID != e.UserID) { + return + } + if e.Emoji.Name != acceptMessageEmoteAccept && e.Emoji.Name != acceptMessageEmoteDecline { return }