From 664d0cf3b3698556ddb2c1e73b061439e3adaf55 Mon Sep 17 00:00:00 2001
From: Naoki Kosaka <n.k@mail.yukimochi.net>
Date: Mon, 11 Feb 2019 17:44:16 +0900
Subject: [PATCH] Fix invalid domain error in collect input.

---
 State/state.go | 10 ++++++++++
 cli/contain.go | 24 ++++++++++++++++++++++++
 cli/domain.go  | 16 ++++++++--------
 cli/follow.go  | 12 +++++-------
 4 files changed, 47 insertions(+), 15 deletions(-)
 create mode 100644 cli/contain.go

diff --git a/State/state.go b/State/state.go
index b8b05e0..638e202 100644
--- a/State/state.go
+++ b/State/state.go
@@ -106,6 +106,16 @@ func (config *RelayState) DelSubscription(domain string) {
 	config.Load()
 }
 
+// SelectSubscription : Select instance from string
+func (config *RelayState) SelectSubscription(domain string) *Subscription {
+	for _, subscription := range config.Subscriptions {
+		if domain == subscription.Domain {
+			return &subscription
+		}
+	}
+	return nil
+}
+
 // SetBlockedDomain : Set/Unset instance for blocked domain
 func (config *RelayState) SetBlockedDomain(domain string, value bool) {
 	if value {
diff --git a/cli/contain.go b/cli/contain.go
new file mode 100644
index 0000000..7c122e0
--- /dev/null
+++ b/cli/contain.go
@@ -0,0 +1,24 @@
+package main
+
+import state "github.com/yukimochi/Activity-Relay/State"
+
+func contains(entries interface{}, finder string) bool {
+	switch entry := entries.(type) {
+	case string:
+		return entry == finder
+	case []string:
+		for i := 0; i < len(entry); i++ {
+			if entry[i] == finder {
+				return true
+			}
+		}
+	case []state.Subscription:
+		for i := 0; i < len(entry); i++ {
+			if entry[i].Domain == finder {
+				return true
+			}
+		}
+		return false
+	}
+	return false
+}
diff --git a/cli/domain.go b/cli/domain.go
index eb70f7d..9f688f4 100644
--- a/cli/domain.go
+++ b/cli/domain.go
@@ -119,15 +119,15 @@ func setDomainType(cmd *cobra.Command, args []string) error {
 func unfollowDomains(cmd *cobra.Command, args []string) error {
 	subscriptions := relayState.Subscriptions
 	for _, domain := range args {
-		for _, subscription := range subscriptions {
-			if domain == subscription.Domain {
-				cmd.Println("Unfollow [" + domain + "]")
-				createUnfollowRequestResponse(subscription)
-				relayState.DelSubscription(subscription.Domain)
-				break
-			}
+		if contains(subscriptions, domain) {
+			subscription := *relayState.SelectSubscription(domain)
+			cmd.Println("Unfollow [" + subscription.Domain + "]")
+			createUnfollowRequestResponse(subscription)
+			relayState.DelSubscription(subscription.Domain)
+			break
+		} else {
+			cmd.Println("Invalid domain [" + domain + "] given")
 		}
-		cmd.Println("Invalid domain [" + domain + "] given")
 	}
 
 	return nil
diff --git a/cli/follow.go b/cli/follow.go
index 47d3b72..1cdbeda 100644
--- a/cli/follow.go
+++ b/cli/follow.go
@@ -130,14 +130,12 @@ func acceptFollow(cmd *cobra.Command, args []string) error {
 	}
 
 	for _, domain := range args {
-		for _, request := range domains {
-			if domain == request {
-				cmd.Println("Accept [" + domain + "] follow request")
-				createFollowRequestResponse(domain, "Accept")
-				break
-			}
+		if contains(domains, domain) {
+			cmd.Println("Accept [" + domain + "] follow request")
+			createFollowRequestResponse(domain, "Accept")
+		} else {
+			cmd.Println("Invalid domain [" + domain + "] given")
 		}
-		cmd.Println("Invalid domain [" + domain + "] given")
 	}
 
 	return nil