From 32e8f651dd5e7ceaf2e8fe1ec44ba4a65a2122bc Mon Sep 17 00:00:00 2001
From: Haruki <nazawaharuki@gmail.com>
Date: Fri, 25 Aug 2023 10:24:09 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E3=81=AB=E3=83=87?=
 =?UTF-8?q?=E3=82=A3=E3=83=AC=E3=82=AF=E3=83=88=E3=83=AA=E3=81=AE=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=81=8C=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nostrh/cmd/paths/paths.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nostrh/cmd/paths/paths.go b/nostrh/cmd/paths/paths.go
index 4c400ef..4aaa3b8 100644
--- a/nostrh/cmd/paths/paths.go
+++ b/nostrh/cmd/paths/paths.go
@@ -14,6 +14,8 @@ func GetSettingsDirectory() (string, error) {
 	}
 
 	dirPath := filepath.Join(homeDir, BaseDirName)
+
+	_, err = os.Stat(dirPath)
 	if os.IsNotExist(err) {
 		// ディレクトリが存在しない場合に作成
 		err = os.Mkdir(dirPath, 0700)
@@ -21,7 +23,7 @@ func GetSettingsDirectory() (string, error) {
 			return "", err
 		}
 	} else if err != nil {
-		return "", err
+		return "", nil
 	}
 
 	return dirPath, nil

From a15d55487390418bd45f5b9a337eb7e97c653969 Mon Sep 17 00:00:00 2001
From: Haruki <nazawaharuki@gmail.com>
Date: Fri, 25 Aug 2023 10:24:49 +0900
Subject: [PATCH 2/2] =?UTF-8?q?SettingsDirectory=E3=81=8B=E3=82=89?=
 =?UTF-8?q?=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=82=93=E3=81=A7=E3=81=84=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E7=AE=87=E6=89=80=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nostrh/cmd/keystore/keystore.go | 12 +++++++++++-
 nostrh/cmd/relays/relays.go     | 18 ++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/nostrh/cmd/keystore/keystore.go b/nostrh/cmd/keystore/keystore.go
index 7f7f79d..873012a 100644
--- a/nostrh/cmd/keystore/keystore.go
+++ b/nostrh/cmd/keystore/keystore.go
@@ -57,7 +57,17 @@ func GetPublic() (string, error) {
 }
 
 func GetSecret() (string, error) {
-	secretBytes, err := os.ReadFile(PATH)
+	dir, err := paths.GetSettingsDirectory()
+	if err != nil {
+		return "", err
+	}
+
+	filePath := filepath.Join(dir, PATH)
+	if err != nil {
+		return "", err
+	}
+
+	secretBytes, err := os.ReadFile(filePath)
 	if err != nil {
 		return "", errors.New("Could not read secret")
 	}
diff --git a/nostrh/cmd/relays/relays.go b/nostrh/cmd/relays/relays.go
index 66df0d3..be8d86e 100644
--- a/nostrh/cmd/relays/relays.go
+++ b/nostrh/cmd/relays/relays.go
@@ -28,7 +28,14 @@ func AddRelay(relayURL string) error {
 }
 
 func RemoveRelay(targetURL string) error {
-	content, err := os.ReadFile(PATH)
+	dir, err := paths.GetSettingsDirectory()
+	if err != nil {
+		return err
+	}
+
+	filePath := filepath.Join(dir, PATH)
+
+	content, err := os.ReadFile(filePath)
 	if err != nil {
 		return err
 	}
@@ -49,7 +56,14 @@ func RemoveRelay(targetURL string) error {
 }
 
 func GetAllRelays() ([]string, error) {
-	content, err := os.ReadFile(PATH)
+	dir, err := paths.GetSettingsDirectory()
+	if err != nil {
+		return nil, err
+	}
+
+	filePath := filepath.Join(dir, PATH)
+
+	content, err := os.ReadFile(filePath)
 	if err != nil {
 		return nil, err
 	}