summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim <wim@42.be>2016-07-11 21:26:13 +0200
committerWim <wim@42.be>2016-07-11 21:26:13 +0200
commit8fb5c7afa633dd829f3db817b29b61f6e1cba5b6 (patch)
tree2e0757153b2b09824d6866efe7b7d1bb5db177c2
parentaceb8303785fa43b60fff5d3bb497cb73b748f6b (diff)
downloadmatterbridge-msglm-8fb5c7afa633dd829f3db817b29b61f6e1cba5b6.tar.gz
matterbridge-msglm-8fb5c7afa633dd829f3db817b29b61f6e1cba5b6.tar.bz2
matterbridge-msglm-8fb5c7afa633dd829f3db817b29b61f6e1cba5b6.zip
Remove UseSlackCircumfix. Use RemoteNickFormat
-rw-r--r--bridge/bridge.go2
-rw-r--r--bridge/config.go23
2 files changed, 11 insertions, 14 deletions
diff --git a/bridge/bridge.go b/bridge/bridge.go
index c2f48a33..25e09694 100644
--- a/bridge/bridge.go
+++ b/bridge/bridge.go
@@ -356,8 +356,6 @@ func (b *Bridge) handleMatter() {
username = message.Username + ": "
if b.Config.IRC.RemoteNickFormat != "" {
username = strings.Replace(b.Config.IRC.RemoteNickFormat, "{NICK}", message.Username, -1)
- } else if b.Config.IRC.UseSlackCircumfix {
- username = "<" + message.Username + "> "
}
cmds := strings.Fields(message.Text)
// empty message
diff --git a/bridge/config.go b/bridge/config.go
index f31db98d..99f2c7d8 100644
--- a/bridge/config.go
+++ b/bridge/config.go
@@ -8,18 +8,17 @@ import (
type Config struct {
IRC struct {
- UseTLS bool
- SkipTLSVerify bool
- Server string
- Port int
- Nick string
- Password string
- Channel string
- UseSlackCircumfix bool
- NickServNick string
- NickServPassword string
- RemoteNickFormat string
- IgnoreNicks string
+ UseTLS bool
+ SkipTLSVerify bool
+ Server string
+ Port int
+ Nick string
+ Password string
+ Channel string
+ NickServNick string
+ NickServPassword string
+ RemoteNickFormat string
+ IgnoreNicks string
}
Mattermost struct {
URL string