Clean up

- added README.md
- cleaner code
- passed every file through black

Author: CustomIcon

README.md

@@ -0,0 +1,22 @@
+# Pyrogram Session Maker (TelegramBot)
+
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/01a4ef83e3a64a92b24d855aaed05c3a)](https://www.codacy.com/gh/pokurt/Pyrogram-SessionMaker-Bot/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=pokurt/Pyrogram-SessionMaker-Bot&amp;utm_campaign=Badge_Grade) [![>~<](https://img.shields.io/badge/%3E~%3C-nyaaa~-purple)](https://naipofo.com) [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/pokurt/Pyrogram-SessionMaker-Bot) ![Repo Size](https://img.shields.io/github/repo-size/pokurt/Pyrogram-SessionMaker-Bot)
+
+## Disclaimer
+- I will not be responsible if your Voip account gets deleted/banned in the process.
+- However in previous occasion this never happened to anyone.
+- I suggest you to check the Source of this Project before continuing to use it.
+- There will be forks of [@PyrogramSessionBot](https://t.me/PyrogramSessionBot) therefore be careful while giving your Confidential Details to random forks of this Source.
+
+### Evil Actions
+This project is free to use for Creating Sessions. If you Intend to use this project for Spam/Scam and other evil purposes,
+You are not welcome to be here or use the Project.
+
+### Requirments
+- See `requirments.txt` in root directory of the Project
+- We do not need much of requirements other than `Pyrogram` and `TgCrypto`
+
+### Setup
+- Install requirements in `requirements.txt`
+- Example of `psm.ini` is in `sample.psm.ini`
+- Run the bot: `python3 -m psm`

psm/plugins/clear_cache.py

@@ -13,57 +13,57 @@ async def code_save(client, message):
         else:
             return
     except KeyError:
-        await message.reply('Try using `/start` and read the instructions')
+        await message.reply("Try using `/start` and read the instructions")
 
 
-@psm.on_message(filters.command('appid'))
+@psm.on_message(filters.command("appid"))
 async def checkid(client, message):
     try:
         appid = message.text.split(None, 1)[1]
     except IndexError:
-        await message.reply('Must pass args, example: `/appid 12345`')
+        await message.reply("Must pass args, example: `/appid 12345`")
         return
     app_ids[message.from_user.id] = appid
-    await message.reply('Your `APP_ID` variable is set')
+    await message.reply("Your `APP_ID` variable is set")
 
 
-@psm.on_message(filters.command('apphash'))
+@psm.on_message(filters.command("apphash"))
 async def checkhash(client, message):
     try:
         apphash = message.text.split(None, 1)[1]
     except IndexError:
-        await message.reply('Must pass args, example: `/apphash abCd1234Fghe`')
+        await message.reply("Must pass args, example: `/apphash abCd1234Fghe`")
         return
     app_hashs[message.from_user.id] = apphash
-    await message.reply('Your `APP_HASH` variable is set')
+    await message.reply("Your `APP_HASH` variable is set")
 
 
-@psm.on_message(filters.command('password'))
+@psm.on_message(filters.command("password"))
 async def checkpass(client, message):
     try:
         password = message.text.split(None, 1)[1]
     except IndexError:
-        await message.reply('Must pass args, example: `/password helloworld`')
+        await message.reply("Must pass args, example: `/password helloworld`")
         return
     passwords[message.from_user.id] = password
-    await message.reply('Your `CLOUD_PASS` variable is set')
+    await message.reply("Your `CLOUD_PASS` variable is set")
 
 
-@psm.on_message(filters.command('clear'))
+@psm.on_message(filters.command("clear"))
 async def clear_dict(_, message):
     code_caches.pop(message.from_user.id, None)
-    m = await message.reply('checking and clearing saved verification codes.')
+    m = await message.reply("checking and clearing saved verification codes.")
     await asyncio.sleep(3)
     passwords.pop(message.from_user.id, None)
-    await m.edit('checking and clearing saved cloud passwords.')
+    await m.edit("checking and clearing saved cloud passwords.")
     await asyncio.sleep(3)
     app_ids.pop(message.from_user.id, None)
-    await m.edit('checking and clearing saved api_id.')
+    await m.edit("checking and clearing saved api_id.")
     await asyncio.sleep(3)
     app_hashs.pop(message.from_user.id, None)
-    await m.edit('checking and clearing saved api_hash.')
+    await m.edit("checking and clearing saved api_hash.")
     await asyncio.sleep(3)
-    await m.edit('all cleared')
+    await m.edit("all cleared")
     await asyncio.sleep(3)
     await message.delete()
-    await m.delete()
+    await m.delete()

psm/plugins/dictionaries.py

@@ -1,4 +1,4 @@
 code_caches = {}
 passwords = {}
 app_ids = {}
-app_hashs = {}
+app_hashs = {}

psm/plugins/helpers.py

@@ -4,4 +4,5 @@
 def dynamic_data_filter(data):
     async def func(flt, _, query):
         return flt.data == query.data
-    return filters.create(func, data=data)
+
+    return filters.create(func, data=data)

psm/plugins/session_maker.py

@@ -1,8 +1,9 @@
 from pyrogram import filters
-from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, TermsOfService, ForceReply
 from pyrogram import Client
 from pyrogram.errors import FloodWait
 from pyrogram import errors
+from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, ForceReply
+
 import asyncio
 
 from psm import psm
@@ -16,17 +17,18 @@ async def client_session(message):
         api_hash=str(app_hashs[message.from_user.id]),
     )
 
-@psm.on_message(filters.command('phone'))
+
+@psm.on_message(filters.command("phone"))
 async def phone_number(_, message):
     try:
         app = await client_session(message)
     except KeyError:
-        await message.reply('You did not set Variables correctly, read /start again.')
+        await message.reply("You did not set Variables correctly, read /start again.")
         return
     try:
-        phonenum = message.text.split(None, 1)[1].replace(' ', '')
+        phonenum = message.text.split(None, 1)[1].replace(" ", "")
     except IndexError:
-        await message.reply('Must pass args, example: `/phone +1234578900`')
+        await message.reply("Must pass args, example: `/phone +1234578900`")
         return
     try:
         await app.connect()
@@ -36,51 +38,68 @@ async def phone_number(_, message):
     try:
         sent_code = await app.send_code(phonenum)
     except FloodWait as e:
-        await message.reply(f'I cannot create session for you.\nYou have a floodwait of: `{e.x} seconds`')
+        await message.reply(
+            f"I cannot create session for you.\nYou have a floodwait of: `{e.x} seconds`"
+        )
         return
     except errors.exceptions.bad_request_400.PhoneNumberInvalid:
-        await message.reply('Phone number is invalid, Make sure you double check before sending.')
+        await message.reply(
+            "Phone number is invalid, Make sure you double check before sending."
+        )
         return
-    await message.reply('send me your code in 25 seconds, make sure you reply to this message and wait for a response.', reply_markup=ForceReply(True))
+    await message.reply(
+        "send me your code in 25 seconds, make sure you reply to this message and wait for a response.",
+        reply_markup=ForceReply(True),
+    )
     await asyncio.sleep(25)
     try:
-        await app.sign_in(phonenum, sent_code.phone_code_hash, code_caches[message.from_user.id])
+        await app.sign_in(
+            phonenum, sent_code.phone_code_hash, code_caches[message.from_user.id]
+        )
     except KeyError:
-        await message.reply('Timed out, Try again.')
+        await message.reply("Timed out, Try again.")
         return
     except errors.exceptions.unauthorized_401.SessionPasswordNeeded:
         try:
             await app.check_password(passwords[message.from_user.id])
         except KeyError:
-            await message.reply('Timed out, try again later')
+            await message.reply(
+                "You have not set your password in the `/variables`, try doing that before you continue"
+            )
             return
     except errors.exceptions.bad_request_400.PhoneCodeInvalid:
-        await message.reply('The code you sent seems Invalid, Try again.')
+        await message.reply("The code you sent seems Invalid, Try again.")
         return
     except errors.exceptions.bad_request_400.PhoneCodeExpired:
-        await message.reply('The Code you sent seems Expired. Try again.')
+        await message.reply("The Code you sent seems Expired. Try again.")
         return
-    await app.send_message('me', f'```{(await app.export_session_string())}```')
+    await app.send_message("me", f"```{(await app.export_session_string())}```")
     button = InlineKeyboardMarkup(
-        [[InlineKeyboardButton('Go to Saved Messages', url=f'tg://user?id={message.from_user.id}')]]
+        [
+            [
+                InlineKeyboardButton(
+                    "Go to Saved Messages", url=f"tg://user?id={message.from_user.id}"
+                )
+            ]
+        ]
     )
     await message.reply(
-        'All Done! Check your Saved Messages for your Session String.\n\nMake sure you run /clear to clear caches of your variables',
-        reply_markup=button
+        "All Done! Check your Saved Messages for your Session String.\n\nMake sure you run /clear to clear caches of your variables",
+        reply_markup=button,
     )
 
 
-@psm.on_message(filters.command('token'))
+@psm.on_message(filters.command("token"))
 async def bot_token(_, message):
     try:
         app = await client_session(message)
     except KeyError:
-        await message.reply('You did not set Variables correctly, read /start again.')
+        await message.reply("You did not set Variables correctly, read /start again.")
         return
     try:
-        bottoken = message.text.split(None, 1)[1].replace(' ', '')
+        bottoken = message.text.split(None, 1)[1].replace(" ", "")
     except IndexError:
-        await message.reply('Must pass args, example: `/token 1234:ABCD1234`')
+        await message.reply("Must pass args, example: `/token 1234:ABCD1234`")
         return
     try:
         await app.connect()
@@ -90,9 +109,10 @@ async def bot_token(_, message):
     try:
         await app.sign_in_bot(bottoken)
     except errors.exceptions.bad_request_400.AccessTokenInvalid:
-        await message.reply('BotToken Invalid: make sure you are sending a valid BotToken from @BotFather')
+        await message.reply(
+            "BotToken Invalid: make sure you are sending a valid BotToken from @BotFather"
+        )
         return
     await message.reply(
-        f'**Here is your Bot Session:**\n```{(await app.export_session_string())}```\n\nMake sure you run /clear to clear caches of your variables'
-        )
-
+        f"**Here is your Bot Session:**\n```{(await app.export_session_string())}```\n\nMake sure you run /clear to clear caches of your variables"
+    )

psm/psm.py

@@ -3,9 +3,9 @@
 from pyrogram import Client
 
 
-API_ID = environ.get('API_ID', None)
-API_HASH = environ.get('API_HASH', None)
-TOKEN = environ.get('TOKEN', None)
+API_ID = environ.get("API_ID", None)
+API_HASH = environ.get("API_HASH", None)
+TOKEN = environ.get("TOKEN", None)
 
 
 class psm(Client):
@@ -15,13 +15,15 @@ def __init__(self, name):
         config_file = f"{name}.ini"
         config = ConfigParser()
         config.read(config_file)
-        plugins = dict(root=f"{name}.plugins", )
+        plugins = dict(
+            root=f"{name}.plugins",
+        )
 
         super().__init__(
             name,
             api_id=API_ID,
             api_hash=API_HASH,
-            bot_token=TOKEN or config.get('pyrogram', 'token'),
+            bot_token=TOKEN or config.get("pyrogram", "token"),
             config_file=config_file,
             workers=16,
             plugins=plugins,