diamondburned
/
arikawa
mirror of https://github.com/diamondburned/arikawa.git
1
0
Fork 0
Code Issues Releases Activity

Store: Small bug fixes related to the state store

This commit is contained in:
diamondburned (Forefront) 2020-03-29 10:50:37 -07:00
parent 00481b5490
commit 1e400dfc27
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
state/store_default.go
View File

@ -91,6 +91,10 @@ func (s *DefaultStore) Channel(id discord.Snowflake) (*discord.Channel, error) {
s.mut.Lock()
defer s.mut.Unlock()
if ch, ok := s.privates[id]; ok {
return ch, nil
}
for _, chs := range s.channels {
for _, ch := range chs {
if ch.ID == id {
@ -99,10 +103,6 @@ func (s *DefaultStore) Channel(id discord.Snowflake) (*discord.Channel, error) {
}
}
if ch, ok := s.privates[id]; ok {
return ch, nil
}
return nil, ErrStoreNotFound
}
@ -118,6 +118,7 @@ func (s *DefaultStore) Channels(guildID discord.Snowflake) ([]discord.Channel, e
return append([]discord.Channel{}, chs...), nil
}
// PrivateChannels returns a list of Direct Message channels randomly ordered.
func (s *DefaultStore) PrivateChannels() ([]discord.Channel, error) {
s.mut.Lock()
@ -128,11 +129,6 @@ func (s *DefaultStore) PrivateChannels() ([]discord.Channel, error) {
s.mut.Unlock()
sort.Slice(chs, func(i, j int) bool {
// Latest first
return chs[i].LastMessageID > chs[j].LastMessageID
})
return chs, nil
}
@ -140,11 +136,10 @@ func (s *DefaultStore) ChannelSet(channel *discord.Channel) error {
s.mut.Lock()
defer s.mut.Unlock()
switch channel.Type {
case discord.DirectMessage, discord.GroupDM:
if !channel.GuildID.Valid() {
s.privates[channel.ID] = channel
default:
} else {
chs := s.channels[channel.GuildID]
for i, ch := range chs {