From 19ee6c927ab63799b7e446138c266d0e3cef235e Mon Sep 17 00:00:00 2001
From: Peter Stuifzand <peter@stuifzand.eu>
Date: Thu, 7 Mar 2019 21:31:51 +0100
Subject: [PATCH] Simplify channel update

---
 cmd/eksterd/http.go | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/cmd/eksterd/http.go b/cmd/eksterd/http.go
index 91fe22a..6a75d03 100644
--- a/cmd/eksterd/http.go
+++ b/cmd/eksterd/http.go
@@ -626,42 +626,25 @@ func (h *mainHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		} else if r.URL.Path == "/settings/channel" {
 			defer h.Backend.save()
 			uid := r.FormValue("uid")
-			// name := r.FormValue("name")
+
 			excludeRegex := r.FormValue("exclude_regex")
-
-			if setting, e := h.Backend.Settings[uid]; e {
-				setting.ExcludeRegex = excludeRegex
-				h.Backend.Settings[uid] = setting
-			} else {
-				setting = channelSetting{
-					ExcludeRegex: excludeRegex,
-				}
-				h.Backend.Settings[uid] = setting
-			}
-
 			includeRegex := r.FormValue("include_regex")
-
-			if setting, e := h.Backend.Settings[uid]; e {
-				setting.IncludeRegex = includeRegex
-				h.Backend.Settings[uid] = setting
-			} else {
-				setting = channelSetting{
-					IncludeRegex: includeRegex,
-				}
-				h.Backend.Settings[uid] = setting
-			}
-
 			channelType := r.FormValue("type")
 
 			if setting, e := h.Backend.Settings[uid]; e {
+				setting.ExcludeRegex = excludeRegex
+				setting.IncludeRegex = includeRegex
 				setting.ChannelType = channelType
 				h.Backend.Settings[uid] = setting
 			} else {
 				setting = channelSetting{
-					ChannelType: channelType,
+					ExcludeRegex: excludeRegex,
+					IncludeRegex: includeRegex,
+					ChannelType:  channelType,
 				}
 				h.Backend.Settings[uid] = setting
 			}
+
 			h.Backend.Debug()
 
 			http.Redirect(w, r, "/settings", 302)