octoleo/telegram-bot-bash
1
1
Fork 0
mirror of https://github.com/octoleo/telegram-bot-bash.git synced 2024-12-29 05:02:46 +00:00
Code Issues Projects Releases Wiki Activity

replace old JsoenGetXxx functions with direct UPD access

Browse Source
This commit is contained in:
Kay Marquardt (Gnadelwartz) 2021-01-19 17:24:53 +01:00
parent fe1fb75748
commit 62378f7cf6
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
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.31-dev-0-gad532cc #### $$VERSION$$ v1.31-dev-0-gfe1fb75
################################################################## ##################################################################
# emmbeded system may claim bash but it is not # emmbeded system may claim bash but it is not
@ -420,7 +420,7 @@ delete_message() {
get_file() { get_file() {
[ -z "$1" ] && return [ -z "$1" ] && return
sendJson "" '"file_id": "'"$1"'"' "${URL}/getFile" sendJson "" '"file_id": "'"$1"'"' "${URL}/getFile"
printf '%s\n' "${URL}"/"$(JsonGetString <<< "${res}" '"result","file_path"')" printf "%s\n" "${URL}/${UPD["result","file_path"]}"
} }
# iconv used to filter out broken utf characters, if not installed fake it # iconv used to filter out broken utf characters, if not installed fake it
@ -660,15 +660,15 @@ JsonDecode() {
printf "%b\n" "${out}${remain}" printf "%b\n" "${out}${remain}"
} }
JsonGetString() { #JsonGetString() {
sed -n -e '0,/\['"$1"'\]/ s/\['"$1"'\][ \t]"\(.*\)"$/\1/p' # sed -n -e '0,/\['"$1"'\]/ s/\['"$1"'\][ \t]"\(.*\)"$/\1/p'
} #}
JsonGetLine() { #JsonGetLine() {
sed -n -e '0,/\['"$1"'\]/ s/\['"$1"'\][ \t]//p' # sed -n -e '0,/\['"$1"'\]/ s/\['"$1"'\][ \t]//p'
} #}
JsonGetValue() { #JsonGetValue() {
sed -n -e '0,/\['"$1"'\]/ s/\['"$1"'\][ \t]\([0-9.,]*\).*/\1/p' # sed -n -e '0,/\['"$1"'\]/ s/\['"$1"'\][ \t]\([0-9.,]*\).*/\1/p'
} #}
################ ################
# processing of updates starts here # processing of updates starts here
@ -927,7 +927,7 @@ process_message() {
CONTACT[FIRST_NAME]="$(JsonDecode "${UPD["result",${num},"message","contact","first_name"]}")" CONTACT[FIRST_NAME]="$(JsonDecode "${UPD["result",${num},"message","contact","first_name"]}")"
CONTACT[LAST_NAME]="$(JsonDecode "${UPD["result",${num},"message","contact","last_name"]}")" CONTACT[LAST_NAME]="$(JsonDecode "${UPD["result",${num},"message","contact","last_name"]}")"
CONTACT[NUMBER]="${UPD["result",${num},"message","contact","phone_number"]}" CONTACT[NUMBER]="${UPD["result",${num},"message","contact","phone_number"]}"
CONTACT[VCARD]="$(JsonGetString '"result",'"${num}"',"message","contact","vcard"' <<<"${UPDATE}")" CONTACT[VCARD]="${UPD["result","${num}","message","contact","vcard"]}"
fi fi
# venue, must have a position # venue, must have a position

4
modules/chatMember.sh
View File

@ -5,7 +5,7 @@
# This file is public domain in the USA and all free countries. # This file is public domain in the USA and all free countries.
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
# #
#### $$VERSION$$ v1.30-0-g3266427 #### $$VERSION$$ v1.31-dev-0-gfe1fb75
# will be automatically sourced from bashbot # will be automatically sourced from bashbot
@ -76,7 +76,7 @@ leave_chat() {
get_chat_member_status() { get_chat_member_status() {
sendJson "$1" '"user_id":'"$2"'' "${URL}/getChatMember" sendJson "$1" '"user_id":'"$2"'' "${URL}/getChatMember"
# shellcheck disable=SC2154 # shellcheck disable=SC2154
JsonGetString '"result","status"' <<< "${res}" printf "%s\n" "${UPD["result,status"]}"
} }
user_is_creator() { user_is_creator() {