|
@@ -4,24 +4,20 @@ import (
|
|
|
"flag"
|
|
"flag"
|
|
|
"fmt"
|
|
"fmt"
|
|
|
"log/slog"
|
|
"log/slog"
|
|
|
- "os"
|
|
|
|
|
|
|
|
|
|
"github.com/ayn2op/discordo/internal/app"
|
|
"github.com/ayn2op/discordo/internal/app"
|
|
|
"github.com/ayn2op/discordo/internal/config"
|
|
"github.com/ayn2op/discordo/internal/config"
|
|
|
- "github.com/ayn2op/discordo/internal/keyring"
|
|
|
|
|
"github.com/ayn2op/discordo/internal/logger"
|
|
"github.com/ayn2op/discordo/internal/logger"
|
|
|
"github.com/diamondburned/arikawa/v3/utils/ws"
|
|
"github.com/diamondburned/arikawa/v3/utils/ws"
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
var (
|
|
var (
|
|
|
- token string
|
|
|
|
|
configPath string
|
|
configPath string
|
|
|
logPath string
|
|
logPath string
|
|
|
logLevel string
|
|
logLevel string
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
func Run() error {
|
|
func Run() error {
|
|
|
- flag.StringVar(&token, "token", "", "authentication token (default: $DISCORDO_TOKEN or keyring)")
|
|
|
|
|
flag.StringVar(&configPath, "config-path", config.DefaultPath(), "path of the configuration file")
|
|
flag.StringVar(&configPath, "config-path", config.DefaultPath(), "path of the configuration file")
|
|
|
flag.StringVar(&logPath, "log-path", logger.DefaultPath(), "path of the log file")
|
|
flag.StringVar(&logPath, "log-path", logger.DefaultPath(), "path of the log file")
|
|
|
flag.StringVar(&logLevel, "log-level", "info", "log level")
|
|
flag.StringVar(&logLevel, "log-level", "info", "log level")
|
|
@@ -49,16 +45,5 @@ func Run() error {
|
|
|
return fmt.Errorf("failed to load config: %w", err)
|
|
return fmt.Errorf("failed to load config: %w", err)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if token == "" {
|
|
|
|
|
- token = os.Getenv("DISCORDO_TOKEN")
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- if token == "" {
|
|
|
|
|
- token, err = keyring.GetToken()
|
|
|
|
|
- if err != nil {
|
|
|
|
|
- slog.Info("failed to retrieve token from keyring", "err", err)
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- return app.New(cfg).Run(token)
|
|
|
|
|
|
|
+ return app.New(cfg).Run()
|
|
|
}
|
|
}
|