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

use CMD to check for global commands

Browse Source
This commit is contained in:
Kay Marquardt (Gnadelwartz) 2019-05-30 21:08:39 +02:00
parent 46271cc1a2
commit ffec76a830
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bashbot.sh
View File

@ -11,7 +11,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.90-rc1-0-g93b4914 #### $$VERSION$$ v0.90-rc1-1-g46271cc
# #
# Exit Codes: # Exit Codes:
# - 0 sucess (hopefully) # - 0 sucess (hopefully)
@ -580,7 +580,10 @@ process_message() {
set -f; unset IFS set -f; unset IFS
# shellcheck disable=SC2206 # shellcheck disable=SC2206
CMD=( ${MESSAGE[0]} ) CMD=( ${MESSAGE[0]} )
CMD[0]="${CMD[0]%%@*}"
set +f set +f
else
CMD[0]=""
fi fi
} }

18
commands.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$$ v0.90-rc1-0-g93b4914 #### $$VERSION$$ v0.90-rc1-1-g46271cc
# #
# adjust your language setting here, e.g.when run from other user or cron. # adjust your language setting here, e.g.when run from other user or cron.
@ -72,14 +72,14 @@ if [ "${1}" != "source" ];then
# run commands if true (0) is returned or if mycommands dose not exist # run commands if true (0) is returned or if mycommands dose not exist
# shellcheck disable=SC2181 # shellcheck disable=SC2181
if [ "$?" = "0" ]; then if [ "$?" = "0" ] && [ "${CMD}" != "" ]; then
case "${MESSAGE}" in case "${CMD}" in
################################################ ################################################
# GLOBAL commands start here, edit messages only # GLOBAL commands start here, edit messages only
'/info'*) '/info')
_markdown_message "${bashbot_info}" _markdown_message "${bashbot_info}"
;; ;;
'/start'*) '/start')
send_action "${CHAT[ID]}" "typing" send_action "${CHAT[ID]}" "typing"
_is_botadmin && _markdown_message "You are *BOTADMIN*." _is_botadmin && _markdown_message "You are *BOTADMIN*."
if _is_botadmin || _is_allowed "start" ; then if _is_botadmin || _is_allowed "start" ; then
@ -89,22 +89,22 @@ if [ "${1}" != "source" ];then
fi fi
;; ;;
'/help'*) '/help')
_markdown_message "${bashbot_help}" _markdown_message "${bashbot_help}"
;; ;;
'/leavechat'*) # bot leave chat if user is admin in chat '/leavechat') # bot leave chat if user is admin in chat
if _is_admin ; then if _is_admin ; then
_markdown_message "*LEAVING CHAT...*" _markdown_message "*LEAVING CHAT...*"
_leave _leave
fi fi
;; ;;
'/kickme'*) '/kickme')
_kick_user "${USER[ID]}" _kick_user "${USER[ID]}"
_unban_user "${USER[ID]}" _unban_user "${USER[ID]}"
;; ;;
'/cancel'*) '/cancel')
checkproc checkproc
if [ "$res" -eq 0 ] ; then killproc && _message "Command canceled.";else _message "No command is currently running.";fi if [ "$res" -eq 0 ] ; then killproc && _message "Command canceled.";else _message "No command is currently running.";fi
;; ;;