Renaming completion-webhook-url to webhook-url

beauxarts · Aug 17, 2023 · b54b9f8 · b54b9f8
1 parent d6353fc
commit b54b9f8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/cli-commands.txt b/cli-commands.txt
@@ -42,7 +42,7 @@ get-litres-my-books
 import
 
 post-completion
-    completion-webhook-url$
+    webhook-url^*$
 
 purge
     id*^
@@ -56,7 +56,7 @@ reduce-litres-my-books
 sync
     new-only
     no-throttle
-    completion-webhook-url$
+    webhook-url$
 
 serve
     port$*

diff --git a/cli/post_completion.go b/cli/post_completion.go
@@ -7,20 +7,21 @@ import (
 )
 
 func PostCompletionHandler(u *url.URL) error {
-	cwu := u.Query().Get("completion-webhook-url")
-	return PostCompletion(cwu)
+	wu := u.Query().Get("webhook-url")
+	return PostCompletion(wu)
 }
 
-func PostCompletion(completionWebhookUrl string) error {
-
-	if completionWebhookUrl == "" {
-		return nil
-	}
+func PostCompletion(webhookUrl string) error {
 
 	pca := nod.Begin("posting completion...")
 	defer pca.End()
 
-	_, err := http.DefaultClient.Post(completionWebhookUrl, "", nil)
+	if webhookUrl == "" {
+		pca.EndWithResult("webhook-url is empty")
+		return nil
+	}
+
+	_, err := http.DefaultClient.Post(webhookUrl, "", nil)
 	if err != nil {
 		return pca.EndWithError(err)
 	}

diff --git a/cli/sync.go b/cli/sync.go
@@ -13,11 +13,11 @@ import (
 func SyncHandler(u *url.URL) error {
 	newOnly := u.Query().Has("new-only")
 	noThrottle := u.Query().Has("no-throttle")
-	cwu := u.Query().Get("completion-webhook-url")
+	wu := u.Query().Get("webhook-url")
 
-	return Sync(cwu, newOnly, noThrottle)
+	return Sync(wu, newOnly, noThrottle)
 }
-func Sync(completionWebhookUrl string, newOnly, noThrottle bool) error {
+func Sync(webhookUrl string, newOnly, noThrottle bool) error {
 
 	hc, err := coost.NewHttpClientFromFile(data.AbsCookiesFilename(), litres_integration.LitResHost)
 	if err != nil {
@@ -60,7 +60,7 @@ func Sync(completionWebhookUrl string, newOnly, noThrottle bool) error {
 		return err
 	}
 
-	if err := PostCompletion(completionWebhookUrl); err != nil {
+	if err := PostCompletion(webhookUrl); err != nil {
 		return err
 	}