Merge branch 'main' of https://github.com/Gojo-Bots/Gojo_Satarou

Powers/plugins/admin.py

@@ -42,8 +42,7 @@ async def adminlist_show(_, m: Message):
         adminstr = f"Admins in <b>{m.chat.title}</b>:" + "\n\n"
 
         bot_admins = [i for i in admin_list if (i[1].lower()).endswith("bot")]
-        user_admins = [i for i in admin_list if not (
-            i[1].lower()).endswith("bot")]
+        user_admins = [i for i in admin_list if not (i[1].lower()).endswith("bot")]
 
         # format is like: (user_id, username/name,anonyamous or not)
         mention_users = [

Powers/plugins/approve.py

@@ -89,8 +89,7 @@ async def disapprove_user(c: Gojo, m: Message):
     except UserNotParticipant:
         if already_approved:  # If user is approved and not in chat, unapprove them.
             db.remove_approve(user_id)
-            LOGGER.info(
-                f"{user_id} disapproved in {m.chat.id} as UserNotParticipant")
+            LOGGER.info(f"{user_id} disapproved in {m.chat.id} as UserNotParticipant")
         await m.reply_text("This user is not in this chat, unapproved them.")
         return
     except RPCError as ef:
@@ -160,8 +159,7 @@ async def check_approval(c: Gojo, m: Message):
     except Exception:
         return
     check_approve = db.check_approve(user_id)
-    LOGGER.info(
-        f"{m.from_user.id} checking approval of {user_id} in {m.chat.id}")
+    LOGGER.info(f"{m.from_user.id} checking approval of {user_id} in {m.chat.id}")
 
     if not user_id:
         await m.reply_text(

Powers/plugins/bans.py

@@ -912,8 +912,7 @@ async def kickme(_, m: Message):
     if len(m.text.split()) >= 2:
         reason = m.text.split(None, 1)[1]
     try:
-        LOGGER.info(
-            f"{m.from_user.id} kickme used by {m.from_user.id} in {m.chat.id}")
+        LOGGER.info(f"{m.from_user.id} kickme used by {m.from_user.id} in {m.chat.id}")
         await m.chat.ban_member(m.from_user.id)
         txt = "Why not let me help you!"
         txt += f"\n<b>Reason</b>: {reason}" if reason else ""

Powers/plugins/blacklist.py

@@ -57,8 +57,7 @@ async def add_blacklist(_, m: Message):
             ", ".join([f"<code>{i}</code>" for i in bl_words])
             + " already added in blacklist, skipped them!"
         )
-    LOGGER.info(
-        f"{m.from_user.id} added new blacklists ({bl_words}) in {m.chat.id}")
+    LOGGER.info(f"{m.from_user.id} added new blacklists ({bl_words}) in {m.chat.id}")
     trigger = ", ".join(f"<code>{i}</code>" for i in bl_words)
     await m.reply_text(
         text=f"Added <code>{trigger}</code> in blacklist words!"
@@ -113,12 +112,10 @@ async def rm_blacklist(_, m: Message):
 
     if non_found_words:
         rep_text = (
-            "Could not find " +
-            ", ".join(f"<code>{i}</code>" for i in non_found_words)
+            "Could not find " + ", ".join(f"<code>{i}</code>" for i in non_found_words)
         ) + " in blcklisted words, skipped them."
 
-    LOGGER.info(
-        f"{m.from_user.id} removed blacklists ({bl_words}) in {m.chat.id}")
+    LOGGER.info(f"{m.from_user.id} removed blacklists ({bl_words}) in {m.chat.id}")
     bl_words = ", ".join(f"<code>{i}</code>" for i in bl_words)
     await m.reply_text(
         text=f"Removed <b>{bl_words}</b> from blacklist words!"
@@ -153,8 +150,7 @@ async def set_bl_action(_, m: Message):
         await m.reply_text(text=f"Set action for blacklist for this to <b>{action}</b>")
     elif len(m.text.split()) == 1:
         action = db.get_action()
-        LOGGER.info(
-            f"{m.from_user.id} checking blacklist action in {m.chat.id}")
+        LOGGER.info(f"{m.from_user.id} checking blacklist action in {m.chat.id}")
         await m.reply_text(
             text=f"""The current action for blacklists in this chat is <i><b>{action}</b></i>
       All blacklist modes delete the message containing blacklist word."""

Powers/plugins/chat_blacklist.py

@@ -44,8 +44,7 @@ async def unblacklist_chat(c: Gojo, m: Message):
     if len(m.text.split()) >= 2:
         chat_ids = m.text.split()[1:]
         replymsg = await m.reply_text(f"Removing {len(chat_ids)} chats from blacklist")
-        LOGGER.info(
-            f"{m.from_user.id} removed blacklisted {chat_ids} groups for bot")
+        LOGGER.info(f"{m.from_user.id} removed blacklisted {chat_ids} groups for bot")
         bl_chats = db.list_all_chats()
         for chat in chat_ids:
             try:

Powers/plugins/dev.py

@@ -131,8 +131,7 @@ async def evaluate_code(c: Gojo, m: Message):
 
 
 async def aexec(code, c, m):
-    exec("async def __aexec(c, m): " +
-         "".join(f"\n {l}" for l in code.split("\n")))
+    exec("async def __aexec(c, m): " + "".join(f"\n {l}" for l in code.split("\n")))
     return await locals()["__aexec"](c, m)
 
 

Powers/plugins/disable.py

@@ -118,8 +118,7 @@ async def rm_alldisbl(_, m: Message):
                         "Confirm",
                         callback_data="enableallcmds",
                     ),
-                    InlineKeyboardButton(
-                        "Cancel", callback_data="close_admin"),
+                    InlineKeyboardButton("Cancel", callback_data="close_admin"),
                 ],
             ],
         ),

Powers/plugins/filters.py

@@ -97,8 +97,7 @@ async def add_filter(_, m: Message):
         )
 
     add = db.save_filter(m.chat.id, keyword, teks, msgtype, file_id)
-    LOGGER.info(
-        f"{m.from_user.id} added new filter ({keyword}) in {m.chat.id}")
+    LOGGER.info(f"{m.from_user.id} added new filter ({keyword}) in {m.chat.id}")
     if add:
         await m.reply_text(
             f"Saved filter for '<code>{', '.join(keyword.split('|'))}</code>' in <b>{m.chat.title}</b>!",
@@ -122,8 +121,7 @@ async def stop_filter(_, m: Message):
     for keyword in act_filters:
         if keyword == m.text.split(None, 1)[1].lower():
             db.rm_filter(m.chat.id, m.text.split(None, 1)[1].lower())
-            LOGGER.info(
-                f"{m.from_user.id} removed filter ({keyword}) in {m.chat.id}")
+            LOGGER.info(f"{m.from_user.id} removed filter ({keyword}) in {m.chat.id}")
             await m.reply_text(
                 f"Okay, I'll stop replying to that filter and it's aliases in <b>{m.chat.title}</b>.",
             )
@@ -284,8 +282,7 @@ async def filters_watcher(c: Gojo, m: Message):
         if match:
             try:
                 msgtype = await send_filter_reply(c, m, trigger)
-                LOGGER.info(
-                    f"Replied with {msgtype} to {trigger} in {m.chat.id}")
+                LOGGER.info(f"Replied with {msgtype} to {trigger} in {m.chat.id}")
             except Exception as ef:
                 await m.reply_text(f"Error: {ef}")
                 LOGGER.error(ef)

Powers/plugins/fun.py

@@ -74,8 +74,7 @@ async def fun_slap(c: Gojo, m: Message):
     hit = choice(extras.HIT)
     throw = choice(extras.THROW)
 
-    reply = temp.format(user1=user1, user2=user2,
-                        item=item, hits=hit, throws=throw)
+    reply = temp.format(user1=user1, user2=user2, item=item, hits=hit, throws=throw)
     await reply_text(reply)
     LOGGER.info(f"{m.from_user.id} slaped in {m.chat.id}")
     return
@@ -114,8 +113,7 @@ async def insult(c: Gojo, m: Message):
             m.reply_to_message.reply_text if m.reply_to_message else m.reply_text
         )
         await reply_text(Insult_omp)
-        LOGGER.info(
-            f"{m.from_user.id} insulted {user_first_name} in {m.chat.id}")
+        LOGGER.info(f"{m.from_user.id} insulted {user_first_name} in {m.chat.id}")
 
 
 @Gojo.on_message(command("yes"))

Powers/plugins/locks.py

@@ -57,8 +57,7 @@ async def lock_perm(c: Gojo, m: Message):
     if lock_type == "all":
         try:
             await c.set_chat_permissions(chat_id, ChatPermissions())
-            LOGGER.info(
-                f"{m.from_user.id} locked all permissions in {m.chat.id}")
+            LOGGER.info(f"{m.from_user.id} locked all permissions in {m.chat.id}")
         except ChatNotModified:
             pass
         except ChatAdminRequired:
@@ -125,8 +124,7 @@ async def lock_perm(c: Gojo, m: Message):
             ChatPermissions(
                 can_send_messages=msg,
                 can_send_media_messages=media,
-                can_send_other_messages=any(
-                    [stickers, animations, games, inlinebots]),
+                can_send_other_messages=any([stickers, animations, games, inlinebots]),
                 can_add_web_page_previews=webprev,
                 can_send_polls=polls,
                 can_change_info=info,
@@ -134,8 +132,7 @@ async def lock_perm(c: Gojo, m: Message):
                 can_pin_messages=pin,
             ),
         )
-        LOGGER.info(
-            f"{m.from_user.id} locked selected permissions in {m.chat.id}")
+        LOGGER.info(f"{m.from_user.id} locked selected permissions in {m.chat.id}")
     except ChatNotModified:
         pass
     except ChatAdminRequired:
@@ -217,8 +214,7 @@ async def unlock_perm(c: Gojo, m: Message):
                     can_pin_messages=True,
                 ),
             )
-            LOGGER.info(
-                f"{m.from_user.id} unlocked all permissions in {m.chat.id}")
+            LOGGER.info(f"{m.from_user.id} unlocked all permissions in {m.chat.id}")
         except ChatNotModified:
             pass
         except ChatAdminRequired:
@@ -291,8 +287,7 @@ async def unlock_perm(c: Gojo, m: Message):
         return
 
     try:
-        LOGGER.info(
-            f"{m.from_user.id} unlocked selected permissions in {m.chat.id}")
+        LOGGER.info(f"{m.from_user.id} unlocked selected permissions in {m.chat.id}")
         await c.set_chat_permissions(
             chat_id,
             ChatPermissions(

Powers/plugins/notes.py

@@ -75,8 +75,7 @@ async def get_note_func(c: Gojo, m: Message, note_name, priv_notes_status):
 
     if priv_notes_status:
 
-        note_hash = next(i[1] for i in db.get_all_notes(
-            m.chat.id) if i[0] == note_name)
+        note_hash = next(i[1] for i in db.get_all_notes(m.chat.id) if i[0] == note_name)
         await reply_text(
             f"Click on the button to get the note <code>{note_name}</code>",
             reply_markup=ikb(
@@ -302,13 +301,11 @@ async def priv_notes(_, m: Message):
         option = (m.text.split())[1]
         if option in ("on", "yes"):
             db_settings.set_privatenotes(chat_id, True)
-            LOGGER.info(
-                f"{m.from_user.id} enabled privatenotes in {m.chat.id}")
+            LOGGER.info(f"{m.from_user.id} enabled privatenotes in {m.chat.id}")
             msg = "Set private notes to On"
         elif option in ("off", "no"):
             db_settings.set_privatenotes(chat_id, False)
-            LOGGER.info(
-                f"{m.from_user.id} disabled privatenotes in {m.chat.id}")
+            LOGGER.info(f"{m.from_user.id} disabled privatenotes in {m.chat.id}")
             msg = "Set private notes to Off"
         else:
             msg = "Enter correct option"
@@ -316,8 +313,7 @@ async def priv_notes(_, m: Message):
     elif len(m.text.split()) == 1:
         curr_pref = db_settings.get_privatenotes(m.chat.id)
         msg = msg = f"Private Notes: {curr_pref}"
-        LOGGER.info(
-            f"{m.from_user.id} fetched privatenotes preference in {m.chat.id}")
+        LOGGER.info(f"{m.from_user.id} fetched privatenotes preference in {m.chat.id}")
         await m.reply_text(msg)
     else:
         await m.replt_text("Check help on how to use this command!")

Powers/plugins/pin.py

@@ -94,8 +94,7 @@ async def unpin_message(c: Gojo, m: Message):
 async def unpinall_message(_, m: Message):
     await m.reply_text(
         "Do you really want to unpin all messages in this chat?",
-        reply_markup=ikb(
-            [[("Yes", "unpin all in this chat"), ("No", "close_admin")]]),
+        reply_markup=ikb([[("Yes", "unpin all in this chat"), ("No", "close_admin")]]),
     )
     return
 
@@ -118,8 +117,7 @@ async def unpinall_calllback(c: Gojo, q: CallbackQuery):
         return
     try:
         await c.unpin_all_chat_messages(q.message.chat.id)
-        LOGGER.info(
-            f"{q.from_user.id} unpinned all messages in {q.message.chat.id}")
+        LOGGER.info(f"{q.from_user.id} unpinned all messages in {q.message.chat.id}")
         await q.message.edit_text(text="Unpinned all messages in this chat.")
     except ChatAdminRequired:
         await q.message.edit_text(text="I'm not admin or I don't have rights.")
@@ -147,13 +145,11 @@ async def anti_channel_pin(_, m: Message):
     if len(m.text.split()) == 2:
         if m.command[1] in ("yes", "on", "true"):
             pinsdb.antichannelpin_on()
-            LOGGER.info(
-                f"{m.from_user.id} enabled antichannelpin in {m.chat.id}")
+            LOGGER.info(f"{m.from_user.id} enabled antichannelpin in {m.chat.id}")
             msg = "Turned on AntiChannelPin, now all message pinned by channel will be unpinned automtically!"
         elif m.command[1] in ("no", "off", "false"):
             pinsdb.antichannelpin_off()
-            LOGGER.info(
-                f"{m.from_user.id} disabled antichannelpin in {m.chat.id}")
+            LOGGER.info(f"{m.from_user.id} disabled antichannelpin in {m.chat.id}")
             msg = "Turned off AntiChannelPin, now all message pinned by channel will stay pinned!"
         else:
             await m.reply_text(
@@ -205,8 +201,7 @@ async def clean_linked(_, m: Message):
             msg = "Turned on CleanLinked! Now all the messages from linked channel will be deleted!"
         elif m.command[1] in ("no", "off", "false"):
             pinsdb.cleanlinked_off()
-            LOGGER.info(
-                f"{m.from_user.id} disabled CleanLinked in {m.chat.id}")
+            LOGGER.info(f"{m.from_user.id} disabled CleanLinked in {m.chat.id}")
             msg = "Turned off CleanLinked! Messages from linked channel will not be deleted!"
         else:
             await m.reply_text(

Powers/plugins/rules.py

@@ -95,13 +95,11 @@ async def priv_rules(_, m: Message):
         option = (m.text.split())[1]
         if option in ("on", "yes"):
             db.set_privrules(True)
-            LOGGER.info(
-                f"{m.from_user.id} enabled privaterules in {m.chat.id}")
+            LOGGER.info(f"{m.from_user.id} enabled privaterules in {m.chat.id}")
             msg = f"Private Rules have been turned <b>on</b> for chat <b>{m.chat.title}</b>"
         elif option in ("off", "no"):
             db.set_privrules(False)
-            LOGGER.info(
-                f"{m.from_user.id} disbaled privaterules in {m.chat.id}")
+            LOGGER.info(f"{m.from_user.id} disbaled privaterules in {m.chat.id}")
             msg = f"Private Rules have been turned <b>off</b> for chat <b>{m.chat.title}</b>"
         else:
             msg = "Option not valid, choose from <code>on</code>, <code>yes</code>, <code>off</code>, <code>no</code>"
@@ -111,8 +109,7 @@ async def priv_rules(_, m: Message):
         msg = (
             f"Current Preference for Private rules in this chat is: <b>{curr_pref}</b>"
         )
-        LOGGER.info(
-            f"{m.from_user.id} fetched privaterules preference in {m.chat.id}")
+        LOGGER.info(f"{m.from_user.id} fetched privaterules preference in {m.chat.id}")
         await m.reply_text(msg)
     else:
         await m.reply_text(text="Please check help on how to use this this command.")

Powers/plugins/start.py

@@ -71,8 +71,7 @@ async def start(c: Gojo, m: Message):
                 await get_private_note(c, m, help_option)
                 return
             if help_option.startswith("rules"):
-                LOGGER.info(
-                    f"{m.from_user.id} fetched privaterules in {m.chat.id}")
+                LOGGER.info(f"{m.from_user.id} fetched privaterules in {m.chat.id}")
                 await get_private_rules(c, m, help_option)
                 return
 
@@ -184,8 +183,7 @@ async def help_menu(_, m: Message):
         help_msg, help_kb = await get_help_msg(m, help_option)
 
         if not help_msg:
-            LOGGER.error(
-                f"No help_msg found for help_option - {help_option}!!")
+            LOGGER.error(f"No help_msg found for help_option - {help_option}!!")
             return
 
         LOGGER.info(

Powers/plugins/warns.py

@@ -206,8 +206,7 @@ async def list_warns(c: Gojo, m: Message):
         await m.reply_text("This user has no warns!")
         return
     msg = f"{(await mention_html(user_first_name,user_id))} has <b>{num_warns}/{warn_settings['warn_limit']}</b> warns!\n\n<b>Reasons:</b>\n"
-    msg += "\n".join(
-        [("- No reason" if i is None else f" - {i}") for i in warns])
+    msg += "\n".join([("- No reason" if i is None else f" - {i}") for i in warns])
     await m.reply_text(msg)
     return
 

Powers/plugins/watchers.py

@@ -31,19 +31,16 @@ async def antichanpin_cleanlinked(c: Gojo, m: Message):
         curr = pins_db.get_settings()
         if curr["antichannelpin"]:
             await c.unpin_chat_message(chat_id=m.chat.id, message_id=msg_id)
-            LOGGER.info(
-                f"AntiChannelPin: msgid-{m.message_id} unpinned in {m.chat.id}")
+            LOGGER.info(f"AntiChannelPin: msgid-{m.message_id} unpinned in {m.chat.id}")
         if curr["cleanlinked"]:
             await c.delete_messages(m.chat.id, msg_id)
-            LOGGER.info(
-                f"CleanLinked: msgid-{m.message_id} cleaned in {m.chat.id}")
+            LOGGER.info(f"CleanLinked: msgid-{m.message_id} cleaned in {m.chat.id}")
     except ChatAdminRequired:
         await m.reply_text(
             "Disabled antichannelpin as I don't have enough admin rights!",
         )
         pins_db.antichannelpin_off()
-        LOGGER.warning(
-            f"Disabled antichannelpin in {m.chat.id} as i'm not an admin.")
+        LOGGER.warning(f"Disabled antichannelpin in {m.chat.id} as i'm not an admin.")
     except Exception as ef:
         LOGGER.error(ef)
         LOGGER.error(format_exc())
@@ -194,8 +191,7 @@ async def gban_watcher(c: Gojo, m: Message):
 
       To get unbanned, appeal at @{SUPPORT_GROUP}"""
             )
-            LOGGER.info(
-                f"Banned user {m.from_user.id} in {m.chat.id} due to antispam")
+            LOGGER.info(f"Banned user {m.from_user.id} in {m.chat.id} due to antispam")
             return
         except (ChatAdminRequired, UserAdminInvalid):
             # Bot not admin in group and hence cannot ban users!