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

State: Changed Self to Me for consistency

This commit is contained in:
diamondburned (Forefront) 2020-02-08 11:48:45 -08:00
parent 3288f2d19c
commit 91e213135c
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
state/state.go
View File

@ -151,8 +151,8 @@ func (s *State) Permissions(
//// ////
func (s *State) Self() (*discord.User, error) { func (s *State) Me() (*discord.User, error) {
u, err := s.Store.Self() u, err := s.Store.Me()
if err == nil { if err == nil {
return u, nil return u, nil
} }
@ -162,7 +162,7 @@ func (s *State) Self() (*discord.User, error) {
return nil, err return nil, err
} }
return u, s.Store.SelfSet(u) return u, s.Store.MyselfSet(u)
} }
//// ////

6
state/state_events.go
View File

@ -22,6 +22,9 @@ func (s *State) onEvent(iface interface{}) {
switch ev := iface.(type) { switch ev := iface.(type) {
case *gateway.ReadyEvent: case *gateway.ReadyEvent:
// Set Ready to the state
s.Ready = *ev
// Handle guilds // Handle guilds
for _, g := range ev.Guilds { for _, g := range ev.Guilds {
g := g g := g
@ -45,9 +48,6 @@ func (s *State) onEvent(iface interface{}) {
s.stateErr(err, "Failed to set self in state") s.stateErr(err, "Failed to set self in state")
} }
// Set Ready to the state
s.Ready = *ev
case *gateway.GuildCreateEvent: case *gateway.GuildCreateEvent:
if err := s.Store.GuildSet(&ev.Guild); err != nil { if err := s.Store.GuildSet(&ev.Guild); err != nil {
s.stateErr(err, "Failed to create guild in state") s.stateErr(err, "Failed to create guild in state")

4
state/store.go
View File

@ -22,7 +22,7 @@ type Store interface {
// well). The best way to avoid this is to copy the whole slice, like // well). The best way to avoid this is to copy the whole slice, like
// DefaultStore does. // DefaultStore does.
type StoreGetter interface { type StoreGetter interface {
Self() (*discord.User, error) Me() (*discord.User, error)
Channel(id discord.Snowflake) (*discord.Channel, error) Channel(id discord.Snowflake) (*discord.Channel, error)
Channels(guildID discord.Snowflake) ([]discord.Channel, error) Channels(guildID discord.Snowflake) ([]discord.Channel, error)
@ -50,7 +50,7 @@ type StoreGetter interface {
} }
type StoreModifier interface { type StoreModifier interface {
SelfSet(me *discord.User) error MyselfSet(me *discord.User) error
// ChannelSet should switch on Type to know if it's a private channel or // ChannelSet should switch on Type to know if it's a private channel or
// not. // not.

4
state/store_default.go
View File

@ -66,7 +66,7 @@ func (s *DefaultStore) Reset() error {
//// ////
func (s *DefaultStore) Self() (*discord.User, error) { func (s *DefaultStore) Me() (*discord.User, error) {
s.mut.Lock() s.mut.Lock()
defer s.mut.Unlock() defer s.mut.Unlock()
@ -77,7 +77,7 @@ func (s *DefaultStore) Self() (*discord.User, error) {
return &s.self, nil return &s.self, nil
} }
func (s *DefaultStore) SelfSet(me *discord.User) error { func (s *DefaultStore) MyselfSet(me *discord.User) error {
s.mut.Lock() s.mut.Lock()
s.self = *me s.self = *me
s.mut.Unlock() s.mut.Unlock()