Merge pull request #195 from dcoomber/develop

Miscellaneous grammar / formatting update

Thank you!

README.html

@@ -263,6 +263,6 @@ It features background tasks and interactive chats, and can serve as an interfac
 <p>@Gnadelwartz</p>
 <h2>That's it all guys!</h2>
 <p>If you feel that there's something missing or if you found a bug, feel free to submit a pull request!</p>
-<h4>$$VERSION$$ v1.51-0-g6e66a28</h4>
+<h4>$$VERSION$$ v1.52-1-g0dae2db</h4>
 </body>
 </html>

README.md

@@ -242,4 +242,4 @@ See `mycommnds.sh.dist` for an example.
 
 If you feel that there's something missing or if you found a bug, feel free to submit a pull request!
 
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db

README.txt

@@ -319,5 +319,5 @@ That's it all guys!
 If you feel that there's something missing or if you found a bug, feel free to submit a
 pull request!
 
-$$VERSION$$ v1.51-0-g6e66a28
+$$VERSION$$ v1.52-1-g0dae2db
 

addons/antiFlood.sh

@@ -4,7 +4,7 @@
 # this addon counts how many files, e.g. stickers, are sent to
 # a chat and takes actions if threshold is reached
 #  
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 # used events:
 #

addons/example.sh

@@ -4,7 +4,7 @@
 # Addons can register to bashbot events at startup
 # by providing their name and a callback per event
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #
 # If an event occurs each registered event function is called.
 #

bashbot.rc

@@ -1,11 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 # description: Start or stop telegram-bash-bot
 #
 # example service script to run bashbot in background as specified user
 #
 # tested on: ubuntu, opensuse, debian
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.53-dev-0-g4591b35
 # shellcheck disable=SC2009
 # shellcheck disable=SC2181
 # shellcheck disable=SC2250
@@ -47,8 +47,11 @@ FIFO="${databotdir}/webhook-fifo-${name}"
 # programs to run
 bashbot="cd ${bashbotdir}; ${bashbotdir}/bashbot.sh"
 webhook="cd ${bashbotdir}; nohup ${bashbotdir}/bin/process_batch.sh --startbot --watch ${FIFO}"
-# set additionl parameter, e.g. debug
+# set additional parameter, e.g. debug
 mode=""
+backmode=""
+#mode="debug"
+#backmode="debug"
 
 # select logfile for webhook start stop and script errors
 hooklog="DEBUG"
@@ -59,32 +62,32 @@ hooklog="WEBHOOK"
 
 
 # check for bot status
+stat=""
 ps -f -u "${runas}" | grep "${name}" | grep -qF "bashbot.sh startbot"
 if [ "$?" = "0" ]; then
 	# printf "bashbot (%s) is running in poll mode\n" "${name}"
-	stat="poll"
+	stat="${stat} polling"
+fi
+ps -f -u "${runas}" | grep "${name}" | grep -qF "process_batch.sh --startbot"
+if [ "$?" = "0" ]; then
+	#printf "bashbot (%s) is running in webhook mode\n" "${name}"
+	stat="${stat} webhook"
+elif [ "${name}" != "unknown" ]; then
+	#printf "bashbot (%s) is stopped\n" "${name}"
+	stat="stop"
 else
-	ps -f -u "${runas}" | grep "${name}" | grep -qF "process_batch.sh --startbot"
-	if [ "$?" = "0" ]; then
-		#printf "bashbot (%s) is running in webhook mode\n" "${name}"
-		stat="hook"
-	elif [ "${name}" != "unknown" ]; then
-		#printf "bashbot (%s) is stopped\n" "${name}"
-		stat="stop"
-	else
-		stat="unknown"
-	fi
+	stat="unknown"
 fi
 
 case "$1" in
 'start')
-	[ "${stat}" != "stop" ] && printf "Warning, bot is running in mode: %s\n" "${stat}"
+	[ "${stat}" != "stop" ] && printf "Warning, bot is already running in mode: %s\n" "${stat}"
 	$runcmd "$bashbot start $mode" # >/dev/null 2>&1 </dev/null
 	RETVAL=$?
 	;;
 'starthook')
 	[ -p "${FIFO}" ] || printf "Warning, webhook pipe not found: %s\n" "${FIFO##*/}"
-	[ "${stat}" != "stop" ] && printf "Warning, bot is running in mode: %s\n" "${stat}"
+	[ "${stat}" != "stop" ] && printf "Warning, bot is already running in mode: %s\n" "${stat}"
 	printf "Starting bashbot in webhook mode ... "
 	$runcmd "$webhook $mode </dev/null &>>${bashbotdir}/logs/${hooklog}.log &" # >/dev/null 2>&1 </dev/null
 	sleep 1
@@ -92,16 +95,16 @@ case "$1" in
 	RETVAL=$?
 	;;
 'stop')
-	[ "${stat}" != "poll" ] && printf "Warning, bot is not in poll mode: %s\n" "${stat}"
+	[[ "${stat}" != *"poll"* ]] && printf "Warning, bot is not in poll mode: %s\n" "${stat}"
 	$runcmd "$bashbot stop $mode"
 	RETVAL=$?
 	;;
 'stophook')
-	[ "${stat}" != "hook" ] && printf "Warning, bot is not in webhook mode: %s\n" "${stat}"
+	[[ "${stat}" != *"hook"* ]] && printf "Warning, bot is not in webhook mode: %s\n" "${stat}"
 	printf "Stopping bashbot webhook mode ... "
 	KILLID="$(ps -f -u "${runas}" | grep "process_batch.sh --startbot" | sed -E 's/[^0-9]+([0-9]+).*/\1/' | tr -s "\r\n" "  ")"
 	if [ -n "${KILLID}" ]; then
-		$runcmd "kill ${KILLID}; wait ${KILLID} 2>/dev/null"
+		$runcmd "kill ${KILLID} 2>/dev/null; wait ${KILLID} 2>/dev/null"
 		sleep 1
 	fi
 	RETVAL=$?
@@ -109,13 +112,13 @@ case "$1" in
 	;;
 'status')
 	case "${stat}" in
-		"poll"*) printf "bashbot (%s) is running in poll mode\n" "${name}"
+		*"poll"*) printf "bashbot (%s) is running in polling mode\n" "${name}"
+			RETVAL=0
+			;;&
+		*"hook"*) printf "bashbot (%s) is running in webhook mode\n" "${name}"
 			RETVAL=0
 			;;
-		"hook"*) printf "bashbot (%s) is running in webhook mode\n" "${name}"
-			RETVAL=0
-			;;
-		"stop"*) printf "bashbot (%s) is not running\n" "${name}"
+		*"stop"*) printf "bashbot (%s) is not running\n" "${name}"
 			RETVAL=1
 			;;
 		*)	printf "bashbot (%s) status is %s\n" "${name}" "${stat}"
@@ -137,7 +140,7 @@ case "$1" in
 	;;
 'suspendback'|'resumeback'|'killback')
 	# shellcheck disable=SC2250
-	$runcmd "$bashbot $1 $mode"
+	$runcmd "$bashbot $1 $backmode"
 	RETVAL=$?
 	# kill inotifywait from runuser
 	if [ "$1" != "resumeback" ]; then 

bashbot.sh

@@ -30,7 +30,7 @@ BOTCOMMANDS="-h  help  init  start  stop  status  suspendback  resumeback  killb
 #     8 - curl/wget missing
 #     10 - not bash!
 #
-#### $$VERSION$$ v1.52-dev-1-g5205fe3
+#### $$VERSION$$ v1.52-1-g0dae2db
 ##################################################################
 
 # are we running in a terminal?

bin/any_command.sh

@@ -21,7 +21,7 @@ USAGE='any_command.sh [-h|--help] [--force|--reference] bot_command args ...'
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 30.01.2021 10:24
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ####

bin/bashbot_env.inc.sh

@@ -13,7 +13,7 @@
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 18.12.2020 12:27
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ############

bin/bashbot_init.inc.sh

@@ -11,7 +11,7 @@
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 27.01.2021 13:42
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 # shellcheck disable=SC2059
 

bin/bashbot_stats.sh

@@ -17,7 +17,7 @@ USAGE='bashbot_stats.sh [-h|--help] [debug]'
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 23.12.2020 20:34
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 # set bashbot environment

bin/delete_message.sh

@@ -20,7 +20,7 @@ USAGE='delete_message.sh [-h|--help]  "CHAT[ID]" "MESSAGE[ID]" [debug]'
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 03.01.2021 15:37
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ####

bin/edit_buttons.sh

@@ -26,7 +26,7 @@ USAGE='send_message.sh [-h|--help] "CHAT[ID]" "MESSAGE[ID]" "text|url" ...'
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 21.01.2021 08:10
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ####

bin/edit_message.sh

@@ -23,7 +23,7 @@ USAGE='send_edit_message.sh [-h|--help] [format|caption] "CHAT[ID]" "MESSAGE[ID]
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 23.12.2020 16:52
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ####

bin/kickban_user.sh

@@ -20,7 +20,7 @@ USAGE='kickban_user.sh [-h|--help] [-u|--unban] "CHAT[ID]" "USER[ID]" [debug]'
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 25.01.2021 20:34
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ####

bin/process_batch.sh

@@ -21,7 +21,7 @@ USAGE='process_batch.sh [-h|--help] [-s|--startbot] [-w|--watch] [-n|--lines n]
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 27.02.2021 13:14
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ####

bin/process_update.sh

@@ -15,7 +15,7 @@ USAGE='process_update.sh [-h|--help] [debug] [<file]'
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 30.01.2021 19:14
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ####

bin/promote_user.sh

@@ -25,7 +25,7 @@ USAGE='promote_user.sh [-h|--help] "CHAT[ID]" "USER[ID]" "right[:true|false]" ..
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 25.01.2021 22:34
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ####

bin/send_broadcast.sh

@@ -28,7 +28,7 @@ USAGE='broadcast_message.sh [-h|--help] [--doit] [--groups|--both|--db=file] [fo
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 16.12.2020 16:14
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ####

bin/send_buttons.sh

@@ -26,7 +26,7 @@ USAGE='send_message.sh [-h|--help] "CHAT[ID]" "message" "text|url" ...'
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 18.01.2021 11:34
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ####

bin/send_dice.sh

@@ -21,7 +21,7 @@ USAGE='send_dice.sh [-h|--help] "CHAT[ID]" "emoji" [debug]'
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 07.02.2021 18:45
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ####

bin/send_file.sh

@@ -25,7 +25,7 @@ USAGE='send_file.sh [-h|--help] "CHAT[ID]" "file|URL" "caption ...." [type] [deb
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 25.12.2020 20:24
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ####

bin/send_message.sh

@@ -26,7 +26,7 @@ USAGE='send_message.sh [-h|--help] [format] "CHAT[ID]" "message ...." [debug]'
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 16.12.2020 11:34
 #
-#### $$VERSION$$ v1.52-0-g36d8604
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ####

commands.sh

@@ -15,7 +15,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.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #
 
 # bashbot locale defaults to c.UTF-8, adjust locale in mycommands.sh if needed

dev/all-tests.sh

@@ -5,7 +5,7 @@
 #
 # Description: run all tests, exit after failed test
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #############################################################
 
 #shellcheck disable=SC1090

dev/dev.inc.sh

@@ -5,7 +5,7 @@
 #
 # Description: common stuff for all dev scripts
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #############################################################
 
 # magic to ensure that we're always inside the root of our application,

dev/git-add.sh

@@ -3,7 +3,7 @@
 #
 # works together with git pre-push.sh and ADD all changed files since last push
 
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 #shellcheck disable=SC1090
 source "${0%/*}/dev.inc.sh"

dev/hooks/post-commit.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 ############
 # NOTE: you MUST run install-hooks.sh again when updating this file!

dev/hooks/pre-commit.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 ############
 # NOTE: you MUST run install-hooks.sh again when updating this file!

dev/hooks/pre-push.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 ############
 # NOTE: you MUST run install-hooks.sh again when updating this file!

dev/inject-json.sh

@@ -7,7 +7,7 @@
 #
 # Usage: source inject-json.sh
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 ##############################################################
 
 # download JSON.sh

dev/install-hooks.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # this has to run once atfer git clone
 # and every time we create new hooks
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 #shellcheck disable=SC1090
 source "${0%/*}/dev.inc.sh"

dev/make-distribution.sh

@@ -7,7 +7,7 @@
 #
 # Options: --notest - skip tests
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 ##############################################################
 
 #shellcheck disable=SC1090

dev/make-html.sh

@@ -7,7 +7,7 @@
 #
 # Usage: source make-hmtl
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 ##############################################################
 
 # check for correct dir

dev/make-standalone.sh

@@ -11,7 +11,7 @@
 #   If you your bot is finished you can use make-standalone.sh to create the
 #    the old all-in-one bashbot:  bashbot.sh and commands.sh only!
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 ###################################################################
 
 # include git config and change to base dir

dev/obfuscate.sh

@@ -2,7 +2,7 @@
 #
 # joke hack to obfuscate bashbot.min.sh
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 # shellcheck disable=SC2028,SC2016,SC1117
 
 infile="bashbot.sh"

dev/shellcheck.files

@@ -1,5 +1,5 @@
 # list of additional files to check from shellcheck
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 bashbot.rc
 mycommands.conf
 mycommands.sh.clean

dev/version.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 # shellcheck disable=SC2016
 #
 # Easy Versioning in git:

doc/0_install.md

@@ -132,5 +132,5 @@ You must update to [Version 1.20](https://github.com/topkecleon/telegram-bot-bas
 
 #### [Next Create Bot](1_firstbot.md)
 
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 

doc/1_firstbot.md

@@ -65,5 +65,5 @@ group. This step is up to you actually.
 #### [Prev Installation](0_install.md)
 #### [Next Getting started](2_usage.md)
 
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 

doc/2_usage.md

@@ -392,5 +392,5 @@ send_action "${CHAT[ID]}" "action"
 #### [Prev Create Bot](1_firstbot.md)
 #### [Next Advanced Usage](3_advanced.md)
 
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 

doc/3_advanced.md

@@ -302,5 +302,5 @@ Note: If you disable automatic retry, se above, you disable also connection prob
 #### [Prev Getting started](2_usage.md)
 #### [Next Expert Use](4_expert.md)
 
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 

doc/4_expert.md

@@ -434,5 +434,5 @@ for every poll until the maximum of BASHBOT_SLEEP ms.
 #### [Prev Advanced Use](3_advanced.md)
 #### [Next Best Practice](5_practice.md)
 
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 

doc/5_practice.md

@@ -160,5 +160,5 @@ The second warning is about an unused variable, this is true because in our exam
 #### [Prev Best Practice](5_practice.md)
 #### [Next Functions Reference](6_reference.md)
 
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 

doc/6_reference.md

@@ -308,10 +308,10 @@ echo ${BOTSEND[ID]}
 567
 
 # add one button row
-edit_inline_keyboard "${CHAT[ID]}" "567" "button 1|http://rrr.de" "button 2|http://rrr.de"
+edit_inline_buttons "${CHAT[ID]}" "567" "button 1|http://rrr.de" "button 2|http://rrr.de"
 
 # change buttons
-edit_inline_keyboard "${CHAT[ID]}" "567" "Success edit_inline_keyboard|http://rrr.de"
+edit_inline_buttons "${CHAT[ID]}" "567" "Success edit_inline_buttons|http://rrr.de"
 
 # delete button by replace whole message
 edit_markdownv2_message "${CHAT[ID]}" "*HI* this is a _markdown_ message inline *removed*..."
@@ -408,7 +408,7 @@ An URL Button opens the given URL, a CALLBACK button sends an update the bot mus
 send_inline_keyboard "${CHAT[ID]}" "Best Dealz!" '[{"text":"Visit my Shop", "url":"https://dealz.rrr.de"}]'
 
 # send_inline_button
-send_inline_keyboard "${CHAT[ID]}" "message" '[{"text":"button 1", url"":"http://rrr.de"}, {"text":"button 2", "url":"http://rrr.de"} ]'
+send_inline_keyboard "${CHAT[ID]}" "message" '[{"text":"button 1", "url":"http://rrr.de"}, {"text":"button 2", "url":"http://rrr.de"} ]'
 
 # multiple button rows
 send_inline_keyboard "${CHAT[ID]}" "message" '[{"text":"b1", "url":"http://rrr.de"}, {"text":"b2", "url":"http://rrr.de"}], [{"text":"b3", "url":"http://rrr.de"}, "text":"b4", "url":"http://rrr.de"}]'
@@ -1673,5 +1673,5 @@ The name of your bot is available as bash variable "$ME", there is no need to ca
 #### [Prev Best Practice](5_practice.md)
 #### [Next Notes for Developers](7_develop.md)
 
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 

doc/7_develop.md

@@ -387,5 +387,5 @@ fi
 
 #### [Prev Function Reference](6_reference.md)
 
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 

examples/README.md

@@ -60,6 +60,6 @@ plus use of keyboards in private chats. It's an extended version of mycommands.s
 
 **Webhook** contains instructions on how use webhook API to get updates from telegram instead polling Telegram server.
 
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 

examples/background-scripts/run_diskusage.sh

@@ -4,7 +4,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.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 ######
 # parameters

examples/background-scripts/run_filecontent.sh

@@ -2,7 +2,7 @@
 # file:  run_filename
 # background job to display content of all new files in WATCHDIR
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 ######
 # parameters

examples/background-scripts/run_filename.sh

@@ -2,7 +2,7 @@
 # file:  run_filename
 # background job to display all new files in WATCHDIR
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 ######
 # parameters

examples/background-scripts/run_notify.sh

@@ -4,7 +4,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.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 ######
 # parameters

examples/bash2env.sh

@@ -6,7 +6,7 @@
 # This file is public domain in the USA and all free countries.
 # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
 # shellcheck disable=SC1117
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 # adjust your language setting here
 # https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment

examples/bashbot-multi.sh

@@ -2,7 +2,7 @@
 # file. multibot.sh
 # description:  run multiple telegram bots from one installation
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 if [ "$2" = "" ] || [ "$2" = "-h" ]; then
 	echo "Usage: $0 botname command"

examples/bashbot.cron

@@ -7,7 +7,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.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 
 SHELL=/bin/sh

examples/calc.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.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 ########################################################################
 
 ######

examples/jsonDB-keyboard/mycommands.sh

@@ -10,7 +10,7 @@
 #        AUTHOR: KayM (), kay@rrr.de
 #          DATE: 19.12.2020 19:03
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 # shellcheck disable=SC2154
 # shellcheck disable=SC2034

examples/notify.sh

@@ -13,7 +13,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.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 ########################################################################
 
 ######

examples/question.sh

@@ -10,7 +10,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.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 ########################################################################
 
 ######
@@ -31,7 +31,7 @@ unset IFS
 
 # kill interactive script if not finished in time, e.g. user away or error
 MAXWAIT="1m"
-{ sleep "${MAXWAIT}"; printf "Stopping Questionnaire after %s, you need to much time to finish ... BYE\n" "${MAXWAIT}"; kill $$; wait 2>/dev/null ;} &
+{ sleep "${MAXWAIT}"; printf "Stopping questionnaire after %s.  You've taken too long to finish!  BYE\n" "${MAXWAIT}"; kill $$; wait 2>/dev/null ;} &
 
 # simple yes/no question, defaults to no
 printf "Hi, hello there\nWould you like some tea (y/n)?\n"
@@ -39,15 +39,15 @@ read -r answer <"${INPUT}"
 if [[ ${answer,,} == "y"* ]]; then
 	printf "OK then, here you go: http://www.rivertea.com/blog/wp-content/uploads/2013/12/Green-Tea.jpg\n"
 else
-	printf "OK then, no tea ...\n"
+	printf "OK then, no tea...\n"
 fi
 
-# question with Keyboard, repeating until correct answer given
+# question with keyboard, repeating until correct answer given
 until [ "${SUCCESS}" = "y" ] ;do
-	printf 'Do you like Music? mykeyboardstartshere "Yass!" , "No"\n'
+	printf 'Do you like music? mykeyboardstartshere "Yass!" , "No"\n'
 	read -r answer <"${INPUT}"
 	case ${answer,,} in
-		'') printf "empty answer! Try again\n";; 
+		'') printf "Empty answer! Try again\n";; 
 		'yass'*) printf "Goody! mykeyboardendshere\n";SUCCESS=y;;
 		'no'*) printf "Well that's weird. mykeyboardendshere\n";SUCCESS=y;;
 		*) SUCCESS=n;;

examples/send-system-status/botacl

@@ -1,7 +1,7 @@
 # file: botacl
 # a user not listed here, will return false from 'user_is_allowed'
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 # Format:
 # user:resource:chat
 

examples/send-system-status/mycommands.sh

@@ -5,7 +5,7 @@
 # to show how you can customize bashbot by only editing mycommands.sh
 # NOTE: this is not tested, simply copied from original source and reworked!
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #
 # shellcheck disable=SC2154
 # shellcheck disable=SC2034

examples/webhook/README.md

@@ -96,5 +96,5 @@ webhook updates only over secure TLS connections with a valid SSL certificate ch
 `socat` looks like a tool to listen for Telegram updates from bash scripts, let's see ...
 
 
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 

examples/webhook/index.php

@@ -11,7 +11,7 @@
  * @license    http://www.wtfpl.net/txt/copying/ WTFPLv2
  * @since      30.01.2021 20:24
  *
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
  ***********************************************************/
 
  // bashbot home dir

modules/aliases.sh

@@ -5,7 +5,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.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #
 # will be automatically sourced from bashbot
 

modules/answerInline.sh

@@ -5,7 +5,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.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 # will be automatically sourced from bashbot
 

modules/background.sh

@@ -6,7 +6,7 @@
 # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
 #
 # shellcheck disable=SC1117,SC2059
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 # will be automatically sourced from bashbot
 

modules/chatMember.sh

@@ -5,7 +5,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.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 # will be automatically sourced from bashbot
 
@@ -73,11 +73,11 @@ chat_member_count() {
 }
 
 kick_chat_member() {
-	sendJson "$1" 'user_id: '"$2"'' "${URL}/kickChatMember"
+	sendJson "$1" '"user_id": '"$2"'' "${URL}/kickChatMember"
 }
 
 unban_chat_member() {
-	sendJson "$1" 'user_id: '"$2"'' "${URL}/unbanChatMember"
+	sendJson "$1" '"user_id": '"$2"'' "${URL}/unbanChatMember"
 }
 
 leave_chat() {

modules/jsonDB.sh

@@ -5,7 +5,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.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #
 # source from commands.sh to use jsonDB functions
 #

modules/processUpdates.sh

@@ -4,7 +4,7 @@
 # File: processUpdates.sh 
 # Note: DO NOT EDIT! this file will be overwritten on update
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 ##################################################################
 
 ##############
@@ -291,7 +291,7 @@ process_message() {
 	fi
 
 	# split message in command and args
-	[[ "${MESSAGE[0]}" == "/"* ]] && read -r CMD <<<"${MESSAGE[0]}" &&  CMD[0]="${CMD[0]%%@*}"
+	[[ "${MESSAGE[0]}" == "/"* ]] && read -ra CMD <<<"${MESSAGE[0]}" &&  CMD[0]="${CMD[0]%%@*}"
 	# everything went well
 	return 0
 }

modules/sendMessage.sh

@@ -6,7 +6,7 @@
 # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
 #
 # shellcheck disable=SC1117
-#### $$VERSION$$ v1.52-dev-2-ga2a3927
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 # will be automatically sourced from bashbot
 
@@ -272,8 +272,7 @@ fi
 # supports local file, URL and file_id
 # $1 chat, $2 file https::// file_id:// , $3 caption, $4 extension (optional)
 send_file(){
-	local url what num stat media capt file="$2" ext="$4"
-	capt="$(JsonEscape "$3")"
+	local url what num stat media capt="$3" file="$2" ext="$4"
 	if [[ "${file}" =~ ^https*:// ]]; then
 		media="URL"
 	elif [[ "${file}" == file_id://* ]]; then

mycommands.conf

@@ -12,7 +12,7 @@
 #      Author: KayM (gnadelwartz), kay@rrr.de
 #     Created: 09.01.2021 07:27
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #######################################################
 
 ##########

mycommands.sh

@@ -13,7 +13,7 @@
 #     License: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #      Author: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.52-dev-0-g783bf30
+#### $$VERSION$$ v1.52-1-g0dae2db
 #######################################################
 # shellcheck disable=SC1117
 
@@ -48,7 +48,7 @@ else
 	fi
 
 	##############
-	# a service Message was received
+	# a service message was received
 	# add your own stuff here
 	if [ -n "${SERVICE}" ]; then
 
@@ -94,7 +94,7 @@ else
 			    send_markdownv2_message "${CHAT[ID]}" "*${NOTBOTADMIN}*"; return 1
 			fi
 			;;
-		# will we process edited messages also?
+		# will we also process edited messages?
 		'/_edited_message'*)
 			return 1 # no
 			# but if we do, remove /edited_message
@@ -123,22 +123,22 @@ else
 
 	case "${MESSAGE}" in
 		##################
-		# example commands, replace them by your own
+		# example commands, replace them with your own
 		'/_dice_re'*) # dice from user received
 			sleep 5
-			local gameresult="*Congratulation ${USER[FIRST_NAME]} ${USER[LAST_NAME]}* you got *${MESSAGE[RESULT]} Points*."
+			local gameresult="*Congratulations*, ${USER[FIRST_NAME]} ${USER[LAST_NAME]}, you got *${MESSAGE[RESULT]} points*."
 			[ -z "${FORWARD[UID]}" ] && send_markdownv2_message "${CHAT[ID]}" "${gameresult}"
 			;;
 		'/game'*) # send random dice, edit list to fit your needs
 			send_dice "${CHAT[ID]}" ":$(printf "slot_machine\ngame_die\ndart\nbasketball\nsoccer\nslot_machine"|sort -R|shuf -n 1shuf -n 1):"
 			if [ "${BOTSENT[OK]}" = "true" ]; then
-				local gameresult="*Congratulation ${USER[FIRST_NAME]}* ${USER[LAST_NAME]} you got *${BOTSENT[RESULT]} Points*."
+				local gameresult="*Congratulations*, ${USER[FIRST_NAME]} ${USER[LAST_NAME]}, you got *${BOTSENT[RESULT]} points*."
 				sleep 5
 				case "${BOTSENT[RESULT]}" in
-				  1)	gameresult="*Sorry* only *one Point* ...";;
-				  2)	gameresult="*Hey*, 2 Points are *more then one!*";;
-				  5|6)	[[ "${BOTSENT[EMOJI]}" =~ fb0$ ]] || gameresult="*Super! ${BOTSENT[RESULT]} Points!*";;
-				  6*)	gameresult="*JACKPOT! ${BOTSENT[RESULT]} Points!*";;
+				  1)	gameresult="*Sorry!* only *one point* ...";;
+				  2)	gameresult="*Hey*, 2 points are *better than one!*";;
+				  4|5)	[[ "${BOTSENT[EMOJI]}" =~ fb0$ ]] || gameresult="*Super!* You got ${BOTSENT[RESULT]} points.";;
+				  6*)	gameresult="*JACKPOT!* ${BOTSENT[RESULT]} points!";;
 				esac
 				send_markdownv2_message "${CHAT[ID]}" "${gameresult}"
 			fi
@@ -292,7 +292,7 @@ else
 	esac
      }
 
-    # debug function called on start, stop of bot, interactive and  background processes
+    # debug function called on start, stop of bot, interactive and background processes
     # if your bot was started with debug as second argument
     # $1 current date, $2 from where the function was called, $3 ... $n optional information
     my_debug_checks() {
@@ -314,7 +314,7 @@ else
 
     ###########################
     # example error processing
-    # called when delete Message failed
+    # called when delete message failed
     # func="$1" err="$2" chat="$3" user="$4" emsg="$5" remaining args
     bashbotError_delete_message() {
 	log_debug "custom errorProcessing delete_message: ERR=$2 CHAT=$3 MSGID=$6 ERTXT=$5"

mycommands.sh.clean

@@ -10,7 +10,7 @@
 #     License: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #      Author: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #######################################################
 # shellcheck disable=SC1117
 

scripts/interactive.sh.clean

@@ -12,7 +12,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.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 ########################################################################
 
 ######

test/ADD-test-new.sh

@@ -10,7 +10,7 @@
 #	LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 # magic to ensure that we're always inside the root of our application,

test/ALL-tests.inc.sh

@@ -11,7 +11,7 @@
 #	LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 # common variables

test/a-commit-test.sh

@@ -10,7 +10,7 @@
 #	LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 ../dev/hooks/pre-commit.sh

test/b-example-test.sh

@@ -10,7 +10,7 @@
 #	LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 # include common functions and definitions

test/c-init-test.sh

@@ -10,7 +10,7 @@
 #	LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 # include common functions and definitions

test/d-JSON.sh-test.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 
 # include common functions and definitions
 # shellcheck source=test/ALL-tests.inc.sh

test/d-process_inline-test.sh

@@ -10,7 +10,7 @@
 #	LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 # include common functions and definitions

test/d-process_message-test.sh

@@ -10,7 +10,7 @@
 #	LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 # include common functions and definitions

test/d-send_message-test.sh

@@ -10,7 +10,7 @@
 #	LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 # include common functions and definitions

test/d-user_is-test.sh

@@ -10,7 +10,7 @@
 #	LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 # include common functions and definitions

test/e-env-test.sh

@@ -10,7 +10,7 @@
 #	LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #
-#### $$VERSION$$ v1.51-0-g6e66a28
+#### $$VERSION$$ v1.52-1-g0dae2db
 #===============================================================================
 
 # include common functions and definitions