octoleo
/
telegram-bot-bash
mirror of https://github.com/octoleo/telegram-bot-bash.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

add error process to delete_message

This commit is contained in:
Kay Marquardt (Gnadelwartz) 2021-02-08 19:56:01 +01:00
parent f842730645
commit d3a1cecf1f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bashbot.sh
View File

@ -30,7 +30,7 @@ BOTCOMMANDS="-h help init start stop status suspendback resumeback killb
# 8 - curl/wget missing # 8 - curl/wget missing
# 10 - not bash! # 10 - not bash!
# #
#### $$VERSION$$ v1.45-dev-12-g066274c #### $$VERSION$$ v1.45-dev-14-gf842730
################################################################## ##################################################################
# are we running in a terminal? # are we running in a terminal?
@ -426,6 +426,8 @@ declare -xr DELETE_URL=${URL}'/deleteMessage'
delete_message() { delete_message() {
[ -z "$3" ] && log_update "Delete Message CHAT=$1 MSG_ID=$2" [ -z "$3" ] && log_update "Delete Message CHAT=$1 MSG_ID=$2"
sendJson "$1" '"message_id": '"$2"'' "${DELETE_URL}" sendJson "$1" '"message_id": '"$2"'' "${DELETE_URL}"
# func="$1" err="$2" chat="$3" user="$4" emsg="$5" remaining args
[ -n "${BOTSENT[ERROR]}" ] && processError "${FUNCNAME[0]}" "${BOTSENT[ERROR]}" "$1" "" "${BOTSENT[DESCRIPTION]}" "$2" "$3"
} }
# URL path for file id, $1 file_id # URL path for file id, $1 file_id
@ -465,8 +467,8 @@ download_file() {
# calls function based on error: bashbotError{function} basbotError{error} # calls function based on error: bashbotError{function} basbotError{error}
# if no specific function exist try to call bashbotProcessError # if no specific function exist try to call bashbotProcessError
processError(){ processError(){
[[ "$4" != "4"* ]] && return 1
local func="$1" err="$2" local func="$1" err="$2"
[[ "${err}" != "4"* ]] && return 1
# check for bashbotError${func} provided in mycommands # check for bashbotError${func} provided in mycommands
# shellcheck disable=SC2082 # shellcheck disable=SC2082
if _is_function "bashbotError_${func}"; then if _is_function "bashbotError_${func}"; then

2
mycommands.sh
View File

@ -13,7 +13,7 @@
# License: WTFPLv2 http://www.wtfpl.net/txt/copying/ # License: WTFPLv2 http://www.wtfpl.net/txt/copying/
# Author: KayM (gnadelwartz), kay@rrr.de # Author: KayM (gnadelwartz), kay@rrr.de
# #
#### $$VERSION$$ v1.45-dev-10-gb2fc405 #### $$VERSION$$ v1.45-dev-13-g117255a
####################################################### #######################################################
# shellcheck disable=SC1117 # shellcheck disable=SC1117