Skip to content

FedBan Bug Fix :) #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
celestix wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FedBan Bug Fix :) #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cinderella/modules/feds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ def fed_ban(bot: Bot, update: Update, args: List[str]):

fed_chats = sql.all_fed_chats(fed_id)
# Will send to current chat
bot.send_message(chat.id, "<b>New FederationBan</b>" \
bot.send_message(chat.id, "<b>FedBan reason updated</b>" \
"\n<b>Federation:</b> {}" \
"\n<b>Federation Admin:</b> {}" \
"\n<b>User:</b> {}" \
Expand Down Expand Up @@ -618,15 +618,15 @@ def fed_ban(bot: Bot, update: Update, args: List[str]):

fed_chats = sql.all_fed_chats(fed_id)
# Will send to current chat
bot.send_message(chat.id, "<b>FedBan reason updated</b>" \
bot.send_message(chat.id, "<b>New Fedban</b>" \
"\n<b>Federation:</b> {}" \
"\n<b>Federation Admin:</b> {}" \
"\n<b>User:</b> {}" \
"\n<b>User ID:</b> <code>{}</code>" \
"\n<b>Reason:</b> {}".format(fed_name, mention_html(user.id, user.first_name), user_target, fban_user_id, reason), parse_mode="HTML")
# Send message to owner if fednotif is enabled
if getfednotif:
bot.send_message(info['owner'], "<b>FedBan reason updated</b>" \
bot.send_message(info['owner'], "<b>New Fedban</b>" \
"\n<b>Federation:</b> {}" \
"\n<b>Federation Admin:</b> {}" \
"\n<b>User:</b> {}" \
Expand All @@ -636,7 +636,7 @@ def fed_ban(bot: Bot, update: Update, args: List[str]):
get_fedlog = sql.get_fed_log(fed_id)
if get_fedlog:
if int(get_fedlog) != int(chat.id):
bot.send_message(get_fedlog, "<b>FedBan reason updated</b>" \
bot.send_message(get_fedlog, "<b>New Fedban</b>" \
"\n<b>Federation:</b> {}" \
"\n<b>Federation Admin:</b> {}" \
"\n<b>User:</b> {}" \
Expand Down