From abbab6e9a64d873e051c5463d13e9865c8d1123f Mon Sep 17 00:00:00 2001 From: abhishek335 <62733015+abhishek335@users.noreply.github.com> Date: Sun, 14 Jun 2020 10:33:13 +0530 Subject: [PATCH 1/5] Update admin.py --- tg_bot/modules/admin.py | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/tg_bot/modules/admin.py b/tg_bot/modules/admin.py index e4085dd9..afb1e0fa 100644 --- a/tg_bot/modules/admin.py +++ b/tg_bot/modules/admin.py @@ -323,29 +323,15 @@ def rmchatpic(bot: Bot, update: Update): @run_async def adminlist(bot: Bot, update: Update): administrators = update.effective_chat.get_administrators() - msg = update.effective_message text = "Admins in *{}*:".format(update.effective_chat.title or "this chat") for admin in administrators: user = admin.user - status = admin.status - name = "[{}](tg://user?id={})".format(user.first_name + " " + (user.last_name or ""), user.id) - if user.username: - name = name = escape_markdown("@" + user.username) - if status == "creator": - text += "\n 🔱 Creator:" - text += "\n` • `{} \n\n • *Administrators*:".format(name) - for admin in administrators: - user = admin.user - status = admin.status - chat = update.effective_chat - count = chat.get_members_count() - name = "[{}](tg://user?id={})".format(user.first_name + " " + (user.last_name or ""), user.id) + name = "[{}](tg://user?id={})".format(user.first_name + (user.last_name or ""), user.id) if user.username: name = escape_markdown("@" + user.username) - - if status == "administrator": - text += "\n`👮🏻 `{}".format(name) - members = "\n\n*Members:*\n`🙍‍♂️ ` {} users".format(count) + text += "\n - {}".format(name) + + update.effective_message.reply_text(text, parse_mode=ParseMode.MARKDOWN) msg.reply_text(text + members, parse_mode=ParseMode.MARKDOWN) From c6851271588f9205517453bba1e26e40e94a0940 Mon Sep 17 00:00:00 2001 From: abhishek335 <62733015+abhishek335@users.noreply.github.com> Date: Sun, 14 Jun 2020 10:55:58 +0530 Subject: [PATCH 2/5] Update admin.py --- tg_bot/modules/admin.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tg_bot/modules/admin.py b/tg_bot/modules/admin.py index afb1e0fa..7dd738c3 100644 --- a/tg_bot/modules/admin.py +++ b/tg_bot/modules/admin.py @@ -332,8 +332,6 @@ def adminlist(bot: Bot, update: Update): text += "\n - {}".format(name) update.effective_message.reply_text(text, parse_mode=ParseMode.MARKDOWN) - - msg.reply_text(text + members, parse_mode=ParseMode.MARKDOWN) From 9c46c03c182fe961786e6255a15d84689d976dcc Mon Sep 17 00:00:00 2001 From: abhishek335 <62733015+abhishek335@users.noreply.github.com> Date: Sun, 14 Jun 2020 17:46:27 +0530 Subject: [PATCH 3/5] Create start.py --- tg_bot/modules/start.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 tg_bot/modules/start.py diff --git a/tg_bot/modules/start.py b/tg_bot/modules/start.py new file mode 100644 index 00000000..1fd7a520 --- /dev/null +++ b/tg_bot/modules/start.py @@ -0,0 +1,32 @@ +from pyrogram import Filters, InlineKeyboardMarkup, InlineKeyboardButton + +from ..config import Config +from ..screenshotbot import ScreenShotBot + + +@ScreenShotBot.on_message(Filters.private & Filters.command("start")) +async def start(c, m): + + if not await c.db.is_user_exist(m.chat.id): + await c.db.add_user(m.chat.id) + await c.send_message( + Config.LOG_CHANNEL, + f"New User [{m.from_user.first_name}](tg://user?id={m.chat.id}) started." + ) + + await m.reply_text( + text=f"Hi there {m.from_user.first_name}.\n\nI'm Screenshot Generator Bot. I can provide screenshots from your video files with out downloading the entire file (almost instantly). For more details check /help.", + quote=True, + reply_markup=InlineKeyboardMarkup( + [ + [ + InlineKeyboardButton('📌 Support Group', url='https://t.me/InFoTelGroup'), + InlineKeyboardButton('🔖 Projects Channel', url='https://t.me/TGBotsZ') + ], + [ + InlineKeyboardButton('💡 Source Code', url='https://github.com/TGExplore/Screenshot-Bot'), + InlineKeyboardButton('👨 Master', url='https://t.me/odbots') + ] + ] + ) + ) From f50dd7be638686a55ce0c4a467afc88418f88338 Mon Sep 17 00:00:00 2001 From: abhishek335 <62733015+abhishek335@users.noreply.github.com> Date: Sun, 14 Jun 2020 17:53:47 +0530 Subject: [PATCH 4/5] Delete start.py --- tg_bot/modules/start.py | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 tg_bot/modules/start.py diff --git a/tg_bot/modules/start.py b/tg_bot/modules/start.py deleted file mode 100644 index 1fd7a520..00000000 --- a/tg_bot/modules/start.py +++ /dev/null @@ -1,32 +0,0 @@ -from pyrogram import Filters, InlineKeyboardMarkup, InlineKeyboardButton - -from ..config import Config -from ..screenshotbot import ScreenShotBot - - -@ScreenShotBot.on_message(Filters.private & Filters.command("start")) -async def start(c, m): - - if not await c.db.is_user_exist(m.chat.id): - await c.db.add_user(m.chat.id) - await c.send_message( - Config.LOG_CHANNEL, - f"New User [{m.from_user.first_name}](tg://user?id={m.chat.id}) started." - ) - - await m.reply_text( - text=f"Hi there {m.from_user.first_name}.\n\nI'm Screenshot Generator Bot. I can provide screenshots from your video files with out downloading the entire file (almost instantly). For more details check /help.", - quote=True, - reply_markup=InlineKeyboardMarkup( - [ - [ - InlineKeyboardButton('📌 Support Group', url='https://t.me/InFoTelGroup'), - InlineKeyboardButton('🔖 Projects Channel', url='https://t.me/TGBotsZ') - ], - [ - InlineKeyboardButton('💡 Source Code', url='https://github.com/TGExplore/Screenshot-Bot'), - InlineKeyboardButton('👨 Master', url='https://t.me/odbots') - ] - ] - ) - ) From e602359744fe69c3e635d2e9cfae75d275976b99 Mon Sep 17 00:00:00 2001 From: abhishek335 <62733015+abhishek335@users.noreply.github.com> Date: Sun, 14 Jun 2020 17:57:58 +0530 Subject: [PATCH 5/5] Create start.py --- tg_bot/plugins/start.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 tg_bot/plugins/start.py diff --git a/tg_bot/plugins/start.py b/tg_bot/plugins/start.py new file mode 100644 index 00000000..1fd7a520 --- /dev/null +++ b/tg_bot/plugins/start.py @@ -0,0 +1,32 @@ +from pyrogram import Filters, InlineKeyboardMarkup, InlineKeyboardButton + +from ..config import Config +from ..screenshotbot import ScreenShotBot + + +@ScreenShotBot.on_message(Filters.private & Filters.command("start")) +async def start(c, m): + + if not await c.db.is_user_exist(m.chat.id): + await c.db.add_user(m.chat.id) + await c.send_message( + Config.LOG_CHANNEL, + f"New User [{m.from_user.first_name}](tg://user?id={m.chat.id}) started." + ) + + await m.reply_text( + text=f"Hi there {m.from_user.first_name}.\n\nI'm Screenshot Generator Bot. I can provide screenshots from your video files with out downloading the entire file (almost instantly). For more details check /help.", + quote=True, + reply_markup=InlineKeyboardMarkup( + [ + [ + InlineKeyboardButton('📌 Support Group', url='https://t.me/InFoTelGroup'), + InlineKeyboardButton('🔖 Projects Channel', url='https://t.me/TGBotsZ') + ], + [ + InlineKeyboardButton('💡 Source Code', url='https://github.com/TGExplore/Screenshot-Bot'), + InlineKeyboardButton('👨 Master', url='https://t.me/odbots') + ] + ] + ) + )