oiupoyt/discordo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "refactor(state): rename openState to newState & return *state.State instead of modifying discordState in-place"

Browse source 
This reverts commit b784d6ccb0.
This commit is contained in:
ayn2op 2025-03-19 16:12:22 -04:00
parent 99838b6873
commit aa58ee2a8a
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/app.go
View file

@ -52,9 +52,7 @@ func (app *App) show(token string) error {
app.SetRoot(loginForm, true)
} else {
var err error
discordState, err = newState(token)
if err != nil {
if err := openState(token); err != nil {
return err
}

22
cmd/state.go
View file

@ -19,7 +19,7 @@ type State struct {
*ningen.State
}
func newState(token string) (*State, error) {
func openState(token string) error {
api.UserAgent = app.cfg.UserAgent
gateway.DefaultIdentity = gateway.IdentifyProperties{
OS: runtime.GOOS,
@ -34,19 +34,17 @@ func newState(token string) (*State, error) {
Status: app.cfg.Status,
}
s := &State{State: ningen.New(token)}
// Handlers
s.AddHandler(s.onReady)
s.AddHandler(s.onMessageCreate)
s.AddHandler(s.onMessageDelete)
s.OnRequest = append(s.OnRequest, s.onRequest)
if err := s.Open(context.TODO()); err != nil {
return nil, err
discordState = &State{
State: ningen.New(token),
}
return s, nil
// Handlers
discordState.AddHandler(discordState.onReady)
discordState.AddHandler(discordState.onMessageCreate)
discordState.AddHandler(discordState.onMessageDelete)
discordState.OnRequest = append(discordState.OnRequest, discordState.onRequest)
return discordState.Open(context.TODO())
}
func (s *State) onRequest(r httpdriver.Request) error {