[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

@@ -17,6 +17,10 @@
 )
 
 LOGGER = logging.getLogger(__name__)
+log_warning_only = ["telethon.client.updates", "apscheduler.scheduler", "apscheduler.executors.default", "telethon.network.mtprotosender", "telethon.client"]
+
+for i in log_warning_only:
+    logging.getLogger(i).setLevel(logging.WARNING)
 
 # if version < 3.6, stop bot.
 if sys.version_info[0] < 3 or sys.version_info[1] < 6:
@@ -83,6 +87,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 +135,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 +153,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,12 +20,13 @@
     StartTime,
     telethn,
     updater,
+    DROP_UPDATES,
 )
 
 # needed to dynamically load modules
 # NOTE: Module order is not guaranteed, specify that in the config file!
 from AstrakoBot.modules import ALL_MODULES
-from AstrakoBot.modules.helper_funcs.chat_status import is_user_admin
+from AstrakoBot.modules.helper_funcs.admin_status import user_is_admin
 from AstrakoBot.modules.helper_funcs.misc import paginate_modules
 from telegram import InlineKeyboardButton, InlineKeyboardMarkup, ParseMode, Update
 from telegram.error import (
@@ -169,13 +170,6 @@ def send_help(chat_id, text, keyboard=None):
     )
 
 
-def test(update: Update, context: CallbackContext):
-    # pprint(eval(str(update)))
-    # update.effective_message.reply_text("Hola tester! _I_ *have* `markdown`", parse_mode=ParseMode.MARKDOWN)
-    update.effective_message.reply_text("This person edited a message")
-    print(update.effective_message)
-
-
 def start(update: Update, context: CallbackContext):
     args = context.args
     uptime = get_readable_time((time.time() - StartTime))
@@ -202,7 +196,7 @@ def start(update: Update, context: CallbackContext):
                 match = re.match("stngs_(.*)", args[0].lower())
                 chat = dispatcher.bot.getChat(match.group(1))
 
-                if is_user_admin(chat, update.effective_user.id):
+                if user_is_admin(chat, update.effective_user.id):
                     send_settings(match.group(1), update.effective_user.id, False)
                 else:
                     send_settings(match.group(1), update.effective_user.id, True)
@@ -256,43 +250,23 @@ def start(update: Update, context: CallbackContext):
                 ),
             )
     else:
-        update.effective_message.reply_text(
-            "I'm awake already!\n<b>Haven't slept since:</b> <code>{}</code>".format(
-                uptime
-            ),
-            parse_mode=ParseMode.HTML,
-        )
-
+        try:
+            update.effective_message.reply_text(
+                "I'm awake already!\n<b>Haven't slept since:</b> <code>{}</code>".format(
+                    uptime
+                ),
+                 parse_mode=ParseMode.HTML,
+            )
+        except BadRequest:
+            pass # chat_checker will take care of it, just don't error
 
 # for test purposes
 def error_callback(update: Update, context: CallbackContext):
     error = context.error
     try:
         raise error
-    except Unauthorized:
-        print("no nono1")
-        print(error)
-        # remove update.message.chat_id from conversation list
-    except BadRequest:
-        print("no nono2")
-        print("BadRequest caught")
-        print(error)
-
-        # handle malformed requests - read more below!
-    except TimedOut:
-        print("no nono3")
-        # handle slow connection problems
-    except NetworkError:
-        print("no nono4")
-        # handle other connection problems
-    except ChatMigrated as err:
-        print("no nono5")
-        print(err)
-        # the chat_id of a group has changed, use e.new_chat_id instead
-    except TelegramError:
+    except:
         print(error)
-        # handle all other telegram related errors
-
 
 def help_button(update: Update, context: CallbackContext):
     query = update.callback_query
@@ -301,8 +275,6 @@ def help_button(update: Update, context: CallbackContext):
     next_match = re.match(r"help_next\((.+?)\)", query.data)
     back_match = re.match(r"help_back", query.data)
 
-    print(query.message.chat.id)
-
     try:
         if mod_match:
             module = mod_match.group(1)
@@ -548,7 +520,7 @@ def get_settings(update: Update, context: CallbackContext):
 
     # ONLY send settings in PM
     if chat.type != chat.PRIVATE:
-        if is_user_admin(chat, user.id):
+        if user_is_admin(chat, user.id):
             text = "Click here to get this chat's settings, as well as yours."
             msg.reply_text(
                 text,
@@ -626,7 +598,6 @@ def migrate_chats(update: Update, context: CallbackContext):
 
 
 def main():
-    test_handler = CommandHandler("test", test, run_async=True)
     start_handler = CommandHandler("start", start, run_async=True)
 
     help_handler = CommandHandler("help", get_help, run_async=True)
@@ -638,7 +609,6 @@ def main():
     donate_handler = CommandHandler("donate", donate, run_async=True)
     migrate_handler = MessageHandler(Filters.status_update.migrate, migrate_chats)
 
-    # dispatcher.add_handler(test_handler)
     dispatcher.add_handler(start_handler)
     dispatcher.add_handler(help_handler)
     dispatcher.add_handler(settings_handler)
@@ -660,12 +630,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

@@ -15,7 +15,7 @@
     user_admin,
     ADMIN_CACHE,
 )
-
+from AstrakoBot.modules.helper_funcs.admin_status import get_bot_member
 from AstrakoBot.modules.helper_funcs.extraction import (
     extract_user,
     extract_user_and_text,
@@ -68,7 +68,7 @@ def promote(update: Update, context: CallbackContext) -> str:
         return
 
     # set same perms as bot - bot can't assign higher perms than itself!
-    bot_member = chat.get_member(bot.id)
+    bot_member = get_bot_member(chat.id)
 
     try:
         bot.promoteChatMember(
@@ -358,7 +358,7 @@ def invite(update: Update, context: CallbackContext):
     if chat.username:
         update.effective_message.reply_text(f"https://t.me/{chat.username}")
     elif chat.type in [chat.SUPERGROUP, chat.CHANNEL]:
-        bot_member = chat.get_member(bot.id)
+        bot_member = get_bot_member(chat.id)
         if bot_member.can_invite_users:
             invitelink = bot.exportChatInviteLink(chat.id)
             update.effective_message.reply_text(invitelink)
@@ -399,14 +399,12 @@ 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
         custom_title = admin.custom_title
 
-        if user.first_name == "":
+        if not user.first_name:
             name = "☠ Deleted Account"
         else:
             name = "{}".format(
@@ -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:"
 
@@ -439,7 +430,7 @@ def adminlist(update: Update, context: CallbackContext):
         status = admin.status
         custom_title = admin.custom_title
 
-        if user.first_name == "":
+        if not user.first_name:
             name = "☠ Deleted Account"
         else:
             name = "{}".format(
@@ -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)