Rename structs

Author: qaisjp

bridge/home.go

@@ -16,7 +16,7 @@ type home struct {
 
 	done chan bool
 
-	discordMessagesChan      chan DiscordNewMessage
+	discordMessagesChan      chan IRCMessage
 	discordMessageEventsChan chan *discordgo.Message
 	updateUserChan           chan DiscordUser
 }
@@ -30,7 +30,7 @@ func prepareHome(dib *Bridge, discord *discordBot, ircListener *ircListener, irc
 
 		done: make(chan bool),
 
-		discordMessagesChan:      make(chan DiscordNewMessage),
+		discordMessagesChan:      make(chan IRCMessage),
 		discordMessageEventsChan: make(chan *discordgo.Message),
 		updateUserChan:           make(chan DiscordUser),
 	}
@@ -78,7 +78,7 @@ func (h *home) loop() {
 				continue
 			}
 
-			// TOOD: What if it takes a long time? wait=true below.
+			// TODO: What if it takes a long time? wait=true below.
 			err := h.discord.WebhookExecute(mapping.ID, mapping.Token, true, &discordgo.WebhookParams{
 				Content:   msg.Message,
 				Username:  msg.Username,

bridge/irc_connection.go

@@ -15,7 +15,7 @@ type ircConnection struct {
 	discriminator string
 	nick          string
 
-	messages chan DiscordNewMessage
+	messages chan IRCMessage
 
 	manager *ircManager
 }

bridge/irc_listener.go

@@ -54,7 +54,7 @@ func (i *ircListener) OnPrivateMessage(e *irc.Event) {
 	}
 
 	go func(e *irc.Event) {
-		i.h.discordMessagesChan <- DiscordNewMessage{
+		i.h.discordMessagesChan <- IRCMessage{
 			IRCChannel: e.Arguments[0],
 			Username:   e.Nick,
 			Message:    msg,

bridge/irc_manager.go

@@ -96,7 +96,7 @@ func (m *ircManager) HandleUser(user DiscordUser) {
 		discriminator: user.Discriminator,
 		nick:          user.Nick,
 
-		messages: make(chan DiscordNewMessage),
+		messages: make(chan IRCMessage),
 
 		manager: m,
 	}
@@ -134,7 +134,7 @@ func (m *ircManager) SendMessage(channel string, msg *discordgo.Message) {
 		return
 	}
 
-	ircMessage := DiscordNewMessage{
+	ircMessage := IRCMessage{
 		IRCChannel: channel,
 		Message:    msg.Content,
 	}

bridge/structs.go

@@ -1,14 +1,14 @@
 package bridge
 
-// DiscordMessageEvent is a chat message sent to IRC (from Discord)
-type DiscordMessageEvent struct {
+// DiscordMessage is a chat message sent to IRC (from Discord)
+type DiscordMessage struct {
 	channelID string
 	userID    string
 	message   string
 }
 
-// DiscordNewMessage is a chat message sent to Discord (from IRCListener)
-type DiscordNewMessage struct {
+// IRCMessage is a chat message sent to Discord (from IRCListener)
+type IRCMessage struct {
 	IRCChannel string
 	Username   string
 	Message    string
@@ -22,3 +22,5 @@ type DiscordUser struct {
 	Bot           bool   // are they a bot?
 	Online        bool
 }
+
+//