sabafly · ikafly144 · Apr 20, 2024 · Feb 14, 2024 · Mar 7, 2024 · Mar 8, 2024
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.21'
+          go-version: '1.22'
       - name: Code
         uses: actions/checkout@v3
       - name: Check diff between gofmt and code
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
    strategy:
       matrix:
-        go-version: ['1.21']
+        go-version: ['1.22']
     steps:
       - name: Install Go
         uses: actions/setup-go@v4
@@ -39,7 +39,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.21'
+          go-version: '1.22'
       - name: Code
         uses: actions/checkout@v4
       - name: Go vet

diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
diff --git a/bot/bot.go b/bot/bot.go
@@ -19,7 +19,12 @@ package bot
 import (
 	"context"
 	"fmt"
+	"github.com/disgoorg/disgo/discord"
+	"github.com/disgoorg/disgo/events"
+	"io"
 	"log/slog"
+	"net/http"
+	"net/url"
 	"os"
 	"os/signal"
 	"syscall"
@@ -111,6 +116,8 @@ func run() error {
 		role.ImportCommand(component),
 	)
 
+	ready := make(chan *events.Ready)
+
 	token := os.Getenv("TOKEN")
 	if token == "" {
 		return fmt.Errorf("TOKEN が空です")
@@ -129,6 +136,9 @@ func run() error {
 		),
 		bot.WithEventManagerConfigOpts(
 			bot.WithAsyncEventsEnabled(),
+			bot.WithListeners(
+				bot.NewListenerChan(ready),
+			),
 		),
 	)
 	if err != nil {
@@ -144,6 +154,27 @@ func run() error {
 	}
 	defer client.Close(context.Background())
 
+	<-ready
+
+	// set default webhook
+	bot.WebhookDefaultName = "gobot-webhook"
+	self, ok := client.Caches().SelfUser()
+	if !ok {
+		return fmt.Errorf("cannot cache self user")
+	}
+	if avatarURL, err := url.Parse(self.EffectiveAvatarURL(discord.WithFormat(discord.FileFormatPNG))); err != nil {
+		resp, err := http.Get(avatarURL.String())
+		if err != nil {
+			return fmt.Errorf("error on get: %w", err)
+		}
+		defer resp.Body.Close()
+		buf, err := io.ReadAll(resp.Body)
+		if err != nil {
+			return fmt.Errorf("error on read all: %w", err)
+		}
+		bot.WebhookDefaultAvatar = discord.NewIconRaw(discord.IconTypePNG, buf)
+	}
+
 	s := make(chan os.Signal, 1)
 	signal.Notify(s, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.Signal(0x13), syscall.Signal(0x14))
 	<-s

diff --git a/bot/commands/debug/debug.go b/bot/commands/debug/debug.go
@@ -30,9 +30,12 @@ func Command(c *components.Components) *generic.Command {
 		Private:   true,
 		CommandCreate: []discord.ApplicationCommandCreate{
 			discord.SlashCommandCreate{
-				Name:                     "debug",
-				Description:              "debug",
-				DMPermission:             builtin.Ptr(false),
+				Name:         "debug",
+				Description:  "debug",
+				DMPermission: builtin.Ptr(false),
+				Contexts: []discord.InteractionContextType{
+					discord.InteractionContextTypeGuild,
+				},
 				DefaultMemberPermissions: json.NewNullablePtr(discord.PermissionAdministrator),
 				Options: []discord.ApplicationCommandOption{
 					discord.ApplicationCommandOptionSubCommandGroup{
@@ -110,7 +113,7 @@ func Command(c *components.Components) *generic.Command {
 				if err := event.CreateMessage(
 					discord.NewMessageBuilder().
 						SetContent(translate.Message(locale, key)).
-						Create(),
+						BuildCreate(),
 				); err != nil {
 					return errors.NewError(err)
 				}
@@ -124,7 +127,7 @@ func Command(c *components.Components) *generic.Command {
 				if err := event.CreateMessage(
 					discord.NewMessageBuilder().
 						SetContent("OK").
-						Create(),
+						BuildCreate(),
 				); err != nil {
 					return errors.NewError(err)
 				}
@@ -138,7 +141,7 @@ func Command(c *components.Components) *generic.Command {
 				if err := event.CreateMessage(
 					discord.NewMessageBuilder().
 						SetContent("OK").
-						Create(),
+						BuildCreate(),
 				); err != nil {
 					return errors.NewError(err)
 				}