From 24f1fcebb90d175f8dffe12ff57c1d83bf26f96e Mon Sep 17 00:00:00 2001
From: Krzysztof Madejski <krzysztof@madejscy.pl>
Date: Tue, 19 Feb 2019 12:10:42 +0100
Subject: [PATCH] #475 delete .gitignore and getBoolOrDefault function

---
 .gitignore                  |  2 --
 bridge/bridge.go            | 11 -----------
 bridge/whatsapp/whatsapp.go |  2 +-
 3 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 54efb956..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-matterbridge.toml
-
diff --git a/bridge/bridge.go b/bridge/bridge.go
index 10dac60a..6b955a9e 100644
--- a/bridge/bridge.go
+++ b/bridge/bridge.go
@@ -88,17 +88,6 @@ func (b *Bridge) GetBool(key string) bool {
 	return val
 }
 
-// GetBoolOrDefault Get config value, or if it doesn't exist a provided default
-func (b *Bridge) GetBoolOrDefault(key string, thedefault bool) bool {
-	val, ok := b.Config.GetBool(b.Account + "." + key)
-	if !ok {
-		if val, ok = b.Config.GetBool("general." + key); !ok {
-			return thedefault
-		}
-	}
-	return val
-}
-
 func (b *Bridge) GetInt(key string) int {
 	val, ok := b.Config.GetInt(b.Account + "." + key)
 	if !ok {
diff --git a/bridge/whatsapp/whatsapp.go b/bridge/whatsapp/whatsapp.go
index 9096e3a9..e17339d8 100644
--- a/bridge/whatsapp/whatsapp.go
+++ b/bridge/whatsapp/whatsapp.go
@@ -149,7 +149,7 @@ func (b *Bwhatsapp) Connect() error {
 func (b *Bwhatsapp) Login() error {
 	b.Log.Debugln("Logging in..")
 
-	invert := b.GetBoolOrDefault(qrOnWhiteTerminal, false)
+	invert := b.GetBool(qrOnWhiteTerminal) // false is the default
 	qrChan := qrFromTerminal(invert)
 
 	session, err := b.conn.Login(qrChan)