feat(discord): add channel_name to message/reaction, log all users including bots

Author: BK1031

discord/commands/handler.go

@@ -27,22 +27,24 @@ func InitializeBot() {
 }
 
 func OnDiscordMessage(s *discordgo.Session, m *discordgo.MessageCreate) {
-	if m.Author.Bot {
-		return
-	}
+	channelName := service.GetChannelName(m.ChannelID)
 
-	logger.SugarLogger.Infof("Message from %s in %s: %s", m.Author.ID, m.ChannelID, m.Content)
+	logger.SugarLogger.Infof("Message from %s in #%s: %s", m.Author.ID, channelName, m.Content)
 
 	_, err := service.CreateDiscordMessage(model.DiscordMessage{
 		DiscordUserID: m.Author.ID,
 		ChannelID:     m.ChannelID,
+		ChannelName:   channelName,
 		MessageID:     m.ID,
 		Content:       m.Content,
 	})
 	if err != nil {
 		logger.SugarLogger.Errorf("Failed to persist discord message: %v", err)
 	}
 
+	if m.Author.Bot {
+		return
+	}
 	if !strings.HasPrefix(m.Content, config.DiscordPrefix) {
 		return
 	}
@@ -61,15 +63,14 @@ func OnDiscordMessage(s *discordgo.Session, m *discordgo.MessageCreate) {
 }
 
 func OnDiscordReaction(s *discordgo.Session, r *discordgo.MessageReactionAdd) {
-	if r.UserID == s.State.User.ID {
-		return
-	}
+	channelName := service.GetChannelName(r.ChannelID)
 
-	logger.SugarLogger.Infof("Reaction from %s in %s: %s", r.UserID, r.ChannelID, r.Emoji.Name)
+	logger.SugarLogger.Infof("Reaction from %s in #%s: %s", r.UserID, channelName, r.Emoji.Name)
 
 	_, err := service.CreateDiscordReaction(model.DiscordReaction{
 		DiscordUserID: r.UserID,
 		ChannelID:     r.ChannelID,
+		ChannelName:   channelName,
 		MessageID:     r.MessageID,
 		Emoji:         r.Emoji.Name,
 	})

discord/model/discord_message.go

@@ -7,6 +7,7 @@ type DiscordMessage struct {
 	EntityID      string    `json:"entity_id"`
 	DiscordUserID string    `json:"discord_user_id" gorm:"index"`
 	ChannelID     string    `json:"channel_id"`
+	ChannelName   string    `json:"channel_name"`
 	MessageID     string    `json:"message_id"`
 	Content       string    `json:"content"`
 	CreatedAt     time.Time `json:"created_at" gorm:"autoCreateTime"`

discord/model/discord_reaction.go

@@ -7,6 +7,7 @@ type DiscordReaction struct {
 	EntityID      string    `json:"entity_id"`
 	DiscordUserID string    `json:"discord_user_id" gorm:"index"`
 	ChannelID     string    `json:"channel_id"`
+	ChannelName   string    `json:"channel_name"`
 	MessageID     string    `json:"message_id"`
 	Emoji         string    `json:"emoji"`
 	CreatedAt     time.Time `json:"created_at" gorm:"autoCreateTime"`

discord/service/discord.go

@@ -17,3 +17,12 @@ func ConnectDiscord() {
 	Discord = dg
 	logger.SugarLogger.Infoln("Created Discord session")
 }
+
+func GetChannelName(channelID string) string {
+	channel, err := Discord.Channel(channelID)
+	if err != nil {
+		logger.SugarLogger.Errorf("Failed to get channel %s: %v", channelID, err)
+		return ""
+	}
+	return channel.Name
+}