From 93656d3bcb5cb2877ffa6e3302bd6a74c9618f35 Mon Sep 17 00:00:00 2001
From: zerjioang <zerjioang@users.noreply.github.com>
Date: Thu, 21 Oct 2021 20:45:31 +0200
Subject: [PATCH] English typo error fixed in log comments

Signed-off-by: zerjioang <zerjioang@users.noreply.github.com>
---
 api/api.go           | 8 ++++----
 api/cf.go            | 9 +++++----
 datatypes/payload.go | 5 +++++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/api/api.go b/api/api.go
index 31d4bc0..88c5a9c 100644
--- a/api/api.go
+++ b/api/api.go
@@ -9,15 +9,15 @@ import (
 
 // Start executes the IP update method
 func Start() error {
-	defer measureTime(time.Now(), "cloudflare ddns updater")
+	defer measureTime(time.Now(), "cloudflare DDNS-updater")
 	log.Println("Updating device IP. Please wait...")
 	p := datatypes.NewPayload()
-	log.Println("Requesting IP check for: ", p.Zone+"."+p.DNSRecord)
+	log.Println("Requesting IP check for: ", p.FQDN())
 	log.Println("Reading current device IP. Please wait...")
 	currIp := externalIP()
-	log.Println("Readed IP: ", currIp)
+	log.Println("Read IP: ", currIp)
 	log.Println("Connecting with Cloudflare services...")
-	return triggerDDNSUpdate(p.Token, p.Zone, "console", currIp)
+	return triggerDDNSUpdate(p, currIp)
 }
 
 // Monitor start a foreground monitor that updates every
diff --git a/api/cf.go b/api/cf.go
index fe20441..6c9d9dd 100644
--- a/api/cf.go
+++ b/api/cf.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"github.com/zerjioang/ddns-cloudflare/datatypes"
 	"log"
 
 	"github.com/cloudflare/cloudflare-go"
@@ -14,21 +15,21 @@ var (
 )
 
 // triggerDDNSUpdate returns CLoudFLare zone identifier for given zone name
-func triggerDDNSUpdate(token string, zone string, aName string, currIp string) error {
+func triggerDDNSUpdate(p *datatypes.Payload, currIp string) error {
 	// Construct a new API object
-	api, err := cloudflare.NewWithAPIToken(token)
+	api, err := cloudflare.NewWithAPIToken(p.Token)
 	if err != nil {
 		return err
 	}
 	// Fetch the zone ID
 	// Assuming example.com exists in your Cloudflare account already
-	zoneId, err := api.ZoneIDByName(zone)
+	zoneId, err := api.ZoneIDByName(p.Zone)
 	if err != nil {
 		return err
 	}
 	log.Println("Cloudflare ZONE ID: ", zoneId)
 	rr, err := api.DNSRecords(ctx, zoneId, cloudflare.DNSRecord{
-		Name: aName + "." + zone,
+		Name: p.FQDN(),
 		Type: "A",
 	})
 	if err != nil {
diff --git a/datatypes/payload.go b/datatypes/payload.go
index a76a137..44c018e 100644
--- a/datatypes/payload.go
+++ b/datatypes/payload.go
@@ -15,6 +15,11 @@ type Payload struct {
 	Token string
 }
 
+// FQDN returns the FQDN
+func (p Payload) FQDN() string {
+	return p.DNSRecord + "." + p.Zone
+}
+
 // NewPayload creates a new payload based on user requested data from ENV vars
 func NewPayload() *Payload {
 	return &Payload{