From 53c7879c9f370d32d94d45b6a096726e6e5faa32 Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Fri, 18 Dec 2020 14:23:20 +0100
Subject: [PATCH] add error respone for chat id not a nuber

---
 bashbot.sh       | 18 ++++++++++++++----
 doc/0_install.md |  4 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/bashbot.sh b/bashbot.sh
index 0bb07ea..abcdc61 100755
--- a/bashbot.sh
+++ b/bashbot.sh
@@ -11,7 +11,7 @@
 # This file is public domain in the USA and all free countries.
 # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
 #
-#### $$VERSION$$ v1.2-dev2-35-g16a2299
+#### $$VERSION$$ v1.2-dev2-36-g8b9cb1a
 #
 # Exit Codes:
 # - 0 success (hopefully)
@@ -401,11 +401,15 @@ get_file() {
 # return TRUE if curl is found or custom curl detected
 # return FALSE if no curl is found or wget is forced by BASHBOT_WGET
 # sets BASHBOT_CURL to point to curl
+DETECTED_CURL="curl"
 function detect_curl() {
 	# custom curl command
 	[ -n "${BASHBOT_CURL}" ] && return 0
 	# use wget
-	[ -n "${BASHBOT_WGET}" ] && return 1
+	if [ -n "${BASHBOT_WGET}" ]; then
+		DETECTED_CURL="wget"
+		return 1
+	fi
 	# default use curl in PATH
 	BASHBOT_CURL="curl"
 	_exists curl && return 0
@@ -418,6 +422,7 @@ function detect_curl() {
 		fi
 	done
 	# curl not in PATH and not in usual locations
+	DETECTED_CURL="wget"
 	local warn="Warning: Curl not detected, try fallback to wget! pls install curl or adjust BASHBOT_CURL/BASHBOT_WGET environment variables."
 	log_update "${warn}"; [ -n "${BASHBOTDEBUG}" ] && log_debug "${warn}"
 	return 1
@@ -439,17 +444,22 @@ sendJson(){
 		 chat='"chat_id":'"${1}"','
 		 [[ "${1}" == *[!0-9-]* ]] && chat="${chat} NAN" # chat id not a number!
 	fi
+	# compose final json
 	json='{'"${chat} $(iconv -f utf-8 -t utf-8 -c <<<"$2")"'}'
 	if [ -n "${BASHBOTDEBUG}" ] ; then
 		log_update "sendJson (curl) CHAT=${chat#*:} JSON=${2:0:100} URL=${3##*/}"
 		log_message "DEBUG sendJson ==========\n$("${JSONSHFILE}" -b -n <<<"${json}" 2>&1)"
 	fi
-	[[ "${chat}" == *"NAN" ]] && return # not a number
+	# not a number
+	if [[ "${chat}" == *"NAN" ]]; then
+		sendJsonResult "$(printf '["ok"]\tfalse\n["error_code"]\t400\n["description"]\t"Bad Request: chat id not a number"\n')"\
+			"sendJson (NAN)" "$@"
+	fi
 	# OK here we go ...
 	# route to curl/wget specific function
 	res="$(sendJson_do "${json}" "${3}")"
 	# check telegram response
-	sendJsonResult "${res}" "sendJson (curl)" "$@"
+	sendJsonResult "${res}" "sendJson (${DETECTED_CURL})" "$@"
 	[ -n "${BASHBOT_EVENT_SEND[*]}" ] && event_send "send" "${@}" &
 }
 
diff --git a/doc/0_install.md b/doc/0_install.md
index 757d47b..62f6754 100644
--- a/doc/0_install.md
+++ b/doc/0_install.md
@@ -54,7 +54,7 @@ Now you can restart your bashbot instances.
 wget -q https://github.com/$(wget -q https://github.com/topkecleon/telegram-bot-bash/releases/latest -O - | egrep '/.*/.*/.*tar.gz' -o)
 ```
 
-### use JSON.awk
+### use JSON.awk (beta)
 
 [JSON.awk](https://github.com/step-/JSON.awk) is an awk port of `JSON.sh`, it provides the same functionality but is 5 times faster.
 Systems with `gnu awk` and `posix awk` as system default can use `JSON.awk` as drop in replacement.
@@ -183,5 +183,5 @@ The old format is supported for backward compatibility, but may fail for corner
 
 #### [Next Create Bot](1_firstbot.md)
 
-#### $$VERSION$$ v1.2-dev2-25-gc084005
+#### $$VERSION$$ v1.2-dev2-36-g8b9cb1a