octoleo/telegram-bot-bash
1
1
Fork 0
mirror of https://github.com/octoleo/telegram-bot-bash.git synced 2025-01-30 00:58:24 +00:00
Code Issues Projects Releases Wiki Activity

some more conversion to sendJson

Browse Source
This commit is contained in:
Kay Marquardt (Gnadelwartz) 2019-04-26 13:19:34 +02:00
parent a288a8d1d4
commit 81b540a4d5
2 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
bashbot.sh
View File

@ -12,7 +12,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$$ v0.70-dev3-11-gc835e05 #### $$VERSION$$ v0.70-dev3-12-ga288a8d
# #
# Exit Codes: # Exit Codes:
# - 0 sucess (hopefully) # - 0 sucess (hopefully)
@ -132,7 +132,6 @@ fi
BOTTOKEN="$(cat "${TOKENFILE}")" BOTTOKEN="$(cat "${TOKENFILE}")"
URL='https://api.telegram.org/bot'$BOTTOKEN URL='https://api.telegram.org/bot'$BOTTOKEN
MSG_URL=$URL'/sendMessage' MSG_URL=$URL'/sendMessage'
LEAVE_URL=$URL'/leaveChat' LEAVE_URL=$URL'/leaveChat'
KICK_URL=$URL'/kickChatMember' KICK_URL=$URL'/kickChatMember'
@ -152,10 +151,8 @@ ME_URL=$URL'/getMe'
DELETE_URL=$URL'/deleteMessage' DELETE_URL=$URL'/deleteMessage'
GETMEMBER_URL=$URL'/getChatMember' GETMEMBER_URL=$URL'/getChatMember'
FILE_URL='https://api.telegram.org/file/bot'$BOTTOKEN'/'
UPD_URL=$URL'/getUpdates?offset=' UPD_URL=$URL'/getUpdates?offset='
GET_URL=$URL'/getFile' GETFILE_URL=$URL'/getFile'
unset USER unset USER
declare -A BOTSENT USER MESSAGE URLS CONTACT LOCATION CHAT FORWARD REPLYTO VENUE declare -A BOTSENT USER MESSAGE URLS CONTACT LOCATION CHAT FORWARD REPLYTO VENUE
@ -163,37 +160,37 @@ export BOTSENT USER MESSAGE URLS CONTACT LOCATION CHAT FORWARD REPLYTO VENUE
send_normal_message() { send_normal_message() {
text="$2" local text="${2}"
until [ "$(echo -n "$text" | wc -m)" -eq "0" ]; do until [ -z "${text}" ]; do
sendJson "${1}" '"text":"'"${text:0:4096}"'"' "$MSG_URL" sendJson "${1}" '"text":"'"${text:0:4096}"'"' "${MSG_URL}"
text="${text:4096}" text="${text:4096}"
done done
} }
send_markdown_message() { send_markdown_message() {
text="$2" local text="${2}"
until [ "$(echo -n "$text" | wc -m)" -eq "0" ]; do until [ -z "${text}" ]; do
sendJson "${1}" '"text":"'"${text:0:4096}"'","parse_mode":"markdown"' "$MSG_URL" sendJson "${1}" '"text":"'"${text:0:4096}"'","parse_mode":"markdown"' "${MSG_URL}"
text="${text:4096}" text="${text:4096}"
done done
} }
send_html_message() { send_html_message() {
text="$2" local text="${2}"
until [ "$(echo -n "$text" | wc -m)" -eq "0" ]; do until [ -z "${text}" ]; do
sendJson "${1}" '"text":"'"${text:0:4096}"'","parse_mode":"html"' "$MSG_URL" sendJson "${1}" '"text":"'"${text:0:4096}"'","parse_mode":"html"' "${MSG_URL}"
text="${text:4096}" text="${text:4096}"
done done
} }
delete_message() { delete_message() {
sendJson "$1" 'message_id: '"$2"'' "$DELETE_URL" sendJson "${1}" 'message_id: '"${2}"'' "${DELETE_URL}"
} }
# usage: status="$(get_chat_member_status "chat" "user")" # usage: status="$(get_chat_member_status "chat" "user")"
get_chat_member_status() { get_chat_member_status() {
sendJson "$1" 'user_id: '"$2"'' "$GETMEMBER_URL" sendJson "$1" 'user_id: '"$2"'' "$GETMEMBER_URL"
echo "$res" | JsonGetString '"result","status"' JsonGetString '"result","status"' <<< "$res"
} }
kick_chat_member() { kick_chat_member() {
@ -238,72 +235,72 @@ user_is_allowed() {
} }
answer_inline_query() { answer_inline_query() {
case "$2" in local JSON
case "${2}" in
"article") "article")
InlineQueryResult='[{"type":"'$2'","id":"'$RANDOM'","title":"'$3'","message_text":"'$4'"}]' JSON='[{"type":"'$2'","id":"'$RANDOM'","title":"'$3'","message_text":"'$4'"}]'
;; ;;
"photo") "photo")
InlineQueryResult='[{"type":"'$2'","id":"'$RANDOM'","photo_url":"'$3'","thumb_url":"'$4'"}]' JSON='[{"type":"'$2'","id":"'$RANDOM'","photo_url":"'$3'","thumb_url":"'$4'"}]'
;; ;;
"gif") "gif")
InlineQueryResult='[{"type":"'$2'","id":"'$RANDOM'","gif_url":"'$3'", "thumb_url":"'$4'"}]' JSON='[{"type":"'$2'","id":"'$RANDOM'","gif_url":"'$3'", "thumb_url":"'$4'"}]'
;; ;;
"mpeg4_gif") "mpeg4_gif")
InlineQueryResult='[{"type":"'$2'","id":"'$RANDOM'","mpeg4_url":"'$3'"}]' JSON='[{"type":"'$2'","id":"'$RANDOM'","mpeg4_url":"'$3'"}]'
;; ;;
"video") "video")
InlineQueryResult='[{"type":"'$2'","id":"'$RANDOM'","video_url":"'$3'","mime_type":"'$4'","thumb_url":"'$5'","title":"'$6'"}]' JSON='[{"type":"'$2'","id":"'$RANDOM'","video_url":"'$3'","mime_type":"'$4'","thumb_url":"'$5'","title":"'$6'"}]'
;; ;;
"audio") "audio")
InlineQueryResult='[{"type":"'$2'","id":"'$RANDOM'","audio_url":"'$3'","title":"'$4'"}]' JSON='[{"type":"'$2'","id":"'$RANDOM'","audio_url":"'$3'","title":"'$4'"}]'
;; ;;
"voice") "voice")
InlineQueryResult='[{"type":"'$2'","id":"'$RANDOM'","voice_url":"'$3'","title":"'$4'"}]' JSON='[{"type":"'$2'","id":"'$RANDOM'","voice_url":"'$3'","title":"'$4'"}]'
;; ;;
"document") "document")
InlineQueryResult='[{"type":"'$2'","id":"'$RANDOM'","title":"'$3'","caption":"'$4'","document_url":"'$5'","mime_type":"'$6'"}]' JSON='[{"type":"'$2'","id":"'$RANDOM'","title":"'$3'","caption":"'$4'","document_url":"'$5'","mime_type":"'$6'"}]'
;; ;;
"location") "location")
InlineQueryResult='[{"type":"'$2'","id":"'$RANDOM'","latitude":"'$3'","longitude":"'$4'","title":"'$5'"}]' JSON='[{"type":"'$2'","id":"'$RANDOM'","latitude":"'$3'","longitude":"'$4'","title":"'$5'"}]'
;; ;;
"venue") "venue")
InlineQueryResult='[{"type":"'$2'","id":"'$RANDOM'","latitude":"'$3'","longitude":"'$4'","title":"'$5'","address":"'$6'"}]' JSON='[{"type":"'$2'","id":"'$RANDOM'","latitude":"'$3'","longitude":"'$4'","title":"'$5'","address":"'$6'"}]'
;; ;;
"contact") "contact")
InlineQueryResult='[{"type":"'$2'","id":"'$RANDOM'","phone_number":"'$3'","first_name":"'$4'"}]' JSON='[{"type":"'$2'","id":"'$RANDOM'","phone_number":"'$3'","first_name":"'$4'"}]'
;; ;;
# Cached media stored in Telegram server # Cached media stored in Telegram server
"cached_photo") "cached_photo")
InlineQueryResult='[{"type":"photo","id":"'$RANDOM'","photo_file_id":"'$3'"}]' JSON='[{"type":"photo","id":"'$RANDOM'","photo_file_id":"'$3'"}]'
;; ;;
"cached_gif") "cached_gif")
InlineQueryResult='[{"type":"gif","id":"'$RANDOM'","gif_file_id":"'$3'"}]' JSON='[{"type":"gif","id":"'$RANDOM'","gif_file_id":"'$3'"}]'
;; ;;
"cached_mpeg4_gif") "cached_mpeg4_gif")
InlineQueryResult='[{"type":"mpeg4_gif","id":"'$RANDOM'","mpeg4_file_id":"'$3'"}]' JSON='[{"type":"mpeg4_gif","id":"'$RANDOM'","mpeg4_file_id":"'$3'"}]'
;; ;;
"cached_sticker") "cached_sticker")
InlineQueryResult='[{"type":"sticker","id":"'$RANDOM'","sticker_file_id":"'$3'"}]' JSON='[{"type":"sticker","id":"'$RANDOM'","sticker_file_id":"'$3'"}]'
;; ;;
"cached_document") "cached_document")
InlineQueryResult='[{"type":"document","id":"'$RANDOM'","title":"'$3'","document_file_id":"'$4'"}]' JSON='[{"type":"document","id":"'$RANDOM'","title":"'$3'","document_file_id":"'$4'"}]'
;; ;;
"cached_video") "cached_video")
InlineQueryResult='[{"type":"video","id":"'$RANDOM'","video_file_id":"'$3'","title":"'$4'"}]' JSON='[{"type":"video","id":"'$RANDOM'","video_file_id":"'$3'","title":"'$4'"}]'
;; ;;
"cached_voice") "cached_voice")
InlineQueryResult='[{"type":"voice","id":"'$RANDOM'","voice_file_id":"'$3'","title":"'$4'"}]' JSON='[{"type":"voice","id":"'$RANDOM'","voice_file_id":"'$3'","title":"'$4'"}]'
;; ;;
"cached_audio") "cached_audio")
InlineQueryResult='[{"type":"audio","id":"'$RANDOM'","audio_file_id":"'$3'"}]' JSON='[{"type":"audio","id":"'$RANDOM'","audio_file_id":"'$3'"}]'
;; ;;
esac esac
res="$(curl -s "$INLINE_QUERY" -F "inline_query_id=$1" -F "results=$InlineQueryResult")" sendJson "" '"inline_query_id": '"${1}"', "results": '"${JSON}" "${INLINE_QUERY}"
} }
@ -356,8 +353,8 @@ sendJson(){
get_file() { get_file() {
[ "$1" = "" ] && return [ "$1" = "" ] && return
local JSON='"file_id": '"${1}" local JSON='"file_id": '"${1}"
sendJson "" "${JSON}" "${GET_URL}" sendJson "" "${JSON}" "${GETFILE_URL}"
echo "${FILE_URL}$(echo "${res}" | jsonGetString '"result","file_path"')" echo "${URL}/$(echo "${res}" | jsonGetString '"result","file_path"')"
} }
send_file() { send_file() {
@ -602,8 +599,8 @@ bot_init() {
# get bot name # get bot name
getBotName() { getBotName() {
res="$(curl -s "$ME_URL" | "${JSONSHFILE}" -s -b -n )" sendJson "" "" "$ME_URL"
echo "$res" | JsonGetString '"result","username"' JsonGetString '"result","username"' <<< "$res"
} }
ME="$(getBotName)" ME="$(getBotName)"

13
doc/7_develop.md
View File

@ -16,12 +16,11 @@ bashbot development is done on github. If you want to provide fixes or new featu
### Test, Add, Push changes ### Test, Add, Push changes
A typical bashbot develop cycle looks as follow: A typical bashbot develop cycle looks as follow:
1. 'git checkout develop' 1. start developing - *change, copy, edit bashbot files ...*
2. start developing - *change, copy, edit bashbot files ...* 2. after change to bash file: ```shellcheck -x file.sh```
3. run 'dev/all-tests.sh' - *in case if errors back to 2.* 3. ```dev/all-tests.sh``` - *in case if errors back to 2.*
4. run 'dev/git-add.sh' - *check for changed files, update version string, run git add* 4. ```dev/git-add.sh``` - *check for changed files, update version string, run git add*
5. 'git commit' -m "COMMIT MESSAGE" 5. ```git commit' -m "COMMIT MESSAGE"; git push```
6. 'git push'
**If you setup with hooks and use the scripts above, versioning, addding and testing is done automatically.** **If you setup with hooks and use the scripts above, versioning, addding and testing is done automatically.**
@ -84,5 +83,5 @@ fi
#### [Prev Function Reference](6_function.md) #### [Prev Function Reference](6_function.md)
#### [Next Bashbot Environment](8_custom.md) #### [Next Bashbot Environment](8_custom.md)
#### $$VERSION$$ v0.70-dev3-8-gb8a23c4 #### $$VERSION$$ v0.70-dev3-12-ga288a8d