From 300553f8ba3ef2c7304a2e487d7c99f2f965f69a Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Mon, 20 May 2019 19:16:00 +0200 Subject: [PATCH] move _botadmin back to aliases --- bashbot.sh | 6 +----- modules/aliases.sh | 6 +++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bashbot.sh b/bashbot.sh index 25066f5..41d448d 100755 --- a/bashbot.sh +++ b/bashbot.sh @@ -12,7 +12,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v0.80-pre-5-ge5f7b2d +#### $$VERSION$$ v0.80-pre-6-gd34c22f # # Exit Codes: # - 0 sucess (hopefully) @@ -142,10 +142,6 @@ download() { printf '%s\n' "${TMPDIR:-.}/${file}" } -# easy handling of users: -_is_botadmin() { - user_is_botadmin "${USER[ID]}" -} # $1 postfix, e.g. chatid # $2 prefix, back- or startbot- procname(){ diff --git a/modules/aliases.sh b/modules/aliases.sh index 1d18b43..0c9f1e4 100644 --- a/modules/aliases.sh +++ b/modules/aliases.sh @@ -5,10 +5,14 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v0.80-pre-5-ge5f7b2d +#### $$VERSION$$ v0.80-pre-6-gd34c22f # # source from commands.sh to use the aliases +# easy handling of users: +_is_botadmin() { + user_is_botadmin "${USER[ID]}" +} _is_admin() { user_is_admin "${CHAT[ID]}" "${USER[ID]}" }