エラーメッセージにリクエスト者情報を追加し、フッター処理を共通化

Author: Aqua-218

src/internal/bot/command/general/schedule.go

@@ -31,6 +31,15 @@ var scheduleHandler = map[string]func(ctx *internal.BotContext, s *discordgo.Ses
 func Schedule(ctx *internal.BotContext, s *discordgo.Session, i *discordgo.InteractionCreate) {
 	config := ctx.Config
 
+	footer := &discordgo.MessageEmbedFooter{Text: "Requested by Unknown"}
+	if i.Member != nil {
+		footer.Text = "Requested by " + i.Member.DisplayName()
+		footer.IconURL = i.Member.AvatarURL("")
+	} else if i.User != nil {
+		footer.Text = "Requested by " + i.User.Username
+		footer.IconURL = i.User.AvatarURL("")
+	}
+
 	if i.GuildID == "" {
 		s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
 			Type: discordgo.InteractionResponseChannelMessageWithSource,
@@ -40,10 +49,7 @@ func Schedule(ctx *internal.BotContext, s *discordgo.Session, i *discordgo.Inter
 						Title:       "エラー",
 						Description: "このコマンドはサーバー内でのみ使用できます。",
 						Color:       config.Colors.Error,
-						Footer: &discordgo.MessageEmbedFooter{
-							Text:    "Requested by " + i.Member.DisplayName(),
-							IconURL: i.Member.AvatarURL(""),
-						},
+						Footer:      footer,
 						Timestamp: time.Now().Format(time.RFC3339),
 					},
 				},
@@ -63,10 +69,7 @@ func Schedule(ctx *internal.BotContext, s *discordgo.Session, i *discordgo.Inter
 						Title:       "エラー",
 						Description: "このコマンドを実行する権限がありません。",
 						Color:       config.Colors.Error,
-						Footer: &discordgo.MessageEmbedFooter{
-							Text:    "Requested by " + i.Member.DisplayName(),
-							IconURL: i.Member.AvatarURL(""),
-						},
+						Footer:      footer,
 						Timestamp: time.Now().Format(time.RFC3339),
 					},
 				},
@@ -90,10 +93,7 @@ func Schedule(ctx *internal.BotContext, s *discordgo.Session, i *discordgo.Inter
 					Title:       "エラー",
 					Description: "不明なサブコマンドです。",
 					Color:       config.Colors.Error,
-					Footer: &discordgo.MessageEmbedFooter{
-						Text:    "Requested by " + i.Member.DisplayName(),
-						IconURL: i.Member.AvatarURL(""),
-					},
+					Footer:      footer,
 					Timestamp: time.Now().Format(time.RFC3339),
 				},
 			},

src/internal/bot/command/general/schedule/modals.go

@@ -186,6 +186,15 @@ func replyPermissionError(s *discordgo.Session, i *discordgo.InteractionCreate,
 }
 
 func replyError(s *discordgo.Session, i *discordgo.InteractionCreate, config *internal.Config, title, description string) {
+	footer := &discordgo.MessageEmbedFooter{Text: "Requested by Unknown"}
+	if i.Member != nil {
+		footer.Text = "Requested by " + i.Member.DisplayName()
+		footer.IconURL = i.Member.AvatarURL("")
+	} else if i.User != nil {
+		footer.Text = "Requested by " + i.User.Username
+		footer.IconURL = i.User.AvatarURL("")
+	}
+
 	_ = s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
 		Type: discordgo.InteractionResponseChannelMessageWithSource,
 		Data: &discordgo.InteractionResponseData{
@@ -194,10 +203,7 @@ func replyError(s *discordgo.Session, i *discordgo.InteractionCreate, config *in
 					Title:       title,
 					Description: description,
 					Color:       config.Colors.Error,
-					Footer: &discordgo.MessageEmbedFooter{
-						Text:    "Requested by " + i.Member.DisplayName(),
-						IconURL: i.Member.AvatarURL(""),
-					},
+					Footer:      footer,
 					Timestamp: time.Now().Format(time.RFC3339),
 				},
 			},