fixed a bug in acceptMessage addon

zekroTJA · Jan 2, 2019 · 929f481 · 929f481
1 parent 37a5c86
commit 929f481
Showing 1 changed file with 10 additions and 1 deletion.
diff --git 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
 		}