feat: repair disocrd bot

Signed-off-by: Manfred Touron <94029+moul@users.noreply.github.com>

cmd/sgtm/main.go

@@ -52,6 +52,8 @@ func app(args []string) error {
 	rootFlags.DurationVar(&svcOpts.ServerRequestTimeout, "server-request-timeout", svcOpts.ServerRequestTimeout, "server request timeout")
 	rootFlags.DurationVar(&svcOpts.ServerShutdownTimeout, "server-shutdown-timeout", svcOpts.ServerShutdownTimeout, "server shutdown timeout")
 	rootFlags.BoolVar(&svcOpts.ServerWithPprof, "server-with-pprof", svcOpts.ServerWithPprof, "enable pprof on HTTP server")
+	rootFlags.StringVar(&svcOpts.DiscordClientID, "discord-client-id", svcOpts.DiscordClientID, "discord client ID (oauth)")
+	rootFlags.StringVar(&svcOpts.DiscordClientSecret, "discord-client-secret", svcOpts.DiscordClientSecret, "discord client secret (oauth)")
 
 	root := &ffcli.Command{
 		FlagSet: rootFlags,

config.txt.example

@@ -1,8 +1,10 @@
 ## Discord
 #enable-discord true
-#discord-token REPLACE_ME
-#discord-admin-channel REPLACE_ME
+discord-token REPLACE_ME
+discord-admin-channel REPLACE_ME
+discord-client-id REPLACE_ME
+discord-client-secret REPLACE_ME
 
 ## Server
-enable-server true
+#enable-server true
 server-bind 0.0.0.0:7676

pkg/sgtm/auth.go

@@ -0,0 +1,11 @@
+package sgtm
+
+import (
+	"fmt"
+	"net/http"
+)
+
+func httpAuthCallback(w http.ResponseWriter, r *http.Request) {
+	code := r.URL.Query().Get("code")
+	fmt.Fprintf(w, "yo%s !\n", code)
+}

pkg/sgtm/driver_discord.go

@@ -23,36 +23,52 @@ func (svc *Service) StartDiscord() error {
 	if err != nil {
 		return err
 	}
-	msg := "**Hello World!**"
-	if svc.opts.DevMode {
-		msg += " (dev)"
-	}
-	_, err = dg.ChannelMessageSend(svc.opts.DiscordAdminChannel, msg)
-	if err != nil {
-		return err
-	}
-	dg.AddHandler(func(s *discordgo.Session, m *discordgo.MessageCreate) {
-		if m.Author.ID == s.State.User.ID {
-			return
+
+	// send intro msg
+	{
+		msg := "**Hello World!**"
+		if svc.opts.DevMode {
+			msg += " (dev)"
 		}
-		log.Println(godev.JSON(m))
-		_, err := s.ChannelMessageSend(m.ChannelID, ">>> "+m.Content)
+		svc.logger.Debug("send intro msg", zap.String("msg", msg), zap.String("channel", svc.opts.DiscordAdminChannel))
+		_, err = dg.ChannelMessageSend(svc.opts.DiscordAdminChannel, msg)
 		if err != nil {
-			svc.logger.Error("discord.ChannelMessageSend", zap.Error(err))
+			svc.logger.Warn("failed to send intro msg", zap.Error(err))
 		}
-	})
-	err = dg.Open()
-	if err != nil {
-		return err
 	}
-	svc.discord.session = dg
 
-	<-svc.ctx.Done()
+	// handlers
+	{
+		dg.AddHandler(func(s *discordgo.Session, m *discordgo.MessageCreate) {
+			if m.Author.ID == s.State.User.ID {
+				return
+			}
+			if m.Author.Bot {
+				return
+			}
+			log.Println(godev.JSON(m))
+			_, err := s.ChannelMessageSend(m.ChannelID, ">>> "+m.Content)
+			if err != nil {
+				svc.logger.Error("discord.ChannelMessageSend", zap.Error(err))
+			}
+		})
+	}
+
+	// start
+	{
+		err = dg.Open()
+		if err != nil {
+			return err
+		}
+		svc.discord.session = dg
+
+		<-svc.ctx.Done()
+	}
 	return nil
 }
 
-func (svc *Service) CloseDiscord(error) {
-	svc.logger.Debug("closing discord", zap.Bool("was-started", svc.discord.session != nil))
+func (svc *Service) CloseDiscord(err error) {
+	svc.logger.Debug("closing discord", zap.Bool("was-started", svc.discord.session != nil), zap.Error(err))
 	if svc.discord.session != nil {
 		svc.discord.session.Close()
 		svc.logger.Debug("discord closed")

pkg/sgtm/driver_server.go

@@ -120,8 +120,8 @@ func (svc *Service) StartServer() error {
 	return gr.Run()
 }
 
-func (svc *Service) CloseServer(error) {
-	svc.logger.Debug("closing server", zap.Bool("was-started", svc.server.listener != nil))
+func (svc *Service) CloseServer(err error) {
+	svc.logger.Debug("closing server", zap.Bool("was-started", svc.server.listener != nil), zap.Error(err))
 	if svc.server.listener != nil {
 		svc.server.listener.Close()
 	}
@@ -197,10 +197,15 @@ func (svc *Service) httpServer() (*http.Server, error) {
 		})
 	}
 
+	// auth
+	{
+		r.Get("/auth/callback", httpAuthCallback)
+	}
+
 	// static files & 404
 	{
 		fs := http.FileServer(box)
-		r.Get("/*", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		r.Get("/*", func(w http.ResponseWriter, r *http.Request) {
 			if strings.HasSuffix(r.URL.Path, ".tmpl.html") { // hide sensitive files
 				r.URL.Path = "/404.html"
 			}
@@ -211,7 +216,7 @@ func (svc *Service) httpServer() (*http.Server, error) {
 				}
 			}
 			fs.ServeHTTP(w, r)
-		}))
+		})
 	}
 
 	// pprof

pkg/sgtm/opts.go

@@ -17,6 +17,8 @@ type Opts struct {
 	EnableDiscord       bool
 	DiscordToken        string
 	DiscordAdminChannel string
+	DiscordClientID     string
+	DiscordClientSecret string
 
 	/// DB
 	DBPath string

pkg/sgtm/service.go

@@ -27,7 +27,7 @@ type Service struct {
 
 func New(db *gorm.DB, opts Opts) Service {
 	opts.applyDefaults()
-	fmt.Fprintln(os.Stderr, banner.Inline("moul-bot"))
+	fmt.Fprintln(os.Stderr, banner.Inline("sgtm"))
 	ctx, cancel := context.WithCancel(opts.Context)
 	svc := Service{
 		db:        db,