[pull] master from Astrako:master

.gitignore

@@ -153,8 +153,11 @@ dmypy.json
 .vscode
 
 # Others
+backups/
 *.mp3
 *.mp4
 *.otf
 *.png
 *.ttf
+shell_output.txt
+error.txt

AstrakoBot/__init__.py

@@ -83,6 +83,8 @@
     WEATHER_API = os.environ.get("WEATHER_API", None)
 
     ALLOW_CHATS = os.environ.get("ALLOW_CHATS", True)
+    BACKUP_PASS = os.environ.get("BACKUP_PASS", True)
+    DROP_UPDATES = os.environ.get("DROP_UPDATES", False)
 
     try:
         BL_CHATS = set(int(x) for x in os.environ.get("BL_CHATS", "").split())
@@ -129,6 +131,7 @@
     API_HASH = Config.API_HASH
 
     DB_URI = Config.SQLALCHEMY_DATABASE_URI
+    DB_NAME = Config.DB_NAME
     DONATION_LINK = Config.DONATION_LINK
     LOAD = Config.LOAD
     NO_LOAD = Config.NO_LOAD
@@ -146,6 +149,8 @@
     SPAMWATCH_API = Config.SPAMWATCH_API
     INFOPIC = Config.INFOPIC
     WEATHER_API = Config.WEATHER_API
+    BACKUP_PASS = Config.BACKUP_PASS
+    DROP_UPDATES = Config.DROP_UPDATES
 
     try:
         BL_CHATS = set(int(x) for x in Config.BL_CHATS or [])

AstrakoBot/__main__.py

@@ -20,6 +20,7 @@
     StartTime,
     telethn,
     updater,
+    DROP_UPDATES,
 )
 
 # needed to dynamically load modules
@@ -660,12 +661,11 @@ def main():
 
     else:
         LOGGER.info("Using long polling.")
-        updater.start_polling(timeout=15, read_latency=4, drop_pending_updates=True)
+        allowed_updates = ['message', 'edited_message', 'callback_query', 'callback_query', 'my_chat_member',
+                           'chat_member', 'chat_join_request', 'channel_post', 'edited_channel_post', 'inline_query']
+        updater.start_polling(timeout=15, read_latency=4, drop_pending_updates=DROP_UPDATES, allowed_updates = allowed_updates)
 
-    if len(argv) not in (1, 3, 4):
-        telethn.disconnect()
-    else:
-        telethn.run_until_disconnected()
+    telethn.run_until_disconnected()
 
     updater.idle()
 

AstrakoBot/modules/admin.py

@@ -399,8 +399,6 @@ def adminlist(update: Update, context: CallbackContext):
     administrators = bot.getChatAdministrators(chat_id)
     text = "Admins in <b>{}</b>:".format(html.escape(update.effective_chat.title))
 
-    bot_admin_list = []
-
     for admin in administrators:
         user = admin.user
         status = admin.status
@@ -415,19 +413,12 @@ def adminlist(update: Update, context: CallbackContext):
                 )
             )
 
-        if user.is_bot:
-            bot_admin_list.append(name)
-            administrators.remove(admin)
-            continue
-
-        # if user.username:
-        #    name = escape_markdown("@" + user.username)
         if status == "creator":
             text += "\n 👑 Creator:"
             text += "\n<code> • </code>{}\n".format(name)
 
-            if custom_title:
-                text += f"<code> ┗━ {html.escape(custom_title)}</code>\n"
+        # if user.username:
+        #    name = escape_markdown("@" + user.username)
 
     text += "\n🔱 Admins:"
 
@@ -475,10 +466,6 @@ def adminlist(update: Update, context: CallbackContext):
             text += "\n<code> • </code>{}".format(admin)
         text += "\n"
 
-    text += "\n🤖 Bots:"
-    for each_bot in bot_admin_list:
-        text += "\n<code> • </code>{}".format(each_bot)
-
     try:
         msg.edit_text(text, parse_mode=ParseMode.HTML)
     except BadRequest:  # if original message is deleted

AstrakoBot/modules/afk.py

@@ -180,7 +180,7 @@ def __gdpr__(user_id):
 
 AFK_HANDLER = DisableAbleCommandHandler("afk", afk, run_async=True)
 AFK_REGEX_HANDLER = DisableAbleMessageHandler(
-    Filters.regex(r"^(?i)brb(.*)$"), afk, friendly="afk"
+    Filters.regex(r"(?i)^brb(.*)$"), afk, friendly="afk"
 )
 NO_AFK_HANDLER = MessageHandler(Filters.all & Filters.chat_type.groups, no_longer_afk, run_async=True)
 AFK_REPLY_HANDLER = MessageHandler(Filters.all & Filters.chat_type.groups, reply_afk, run_async=True)

AstrakoBot/modules/android.py

@@ -17,6 +17,9 @@
 from AstrakoBot.modules.github import getphh
 from AstrakoBot.modules.helper_funcs.misc import delete
 
+rget_headers = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.63 Safari/537.36"
+}
 
 def magisk(update: Update, context: CallbackContext):
     message = update.effective_message
@@ -55,14 +58,15 @@ def checkfw(update: Update, context: CallbackContext):
         temp, csc = args
         model = f'sm-' + temp if not temp.upper().startswith('SM-') else temp
         fota = get(
-            f'http://fota-cloud-dn.ospserver.net/firmware/{csc.upper()}/{model.upper()}/version.xml'
+            f'https://fota-cloud-dn.ospserver.net/firmware/{csc.upper()}/{model.upper()}/version.xml',
+            headers=rget_headers
         )
 
         if fota.status_code != 200:
             msg = f"Couldn't check for {temp.upper()} and {csc.upper()}, please refine your search or try again later!"
 
         else:
-            page = BeautifulSoup(fota.content, 'lxml')
+            page = BeautifulSoup(fota.content, 'xml')
             os = page.find("latest").get("o")
 
             if page.find("latest").text.strip():
@@ -102,7 +106,8 @@ def getfw(update: Update, context: CallbackContext):
         temp, csc = args
         model = f'sm-' + temp if not temp.upper().startswith('SM-') else temp
         fota = get(
-            f'http://fota-cloud-dn.ospserver.net/firmware/{csc.upper()}/{model.upper()}/version.xml'
+            f'https://fota-cloud-dn.ospserver.net/firmware/{csc.upper()}/{model.upper()}/version.xml',
+            headers=rget_headers
         )
 
         if fota.status_code != 200:
@@ -113,10 +118,7 @@ def getfw(update: Update, context: CallbackContext):
             url2 = f'https://www.sammobile.com/samsung/firmware/{model.upper()}/{csc.upper()}/'
             url3 = f'https://sfirmware.com/samsung-{model.lower()}/#tab=firmwares'
             url4 = f'https://samfw.com/firmware/{model.upper()}/{csc.upper()}/'
-            fota = get(
-                f'http://fota-cloud-dn.ospserver.net/firmware/{csc.upper()}/{model.upper()}/version.xml'
-            )
-            page = BeautifulSoup(fota.content, 'lxml')
+            page = BeautifulSoup(fota.content, 'xml')
             os = page.find("latest").get("o")
             msg = ""
             if page.find("latest").text.strip():
@@ -129,10 +131,10 @@ def getfw(update: Update, context: CallbackContext):
                     msg += f'• Android: `{os}`\n'
             msg += '\n'
             msg += f'*Downloads for {model.upper()} and {csc.upper()}*\n'
-            btn = [[InlineKeyboardButton(text=f"samfrew.com", url = url1)]]
-            btn += [[InlineKeyboardButton(text=f"sammobile.com", url = url2)]]
-            btn += [[InlineKeyboardButton(text=f"sfirmware.com", url = url3)]]
-            btn += [[InlineKeyboardButton(text=f"samfw.com", url = url4)]]
+            btn = [[InlineKeyboardButton(text=f"Samfrew", url = url1)]]
+            btn += [[InlineKeyboardButton(text=f"Sammobile", url = url2)]]
+            btn += [[InlineKeyboardButton(text=f"SFirmware", url = url3)]]
+            btn += [[InlineKeyboardButton(text=f"Samfw (Recommended)", url = url4)]]
     else:
         msg = 'Give me something to fetch, like:\n`/getfw SM-N975F DBT`'
 
@@ -240,7 +242,7 @@ def orangefox(update: Update, context: CallbackContext):
             version = page["version"]
             changelog = page["changelog"][0]
             size = str(round(float(page["size"]) / 1024 / 1024, 1)) + "MB"
-            dl_link = page["mirrors"]["NL"]
+            dl_link = page["mirrors"]["US"]
             date = datetime.fromtimestamp(page["date"])
             md5 = page["md5"]
             msg = f"*Latest OrangeFox Recovery for the {full_name}*\n\n"

AstrakoBot/modules/antiflood.py

@@ -39,8 +39,8 @@ def check_flood(update: Update, context: CallbackContext) -> str:
     if not user:  # ignore channels
         return ""
 
-    # ignore admins and whitelists
-    if is_user_admin(chat, user.id) or user.id in WHITELIST_USERS:
+    # ignore admins, whitelists and telegram's native tech
+    if is_user_admin(chat, user.id) or user.id in WHITELIST_USERS or user.id == 777000:
         sql.update_flood(chat.id, None)
         return ""
     # ignore approved users
@@ -54,11 +54,11 @@ def check_flood(update: Update, context: CallbackContext) -> str:
     try:
         getmode, getvalue = sql.get_flood_setting(chat.id)
         if getmode == 1:
-            chat.kick_member(user.id)
+            chat.ban_member(user.id)
             execstrings = "Banned"
             tag = "BANNED"
         elif getmode == 2:
-            chat.kick_member(user.id)
+            chat.ban_member(user.id)
             chat.unban_member(user.id)
             execstrings = "Kicked"
             tag = "KICKED"
@@ -70,7 +70,7 @@ def check_flood(update: Update, context: CallbackContext) -> str:
             tag = "MUTED"
         elif getmode == 4:
             bantime = extract_time(msg, getvalue)
-            chat.kick_member(user.id, until_date=bantime)
+            chat.ban_member(user.id, until_date=bantime)
             execstrings = "Banned for {}".format(getvalue)
             tag = "TBAN"
         elif getmode == 5:

AstrakoBot/modules/approve.py

@@ -101,8 +101,11 @@ def approved(update: Update, context: CallbackContext):
     msg = "The following users are approved.\n"
     approved_users = sql.list_approved(message.chat_id)
     for i in approved_users:
-        member = chat.get_member(int(i.user_id))
-        msg += f"- `{i.user_id}`: {member.user['first_name']}\n"
+        try:
+            member = chat.get_member(int(i.user_id))
+            msg += f"- `{i.user_id}`: {member.user['first_name']}\n"
+        except BadRequest:
+            sql.disapprove(message.chat_id, i.user_id)
     if msg.endswith("approved.\n"):
         message.reply_text(f"No users are approved in {chat_title}.")
         return ""

AstrakoBot/modules/bans.py

@@ -25,6 +25,7 @@
     user_admin,
     user_can_ban,
     can_delete,
+    is_bot_admin,
 )
 from AstrakoBot.modules.helper_funcs.extraction import extract_user_and_text
 from AstrakoBot.modules.helper_funcs.string_handling import extract_time
@@ -100,7 +101,7 @@ def ban(update: Update, context: CallbackContext) -> str:
         log += "\n<b>Reason:</b> {}".format(reason)
 
     try:
-        chat.kick_member(user_id)
+        chat.ban_member(user_id)
 
         if silent:
             if message.reply_to_message:
@@ -199,7 +200,7 @@ def temp_ban(update: Update, context: CallbackContext) -> str:
         log += "\n<b>Reason:</b> {}".format(reason)
 
     try:
-        chat.kick_member(user_id, until_date=bantime)
+        chat.ban_member(user_id, until_date=bantime)
         bot.sendMessage(
             chat.id,
             f"Banned! User {mention_html(member.user.id, html.escape(member.user.first_name))} "
@@ -353,11 +354,8 @@ def unban(update: Update, context: CallbackContext) -> str:
     return log
 
 
-@connection_status
-@bot_admin
-@can_restrict
 @gloggable
-def selfunban(context: CallbackContext, update: Update) -> str:
+def selfunban(update: Update, context: CallbackContext) -> str:
     message = update.effective_message
     user = update.effective_user
     bot, args = context.bot, context.args
@@ -370,7 +368,19 @@ def selfunban(context: CallbackContext, update: Update) -> str:
         message.reply_text("Give a valid chat ID.")
         return
 
-    chat = bot.getChat(chat_id)
+    try:
+        chat = bot.getChat(chat_id)
+    except:
+        message.reply_text("It doesn't look like I'm listed as a member of this chat.")
+        return
+
+    if (chat.type == "private"):
+        message.reply_text("How am i going to unban you from a private chat?")
+        return
+
+    if not is_bot_admin(chat, bot.id):
+        message.reply_text("I'm sorry but i am not an admin there!")
+        return
 
     try:
         member = chat.get_member(user.id)

AstrakoBot/modules/blacklist.py

@@ -387,7 +387,7 @@ def del_blacklist(update: Update, context: CallbackContext):
                     return
                 elif getmode == 5:
                     message.delete()
-                    chat.kick_member(user.id)
+                    chat.ban_member(user.id)
                     bot.sendMessage(
                         chat.id,
                         f"Banned {user.first_name} for using Blacklisted word: {trigger}",
@@ -396,7 +396,7 @@ def del_blacklist(update: Update, context: CallbackContext):
                 elif getmode == 6:
                     message.delete()
                     bantime = extract_time(message, value)
-                    chat.kick_member(user.id, until_date=bantime)
+                    chat.ban_member(user.id, until_date=bantime)
                     bot.sendMessage(
                         chat.id,
                         f"Banned {user.first_name} until '{value}' for using Blacklisted word: {trigger}!",

AstrakoBot/modules/blacklist_stickers.py

@@ -423,7 +423,7 @@ def del_blackliststicker(update: Update, context: CallbackContext):
                     return
                 elif getmode == 5:
                     message.delete()
-                    chat.kick_member(user.id)
+                    chat.ban_member(user.id)
                     bot.sendMessage(
                         chat.id,
                         "{} banned because using '{}' which in blacklist stickers".format(
@@ -435,7 +435,7 @@ def del_blackliststicker(update: Update, context: CallbackContext):
                 elif getmode == 6:
                     message.delete()
                     bantime = extract_time(message, value)
-                    chat.kick_member(user.id, until_date=bantime)
+                    chat.ban_member(user.id, until_date=bantime)
                     bot.sendMessage(
                         chat.id,
                         "{} banned for {} because using '{}' which in blacklist stickers".format(