mirror of
https://github.com/octoleo/telegram-bot-bash.git
synced 2024-05-29 00:10:53 +00:00
iBUTTON: infrastructe seems to work
This commit is contained in:
parent
1fe22a0345
commit
461e748c92
29
bashbot.sh
29
bashbot.sh
|
@ -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.35-dev-1-g9023b21
|
#### $$VERSION$$ v1.35-dev-2-g1fe22a0
|
||||||
##################################################################
|
##################################################################
|
||||||
|
|
||||||
# emmbeded system may claim bash but it is not
|
# emmbeded system may claim bash but it is not
|
||||||
|
@ -689,8 +689,8 @@ process_client() {
|
||||||
"${iQUERY[USERNAME]:0:20} (${iQUERY[USER_ID]})" "${iQUERY[0]}" >>"${UPDATELOG}"
|
"${iQUERY[USERNAME]:0:20} (${iQUERY[USER_ID]})" "${iQUERY[0]}" >>"${UPDATELOG}"
|
||||||
elif [ -n "${iBUTTON[ID]}" ]; then
|
elif [ -n "${iBUTTON[ID]}" ]; then
|
||||||
process_inline_button "${num}" "${debug}"
|
process_inline_button "${num}" "${debug}"
|
||||||
printf "%(%c)T: Inline Button update received FROM=%s CHAT=%s ID=%s DATA:%s \n" -1\
|
printf "%(%c)T: Inline Button update received FROM=%s CHAT=%s CALLBACK=%s DATA:%s \n" -1\
|
||||||
"${iBUTTON[USERNAME]:0:20} (${iBUTTON[USER_ID]})" "${iBUTTON[CHAT_ID]}" "{iBUTTON[ID]" "{iBUTTON[DATA]" >>"${UPDATELOG}"
|
"${iBUTTON[USERNAME]:0:20} (${iBUTTON[USER_ID]})" "${iBUTTON[CHAT_ID]}" "${iBUTTON[ID]}" "${iBUTTON[DATA]}" >>"${UPDATELOG}"
|
||||||
else
|
else
|
||||||
if grep -qs -e '\["result",'"${num}"',"edited_message"' <<<"${UPDATE}"; then
|
if grep -qs -e '\["result",'"${num}"',"edited_message"' <<<"${UPDATE}"; then
|
||||||
# edited message
|
# edited message
|
||||||
|
@ -847,7 +847,7 @@ pre_process_message(){
|
||||||
CMD=( ); iQUERY=( ); iBUTTON=(); MESSAGE=(); CHAT=(); USER=(); CONTACT=(); LOCATION=(); unset CAPTION
|
CMD=( ); iQUERY=( ); iBUTTON=(); MESSAGE=(); CHAT=(); USER=(); CONTACT=(); LOCATION=(); unset CAPTION
|
||||||
REPLYTO=( ); FORWARD=( ); URLS=(); VENUE=( ); SERVICE=( ); NEWMEMBER=( ); LEFTMEMBER=( ); PINNED=( ); MIGRATE=( )
|
REPLYTO=( ); FORWARD=( ); URLS=(); VENUE=( ); SERVICE=( ); NEWMEMBER=( ); LEFTMEMBER=( ); PINNED=( ); MIGRATE=( )
|
||||||
iQUERY[ID]="${UPD["result,${num},inline_query,id"]}"
|
iQUERY[ID]="${UPD["result,${num},inline_query,id"]}"
|
||||||
iBUTTON[ID]="${UPD["result,${num},inline_callback,id"]}"
|
iBUTTON[ID]="${UPD["result,${num},callback_query,id"]}"
|
||||||
CHAT[ID]="${UPD["result,${num},message,chat,id"]}"
|
CHAT[ID]="${UPD["result,${num},message,chat,id"]}"
|
||||||
USER[ID]="${UPD["result,${num},message,from,id"]}"
|
USER[ID]="${UPD["result,${num},message,from,id"]}"
|
||||||
[ -z "${CHAT[ID]}" ] && CHAT[ID]="${UPD["result,${num},edited_message,chat,id"]}"
|
[ -z "${CHAT[ID]}" ] && CHAT[ID]="${UPD["result,${num},edited_message,chat,id"]}"
|
||||||
|
@ -867,19 +867,18 @@ process_inline_query() {
|
||||||
}
|
}
|
||||||
process_inline_button() {
|
process_inline_button() {
|
||||||
# debugging for impelemetation
|
# debugging for impelemetation
|
||||||
log_message "${res}"
|
|
||||||
set -x
|
|
||||||
local num="$1"
|
local num="$1"
|
||||||
iBUTTON[DATA]="${UPD["result,${num},inline_callback,data"]}"
|
iBUTTON[DATA]="${UPD["result,${num},callback_query,data"]}"
|
||||||
iBUTTON[CHAT_ID]="${UPD["result,${num},inline_callback,chat_instance"]}"
|
#iBUTTON[CHAT_INSTANCE]="${UPD["result,${num},callback_query,chat_instance"]}"
|
||||||
iBUTTON[MESSAGE_ID]="${UPD["result,${num},inline_callback,inline_message_id"]}"
|
#iBUTTON[INLINE_ID]="${UPD["result,${num},callback_query,inline_message_id"]}"
|
||||||
iBUTTON[MEESSAGE]="$(JsonDecode "${UPD["result,${num},inline_callback,message,text"]}")"
|
iBUTTON[CHAT_ID]="${UPD["result,${num},callback_query,message,chat,id"]}"
|
||||||
|
iBUTTON[MESSAGE_ID]="${UPD["result,${num},callback_query,message,message_id"]}"
|
||||||
|
iBUTTON[MEESSAGE]="$(JsonDecode "${UPD["result,${num},callback_query,message,text"]}")"
|
||||||
# XXX should we give back pressed button, all buttons or nothing?
|
# XXX should we give back pressed button, all buttons or nothing?
|
||||||
iBUTTON[USER_ID]="${UPD["result,${num},inline_callback,from,id"]}"
|
iBUTTON[USER_ID]="${UPD["result,${num},callback_query,from,id"]}"
|
||||||
iBUTTON[FIRST_NAME]="$(JsonDecode "${UPD["result,${num},inline_callback,from,first_name"]}")"
|
iBUTTON[FIRST_NAME]="$(JsonDecode "${UPD["result,${num},callback_query,from,first_name"]}")"
|
||||||
iBUTTON[LAST_NAME]="$(JsonDecode "${UPD["result,${num},inline_callback,from,last_name"]}")"
|
iBUTTON[LAST_NAME]="$(JsonDecode "${UPD["result,${num},callback_query,from,last_name"]}")"
|
||||||
iBUTTON[USERNAME]="$(JsonDecode "${UPD["result,${num},inline_callback,from,username"]}")"
|
iBUTTON[USERNAME]="$(JsonDecode "${UPD["result,${num},callback_query,from,username"]}")"
|
||||||
set +x
|
|
||||||
# always true
|
# always true
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user