From 8fb5c7afa633dd829f3db817b29b61f6e1cba5b6 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Mon, 11 Jul 2016 21:26:13 +0200
Subject: [PATCH] Remove UseSlackCircumfix. Use RemoteNickFormat

---
 bridge/bridge.go |  2 --
 bridge/config.go | 23 +++++++++++------------
 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