commit 0dc5e042d2aafd4f9e06422c959898ed7dbb08c8
Author: Wim <wim@42.be>
Date: Sat Dec 19 15:55:07 2015 +0000
diff --git a/config.go b/config.go
index 38e41a7..367a43e 100644
--- a/config.go
+++ b/config.go
@@ -236 +237 @@ type Config struct {
IconURL string
SkipTLSVerify bool
BindAddress string
+ Channel string
}
General struct {
GiphyAPIKey string
diff --git a/matterbridge.go b/matterbridge.go
index 80e97b3..b301a94 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -5426 +5428 @@ func (b *Bridge) handlePrivMsg(event *irc.Event) {
msg = event.Nick + " "
}
msg += event.Message()
- b.Send("irc-"+event.Nick, msg)
+ b.Send("irc-"+event.Nick, msg, b.Config.Mattermost.Channel)
}
func (b *Bridge) handleJoinPart(event *irc.Event) {
- b.SendType(b.Config.IRC.Nick, "irc-"+event.Nick+" "+strings.ToLower(event.Code)+"s "+event.Message(), "join_leave")
+ b.SendType(b.Config.IRC.Nick, "irc-"+event.Nick+" "+strings.ToLower(event.Code)+"s "+event.Message(),
+ b.Config.Mattermost.Channel, "join_leave")
}
func (b *Bridge) handleOther(event *irc.Event) {
switch event.Code {
case "353":
- b.Send(b.Config.IRC.Nick, event.Message()+" currently on IRC")
+ b.Send(b.Config.IRC.Nick, event.Message()+" currently on IRC", b.Config.Mattermost.Channel)
}
}
-func (b *Bridge) Send(nick string, message string) error {
- return b.SendType(nick, message, "")
+func (b *Bridge) Send(nick string, message string, channel string) error {
+ return b.SendType(nick, message, channel, "")
}
-func (b *Bridge) SendType(nick string, message string, mtype string) error {
+func (b *Bridge) SendType(nick string, message string, channel string, mtype string) error {
matterMessage := matterhook.OMessage{IconURL: b.Config.Mattermost.IconURL}
+ matterMessage.Channel = channel
matterMessage.UserName = nick
matterMessage.Text = message
matterMessage.Type = mtype
@@ -957 +977 @@ func (b *Bridge) handleMatter() {
b.i.SendRaw("NAMES " + b.Config.IRC.Channel)
case "!gif":
message.Text = b.giphyRandom(strings.Fields(strings.Replace(message.Text, "!gif ", "", 1)))
- b.Send(b.Config.IRC.Nick, message.Text)
+ b.Send(b.Config.IRC.Nick, message.Text, b.Config.Mattermost.Channel)
}
texts := strings.Split(message.Text, "\n")
for _, text := range texts {