summaryrefslogtreecommitdiffstats
path: root/bridge/irc
diff options
context:
space:
mode:
authorWim <wim@42.be>2016-08-16 00:08:38 +0200
committerWim <wim@42.be>2016-08-20 18:08:57 +0200
commite11d786775cf64123227a44983067cc463e632f5 (patch)
tree1c26971dc864a6e0549f2b11964124ecd380261e /bridge/irc
parent889b6debc4f339975076668b6ab7d85f7dd08922 (diff)
downloadmatterbridge-msglm-e11d786775cf64123227a44983067cc463e632f5.tar.gz
matterbridge-msglm-e11d786775cf64123227a44983067cc463e632f5.tar.bz2
matterbridge-msglm-e11d786775cf64123227a44983067cc463e632f5.zip
Move nickformatting into bridge
Diffstat (limited to 'bridge/irc')
-rw-r--r--bridge/irc/irc.go14
1 files changed, 1 insertions, 13 deletions
diff --git a/bridge/irc/irc.go b/bridge/irc/irc.go
index 9ed5202b..102efa56 100644
--- a/bridge/irc/irc.go
+++ b/bridge/irc/irc.go
@@ -85,8 +85,7 @@ func (b *Birc) Send(msg config.Message) error {
b.Command(&msg)
return nil
}
- username := b.ircNickFormat(msg.Username)
- b.i.Privmsg(msg.Channel, username+msg.Text)
+ b.i.Privmsg(msg.Channel, msg.Username+msg.Text)
return nil
}
@@ -164,17 +163,6 @@ func (b *Birc) handleTopicWhoTime(event *irc.Event) {
flog.irc.Infof("%s: Topic set by %s [%s]", event.Code, user, time.Unix(t, 0))
}
-func (b *Birc) ircNickFormat(nick string) string {
- flog.irc.Debug("ircnick", nick)
- if nick == b.ircNick {
- return nick
- }
- if b.Config.IRC.RemoteNickFormat == "" {
- return "irc-" + nick
- }
- return strings.Replace(b.Config.IRC.RemoteNickFormat, "{NICK}", nick, -1)
-}
-
func (b *Birc) nicksPerRow() int {
if b.Config.Mattermost.NicksPerRow < 1 {
return 4