This repository has been archived by the owner on Sep 30, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 917
Add /rban command allowing remote bans #13
Open
SphericalKat
wants to merge
3
commits into
PaulSonOfLars:master
Choose a base branch
from
SphericalKat:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,9 +9,24 @@ | |
from tg_bot import dispatcher, BAN_STICKER, LOGGER | ||
from tg_bot.modules.disable import DisableAbleCommandHandler | ||
from tg_bot.modules.helper_funcs.chat_status import bot_admin, user_admin, is_user_ban_protected, can_restrict, \ | ||
is_user_admin, is_user_in_chat | ||
is_user_admin, is_user_in_chat, is_bot_admin | ||
from tg_bot.modules.helper_funcs.extraction import extract_user_and_text | ||
from tg_bot.modules.log_channel import loggable | ||
from tg_bot.modules.helper_funcs.filters import CustomFilters | ||
|
||
RBAN_ERRORS = { | ||
"User is an administrator of the chat", | ||
"Chat not found", | ||
"Not enough rights to restrict/unrestrict chat member", | ||
"User_not_participant", | ||
"Peer_id_invalid", | ||
"Group chat was deactivated", | ||
"Need to be inviter of a user to kick it from a basic group", | ||
"Chat_admin_required", | ||
"Only the creator of a basic group can kick group administrators", | ||
"Channel_private", | ||
"Not in the chat" | ||
} | ||
|
||
|
||
@run_async | ||
|
@@ -191,6 +206,74 @@ def unban(bot: Bot, update: Update, args: List[str]) -> str: | |
return log | ||
|
||
|
||
@run_async | ||
@bot_admin | ||
def rban(bot: Bot, update: Update, args: List[str]): | ||
message = update.effective_message | ||
|
||
if not args: | ||
message.reply_text("You don't seem to be referring to a chat/user.") | ||
return | ||
|
||
user_id, chat_id = extract_user_and_text(message, args) | ||
|
||
if not user_id: | ||
message.reply_text("You don't seem to be referring to a user.") | ||
return | ||
elif not chat_id: | ||
message.reply_text("You don't seem to be referring to a chat.") | ||
return | ||
|
||
try: | ||
chat = bot.get_chat(chat_id.split()[0]) | ||
except BadRequest as excp: | ||
if excp.message == "Chat not found": | ||
message.reply_text("Chat not found! Make sure you entered a valid chat ID and I'm part of that chat.") | ||
return | ||
else: | ||
raise | ||
|
||
if chat.type == 'private': | ||
message.reply_text("I'm sorry, but that's a private chat!") | ||
return | ||
|
||
if not is_bot_admin(chat, bot.id) or not chat.get_member(bot.id).can_restrict_members: | ||
message.reply_text("I can't restrict people there! Make sure I'm admin and can ban users.") | ||
return | ||
|
||
try: | ||
member = chat.get_member(user_id) | ||
except BadRequest as excp: | ||
if excp.message == "User not found": | ||
message.reply_text("I can't seem to find this user") | ||
return | ||
else: | ||
raise | ||
|
||
if is_user_ban_protected(chat, user_id, member): | ||
message.reply_text("I really wish I could ban admins...") | ||
return | ||
|
||
if user_id == bot.id: | ||
message.reply_text("I'm not gonna BAN myself, are you crazy?") | ||
return | ||
|
||
try: | ||
chat.kick_member(user_id) | ||
message.reply_text("Banned!") | ||
except BadRequest as excp: | ||
if excp.message == "Reply message not found": | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You're going to need more exception catching here, see the possible gban exceptions. |
||
# Do not reply | ||
message.reply_text('Banned!', quote=False) | ||
elif excp.message in RBAN_ERRORS: | ||
message.reply_text(excp.message) | ||
else: | ||
LOGGER.warning(update) | ||
LOGGER.exception("ERROR banning user %s in chat %s (%s) due to %s", user_id, chat.title, chat.id, | ||
excp.message) | ||
message.reply_text("Well damn, I can't ban that user.") | ||
|
||
|
||
__help__ = """ | ||
- /kickme: kicks the user who issued the command | ||
|
||
|
@@ -206,8 +289,10 @@ def unban(bot: Bot, update: Update, args: List[str]) -> str: | |
KICK_HANDLER = CommandHandler("kick", kick, pass_args=True, filters=Filters.group) | ||
UNBAN_HANDLER = CommandHandler("unban", unban, pass_args=True, filters=Filters.group) | ||
KICKME_HANDLER = DisableAbleCommandHandler("kickme", kickme, filters=Filters.group) | ||
RBAN_HANDLER = CommandHandler("rban", rban, pass_args=True, filters=CustomFilters.sudo_filter) | ||
|
||
dispatcher.add_handler(BAN_HANDLER) | ||
dispatcher.add_handler(KICK_HANDLER) | ||
dispatcher.add_handler(UNBAN_HANDLER) | ||
dispatcher.add_handler(KICKME_HANDLER) | ||
dispatcher.add_handler(RBAN_HANDLER) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All the
return ""
are useless, given this hasn't been set as @loggable. Use normalreturn
instead.