From 5ffb5155ab82e2cb7d9a2d586de3f69317c33016 Mon Sep 17 00:00:00 2001
From: David Coomber <47242934+dcoomber@users.noreply.github.com>
Date: Sat, 13 Aug 2022 17:41:44 +0200
Subject: [PATCH] Misc. grammar / formatting updates

---
 examples/question.sh |  4 ++--
 mycommands.sh        | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/examples/question.sh b/examples/question.sh
index 0244e44..a65b922 100755
--- a/examples/question.sh
+++ b/examples/question.sh
@@ -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've taken too 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"
@@ -42,7 +42,7 @@ else
 	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'
 	read -r answer <"${INPUT}"
diff --git a/mycommands.sh b/mycommands.sh
index 1a80153..628b67c 100644
--- a/mycommands.sh
+++ b/mycommands.sh
@@ -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
@@ -126,19 +126,19 @@ else
 		# example commands, replace them with your own
 		'/_dice_re'*) # dice from user received
 			sleep 5
-			local gameresult="*Congratulations, ${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="*Congratulations, ${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* ...";;
+				  1)	gameresult="*Sorry!* only *one point* ...";;
 				  2)	gameresult="*Hey*, 2 points are *better than one!*";;
-				  5|6)	[[ "${BOTSENT[EMOJI]}" =~ fb0$ ]] || gameresult="*Super! You got ${BOTSENT[RESULT]} points!*";;
-				  6*)	gameresult="*JACKPOT! ${BOTSENT[RESULT]} points!*";;
+				  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"