diamondburned/arikawa
1
0
Fork 0
mirror of https://github.com/diamondburned/arikawa.git synced 2024-10-31 20:14:21 +00:00
Code Issues Releases Activity

state: Fix reaction.Me on MessageReactionAddEvent

Browse source
This commit is contained in:
diamondburned 2024-02-14 03:26:30 -08:00
parent 19518a0844
commit 2703326028
No known key found for this signature in database
GPG key ID: D78C4471CE776659
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
state/state_events.go
View file

@ -261,16 +261,18 @@ func (s *State) onEvent(iface interface{}) {
} }
case *gateway.MessageReactionAddEvent: case *gateway.MessageReactionAddEvent:
var me bool
if u, _ := s.Cabinet.Me(); u != nil {
me = ev.UserID == u.ID
}
s.editMessage(ev.ChannelID, ev.MessageID, func(m *discord.Message) bool { s.editMessage(ev.ChannelID, ev.MessageID, func(m *discord.Message) bool {
if i := findReaction(m.Reactions, ev.Emoji); i > -1 { if i := findReaction(m.Reactions, ev.Emoji); i > -1 {
// Copy the reactions slice so it's not racy. // Copy the reactions slice so it's not racy.
m.Reactions = append([]discord.Reaction(nil), m.Reactions...) m.Reactions = append([]discord.Reaction(nil), m.Reactions...)
m.Reactions[i].Count++ m.Reactions[i].Count++
m.Reactions[i].Me = m.Reactions[i].Me || me
} else { } else {
var me bool
if u, _ := s.Cabinet.Me(); u != nil {
me = ev.UserID == u.ID
}
old := m.Reactions old := m.Reactions
m.Reactions = make([]discord.Reaction, 0, len(old)+1) m.Reactions = make([]discord.Reaction, 0, len(old)+1)
m.Reactions = append(m.Reactions, old...) m.Reactions = append(m.Reactions, old...)
@ -291,16 +293,13 @@ func (s *State) onEvent(iface interface{}) {
} }
r := &m.Reactions[i] r := &m.Reactions[i]
newCount := r.Count - 1 // If the count is 0:
if (r.Count - 1) < 1 {
switch {
case newCount < 1: // If the count is 0:
old := m.Reactions old := m.Reactions
m.Reactions = make([]discord.Reaction, len(m.Reactions)-1) m.Reactions = make([]discord.Reaction, len(m.Reactions)-1)
copy(m.Reactions[0:], old[:i]) copy(m.Reactions[0:], old[:i])
copy(m.Reactions[i:], old[i+1:]) copy(m.Reactions[i:], old[i+1:])
} else {
default:
r.Count-- r.Count--
if r.Me { // If reaction removal is the user's if r.Me { // If reaction removal is the user's
u, err := s.Cabinet.Me() u, err := s.Cabinet.Me()