commit 43738dbc89c888967181309002dc46b2c64990a0
Author: Wim <wim@42.be>
Date: Sat Oct 24 18:44:45 2015 +0000
Refactor and IconURL support
diff --git a/config.go b/config.go
index 62d0ee1..efd6eaf 100644
--- a/config.go
+++ b/config.go
@@ -206 +207 @@ type Config struct {
Port int
ShowJoinPart bool
Token string
+ IconURL string
}
}
diff --git a/matterbridge.conf.sample b/matterbridge.conf.sample
index 7cbdce1..231a3c6 100644
--- a/matterbridge.conf.sample
+++ b/matterbridge.conf.sample
@@ -113 +114 @@ url="http://yourdomain/hooks/yourhookkey"
port=9999
showjoinpart=true
#token=yourtokenfrommattermost
+IconURL="http://youricon.png"
diff --git a/matterbridge.go b/matterbridge.go
index 219f062..94d3895 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -4530 +4531 @@ func (b *Bridge) createIRC(name string) *irc.Connection {
}
func (b *Bridge) handlePrivMsg(event *irc.Event) {
- matterMessage := matterhook.OMessage{}
+ msg := ""
if event.Code == "CTCP_ACTION" {
- matterMessage.Text = event.Nick + " "
+ msg = event.Nick + " "
}
- matterMessage.Text += event.Message()
- matterMessage.UserName = "irc-" + event.Nick
- b.m.Send(matterMessage)
+ msg += event.Message()
+ b.Send("irc-"+event.Nick, msg)
}
func (b *Bridge) handleJoinPart(event *irc.Event) {
- matterMessage := matterhook.OMessage{}
- matterMessage.Text = "irc-" + event.Nick + " " + strings.ToLower(event.Code) + "s " + event.Message()
- matterMessage.UserName = b.Config.IRC.Nick
- b.m.Send(matterMessage)
+ b.Send(b.Config.IRC.Nick, "irc-"+event.Nick+" "+strings.ToLower(event.Code)+"s "+event.Message())
}
func (b *Bridge) handleOther(event *irc.Event) {
- matterMessage := matterhook.OMessage{}
switch event.Code {
case "353":
- matterMessage.UserName = b.Config.IRC.Nick
- matterMessage.Text = event.Message() + " currently on IRC"
+ b.Send(b.Config.IRC.Nick, event.Message()+" currently on IRC")
}
+}
+
+func (b *Bridge) Send(nick string, message string) error {
+ matterMessage := matterhook.OMessage{IconURL: b.Config.Mattermost.IconURL}
+ matterMessage.UserName = nick
+ matterMessage.Text = message
b.m.Send(matterMessage)
+ return nil
}
func (b *Bridge) handleMatter() {
