Improve /me support (fixes #8)

Author: qaisjp

bridge/discord.go

@@ -93,7 +93,19 @@ func (d *discordBot) onMessageCreate(s *discordgo.Session, m *discordgo.MessageC
 		s.ChannelMessageSend(m.ChannelID, "Pong!")
 	}
 
-	d.h.discordMessageEventsChan <- m.Message
+	isAction := len(m.Content) > 2 &&
+		m.Content[0] == '_' &&
+		m.Content[len(m.Content)-1] == '_'
+	content := m.Content
+	if isAction {
+		content = content[1 : len(m.Content)-1]
+	}
+
+	d.h.discordMessageEventsChan <- &DiscordMessage{
+		Message:  m.Message,
+		Content:  content,
+		IsAction: isAction,
+	}
 }
 
 func (d *discordBot) onMemberListChunk(s *discordgo.Session, m *discordgo.GuildMembersChunk) {

bridge/home.go

@@ -17,7 +17,7 @@ type home struct {
 	done chan bool
 
 	discordMessagesChan      chan IRCMessage
-	discordMessageEventsChan chan *discordgo.Message
+	discordMessageEventsChan chan *DiscordMessage
 	updateUserChan           chan DiscordUser
 }
 
@@ -31,7 +31,7 @@ func prepareHome(dib *Bridge, discord *discordBot, ircListener *ircListener, irc
 		done: make(chan bool),
 
 		discordMessagesChan:      make(chan IRCMessage),
-		discordMessageEventsChan: make(chan *discordgo.Message),
+		discordMessageEventsChan: make(chan *DiscordMessage),
 		updateUserChan:           make(chan DiscordUser),
 	}
 

bridge/irc_connection.go

@@ -26,7 +26,11 @@ func (i *ircConnection) OnWelcome(e *irc.Event) {
 
 	go func(i *ircConnection) {
 		for m := range i.messages {
-			i.innerCon.Privmsg(m.IRCChannel, m.Message)
+			if m.IsAction {
+				i.innerCon.Action(m.IRCChannel, m.Message)
+			} else {
+				i.innerCon.Privmsg(m.IRCChannel, m.Message)
+			}
 		}
 	}(i)
 }

bridge/irc_manager.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/bwmarrin/discordgo"
-
 	"github.com/qaisjp/go-discord-irc/ircnick"
 	irc "github.com/thoj/go-ircevent"
 )
@@ -125,7 +123,7 @@ func (m *ircManager) generateNickname(_ string, nick string) string {
 	// return fmt.Sprintf("[%s-%s]", username, discriminator), nil
 }
 
-func (m *ircManager) SendMessage(channel string, msg *discordgo.Message) {
+func (m *ircManager) SendMessage(channel string, msg *DiscordMessage) {
 	con, ok := m.ircConnections[msg.Author.ID]
 
 	// Person is appearing offline
@@ -137,6 +135,7 @@ func (m *ircManager) SendMessage(channel string, msg *discordgo.Message) {
 	ircMessage := IRCMessage{
 		IRCChannel: channel,
 		Message:    msg.Content,
+		IsAction:   msg.IsAction,
 	}
 
 	select {

bridge/structs.go

@@ -1,17 +1,22 @@
 package bridge
 
+import (
+	"github.com/bwmarrin/discordgo"
+)
+
 // DiscordMessage is a chat message sent to IRC (from Discord)
 type DiscordMessage struct {
-	channelID string
-	userID    string
-	message   string
+	*discordgo.Message
+	Content  string
+	IsAction bool
 }
 
 // IRCMessage is a chat message sent to Discord (from IRCListener)
 type IRCMessage struct {
 	IRCChannel string
 	Username   string
 	Message    string
+	IsAction   bool
 }
 
 // DiscordUser is information that IRC needs to know about a user