pkscreener 0.46.20250210.702__cp312-cp312-win_amd64.whl → 0.46.20250212.704__cp312-cp312-win_amd64.whl

{pkscreener-0.46.20250210.702.data → pkscreener-0.46.20250212.704.data}/purelib/pkscreener/pkscreenerbot.py

@@ -102,6 +102,12 @@ from telegram.ext import (
     Filters,
     CallbackContext
 )
+from PKDevTools.classes.Singleton import SingletonType, SingletonMixin
+
+class PKLocalCache(SingletonMixin, metaclass=SingletonType):
+    def __init__(self):
+        super(PKLocalCache, self).__init__()
+        self.registeredIDs = []
 
 # Enable logging
 logging.basicConfig(
@@ -137,6 +143,8 @@ _updater = None
 
 TOP_LEVEL_SCANNER_MENUS = ["X", "B", "MI","DV", "P"] # 
 TOP_LEVEL_SCANNER_SKIP_MENUS = ["M", "S", "F", "G", "C", "T", "D", "I", "E", "U", "L", "Z", "P"] # Last item will be skipped.
+TOP_LEVEL_MARKUP_SKIP_MENUS = TOP_LEVEL_SCANNER_SKIP_MENUS[:len(TOP_LEVEL_SCANNER_SKIP_MENUS)-1]
+TOP_LEVEL_MARKUP_SKIP_MENUS.extend(["X","P","B"])
 INDEX_SKIP_MENUS_1_To_4 = ["W","E","M","Z","0","5","6","7","8","9","10","11","12","13","14","S","15"]
 INDEX_SKIP_MENUS_5_TO_9 = ["W","E","M","Z","N","0","1","2","3","4","10","11","12","13","14","S","15"]
 INDEX_SKIP_MENUS_10_TO_15 = ["W","E","M","Z","N","0","1","2","3","4","5","6","7","8","9","S"]
@@ -158,6 +166,21 @@ PIPED_SCAN_SKIP_INDEX_MENUS =["W","N","E","S","0","Z","M","15"]
 UNSUPPORTED_COMMAND_MENUS =["22","M","Z","0",str(MAX_MENU_OPTION)]
 SUPPORTED_COMMAND_MENUS = ["1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31","32","33","34","35","36","37","38","39","40","41","42","43","44","45"]
 
+def registerUser(user,forceFetch=False):
+    otpValue, subsModel,subsValidity,alertUser = 0,0,None,None
+    if user is not None and (user.id not in PKLocalCache().registeredIDs or forceFetch):
+        dbManager = DBManager()
+        otpValue, subsModel,subsValidity,alertUser = dbManager.getOTP(user.id,user.username,f"{user.first_name} {user.last_name}",validityIntervalInSeconds=configManager.otpInterval)
+        if str(otpValue).strip() != '0' and user.id not in PKLocalCache().registeredIDs:
+            PKLocalCache().registeredIDs.append(alertUser.userid)
+    return otpValue, subsModel,subsValidity,alertUser
+
+def loadRegisteredUsers():
+    dbManager = DBManager()
+    users = dbManager.getUsers(fieldName="userid")
+    userIDs = [user.userid for user in users]
+    PKLocalCache().registeredIDs.extend(userIDs)
+
 def initializeIntradayTimer():
     try:
         if (not PKDateUtilities.isTodayHoliday()[0]):
@@ -249,65 +272,17 @@ def matchUTR(update: Update, context: CallbackContext) -> str:
                 updatedResults = "We could not find any transaction details with the provided UTR.\nUPI transaction reference number is a 12-digit alphanumeric/numeric code that serves as a unique identifier for transactions. It is also known as the Unique Transaction Reference (UTR) number.\nYou can find your UPI reference number in the UPI-enabled app you used to make the transaction.\nFor example, you can find your UPI reference number in the History section of Google Pay. \nIn the Paytm app, you can find it by clicking View Details.\n\nIf you still cannot find it, please drop a message with transaction details/snapshot to @ItsOnlyPK to enable subscription."
         else:
             updatedResults = "Did you forget to include the UTR number with /Check ?\nYou should use it like this:\n\n/Check UTR_Here\n\nUPI transaction reference number is a 12-digit alphanumeric/numeric code that serves as a unique identifier for transactions. It is also known as the Unique Transaction Reference (UTR) number.\nYou can find your UPI reference number in the UPI-enabled app you used to make the transaction.\nFor example, you can find your UPI reference number in the History section of Google Pay. \nIn the Paytm app, you can find it by clicking View Details.\n\nIf you still cannot find it, please drop a message with transaction details/snapshot to @ItsOnlyPK to enable subscription."
-    update.message.reply_text(sanitiseTexts(updatedResults), parse_mode="HTML")
+    update.message.reply_text(sanitiseTexts(updatedResults), reply_markup=default_markup(user=user),parse_mode="HTML")
     shareUpdateWithChannel(update=update, context=context, optionChoices=f"/otp\n{updatedResults}")
     return START_ROUTES
 
-def otp(update: Update, context: CallbackContext) -> str:
-    global bot_available
-    updateCarrier = None
-    if update is None:
-        return
-    else:
-        if update.callback_query is not None:
-            updateCarrier = update.callback_query
-        if update.message is not None:
-            updateCarrier = update.message
-        if updateCarrier is None:
-            return
-    # Get user that sent /start and log his name
-    user = updateCarrier.from_user
-    logger.info("User %s started the conversation.", user.first_name)
-    if not bot_available:
-        # Sometimes, either the payment does not go through or 
-        # it takes time to process the last month's payment if
-        # done in the past 24 hours while the last date was today.
-        # If that happens, we won't be able to run bots or scanners
-        # without incurring heavy charges. Let's run in the 
-        # unavailable mode instead until this gets fixed.
-        updatedResults = APOLOGY_TEXT
-    
-    if bot_available:
-        try:
-            otpValue = 0
-            dbManager = DBManager()
-            otpValue, subsModel,subsValidity = dbManager.getOTP(user.id,user.username,f"{user.first_name} {user.last_name}",validityIntervalInSeconds=configManager.otpInterval)
-        except Exception as e: # pragma: no cover
-            logger.error(e)
-            pass
-        userText = f"\nUserID: <b>{user.id}</b>"
-        try:
-            subscriptionModelNames = "\n<pre>Following basic and premium subscription models are available. Premium subscription allows for unlimited premium scans:\n"
-            for name,value in PKUserSusbscriptions().subscriptionKeyValuePairs.items():
-                if name == PKSubscriptionModel.No_Subscription.name:
-                    subscriptionModelNames = f"{subscriptionModelNames}\n{name} : ₹ {value} (Only Basic Scans are free)\n"
-                else:
-                    subscriptionModelNames = f"{subscriptionModelNames}\n{name.ljust(15)} : ₹ {value}"
-            subscriptionModelNames = f"{subscriptionModelNames}</pre>\nPlease pay to subscribe:\n\n1. Using UPI(India) to <b>PKScreener@APL</b> \nor\n2. Proudly <b>sponsor</b>: https://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra\n\nPlease drop a message to @ItsOnlyPK on Telegram after paying to enable subscription manually or use \n\n/check UPI_UTR_HERE_After_Making_Payment to share transaction reference number to automatically enable subscription after making payment via UPI\n!"
+def editMessageText(query,editedText,reply_markup):
+    editedText = f"{PKDateUtilities.currentDateTime()}:\n{editedText}"
+    if query is not None and hasattr(query, "edit_message_text"):
+        query.edit_message_text(text=editedText, reply_markup=reply_markup,parse_mode="HTML")
 
-            subscriptionModelName = PKUserSusbscriptions().subscriptionValueKeyPairs[subsModel]
-            if subscriptionModelName != PKSubscriptionModel.No_Subscription.name:
-                subscriptionModelName = f"{subscriptionModelName} (Expires on: {subsValidity})"
-        except Exception as e:
-            logger.error(e)
-            subscriptionModelName = PKSubscriptionModel.No_Subscription.name
-            pass
-        if otpValue == 0:
-            updatedResults = f"We are having difficulty generating OTP for your {userText}. Please try again later."
-        else:
-            updatedResults = f"Please use your {userText} \nwith the following OTP to login to PKScreener:\n<b>{otpValue}</b>\n\nYour current subscription : <b>{subscriptionModelName}</b>. {subscriptionModelNames}"
-    update.message.reply_text(sanitiseTexts(updatedResults), parse_mode="HTML")
-    shareUpdateWithChannel(update=update, context=context, optionChoices=f"/otp\n{updatedResults}")
+def otp(update: Update, context: CallbackContext) -> str:
+    viewSubscriptionOptions(update,context,sendOTP=True)
     return START_ROUTES
     
 def start(update: Update, context: CallbackContext, updatedResults=None, monitorIndex=0,chosenBotMenuOption="") -> str:
@@ -339,32 +314,7 @@ def start(update: Update, context: CallbackContext, updatedResults=None, monitor
     # The keyboard is a list of button rows, where each row is in turn
     # a list (hence `[[...]]`).
     if bot_available:
-        mns = m0.renderForMenu(asList=True)
-        if (PKDateUtilities.isTradingTime() and not PKDateUtilities.isTodayHoliday()[0]) or ("PKDevTools_Default_Log_Level" in os.environ.keys()) or sys.argv[0].endswith(".py"):
-            mns.append(menu().create(f"MI_{monitorIndex}", "👩‍💻 🚀 Intraday Monitor", 2))
-        if user.username == OWNER_USER:
-            mns.append(menu().create(f"DV_0", ("✅ Enable Logging" if not configManager.logsEnabled else "🚫 Disable Logging"), 2))
-            mns.append(menu().create(f"DV_1", "🔄 Restart Bot", 2))
-
-        inlineMenus = []
-        keyboard = []
-        rowIndex = 0
-        iconDict = {"X":"🕵️‍♂️ 🔍 ","B":"📈 🎯 ","P":"🧨 💥 ","MI":"","DV":""}
-        for mnu in mns:
-            if mnu.menuKey[0:2] in TOP_LEVEL_SCANNER_MENUS:
-                rowIndex +=1
-                inlineMenus.append(
-                    InlineKeyboardButton(
-                        iconDict.get(str(mnu.menuKey[0:2])) + mnu.menuText.split("(")[0],
-                        callback_data="C" + str(mnu.menuKey),
-                    )
-                )
-                if rowIndex % 2 == 0:
-                    keyboard.append(inlineMenus)
-                    inlineMenus = []
-        if len(inlineMenus) > 0:
-            keyboard.append(inlineMenus)
-        reply_markup = InlineKeyboardMarkup(keyboard)
+        reply_markup = default_markup(user=user,monitorIndex=monitorIndex)
         cmds = m0.renderForMenu(
             selectedMenu=None,
             skip=TOP_LEVEL_SCANNER_SKIP_MENUS[:len(TOP_LEVEL_SCANNER_SKIP_MENUS)-1],
@@ -375,22 +325,23 @@ def start(update: Update, context: CallbackContext, updatedResults=None, monitor
         reply_markup = None
 
     if updatedResults is None:
-        cmdText = "\n/otp to generate an OTP to login to PKScreener desktop console\n\n/check UPI_UTR_HERE_After_Making_Payment to share transaction reference number to automatically enable subscription after making payment via UPI"
+        cmdText = "\n/otp : To generate an OTP to login to PKScreener desktop console\n/check UPI_UTR_HERE_After_Making_Payment : To share transaction reference number to automatically enable subscription after making payment via UPI\n"
         for cmd in cmds:
-            cmdText = f"{cmdText}\n\n{cmd.commandTextKey()} for {cmd.commandTextLabel()}"
-        tosDisclaimerText = "By using this Software, you agree to\n[+] having read through the Disclaimer (https://pkjmesra.github.io/PKScreener/Disclaimer.txt)\n[+] and accept Terms Of Service (https://pkjmesra.github.io/PKScreener/tos.txt) of PKScreener.\n\n[+] If that is not the case, you MUST immediately terminate using PKScreener and exit now!\n\n"
-        menuText = f"Welcome {user.first_name}, {(user.username)}!\n\n{tosDisclaimerText}Please choose a menu option by selecting a button from below.\n\nYou can also explore a wide variety of all other scanners by typing in \n{cmdText}\n\n OR just use the buttons below to choose."
+            if cmd.menuKey not in TOP_LEVEL_MARKUP_SKIP_MENUS:
+                cmdText = f"{cmdText}\n{cmd.commandTextKey()} : {cmd.commandTextLabel()}"
+        tosDisclaimerText = "By using this Software, you agree to\n[+] having read through the <a href='https://pkjmesra.github.io/PKScreener/Disclaimer.txt'>Disclaimer</a>\n[+] and accept <a href='https://pkjmesra.github.io/PKScreener/tos.txt'>Terms Of Service</a> of PKScreener.\n[+] If that is not the case, you MUST immediately terminate using PKScreener and exit now!\n"
+        menuText = f"Welcome {user.first_name}, {(user.username)}!\n{tosDisclaimerText}Please choose a menu option by selecting a button from below.{cmdText}"
         try:
             if updateCarrier is not None and hasattr(updateCarrier, "data") and updateCarrier.data is not None and updateCarrier.data == "CP":
-                menuText = f"Piped Scanners are available using /P . Click on this /P to begin using piped scanners. To use other scanners, choose a menu option by selecting a button from below.\n\nYou can also explore a wide variety of all other scanners by typing in \n{cmdText}\n\n OR just use the buttons below to choose."
+                menuText = f"Piped Scanners are available using /P . Click on this /P to begin using piped scanners. To use other scanners, choose a menu option by selecting a button from below.\n{cmdText}"
         except Exception as e: # pragma: no cover
             logger.error(e)
             pass
-        menuText = f"{menuText}\n\nClick /start if you want to restart the session."
+        menuText = f"{menuText}\nClick /start if you want to restart the session."
     else:
         if not isUserSubscribed(user):
-            updatedResults = f"Thank you for choosing Intraday Monitor!\n\nThis scan request is, however ,protected and is only available to premium subscribers. It seems like you are not subscribed to the paid/premium subscription to PKScreener.\nPlease checkout all premium options by sending out a request:\n\n/OTP\n\nFor basic/unpaid users, you can try out the following:\n /X_0 StockCode1,StockCode2,etc.\n/X_N\n/X_1\n"
-            updatedResults = f"{updatedResults}\n\nClick /start if you want to restart the session."
+            updatedResults = f"Thank you for choosing Intraday Monitor!\n\nThis scan request is, however, protected and is only available to premium subscribers. It seems like you are not subscribed to the paid/premium subscription to PKScreener.\nPlease checkout all premium options by sending out a request:\n/OTP\n\nFor basic/unpaid users, you can try out the following:\n/X_0 StockCode1,StockCode2,etc.\n/X_N\n/X_1"
+            updatedResults = f"{updatedResults}\nClick /start if you want to restart the session."
         chosenBotMenuOption = f"{chosenBotMenuOption}\nInt. Monitor. MonitorIndex:{monitorIndex}\n{updatedResults}"
         menuText = updatedResults
     # Send message with text and appended InlineKeyboard
@@ -402,6 +353,7 @@ def start(update: Update, context: CallbackContext, updatedResults=None, monitor
         update.message.reply_text(
             sanitiseTexts(menuText),
             reply_markup=reply_markup,
+            parse_mode="HTML"
         )
     if Channel_Id is not None and len(str(Channel_Id)) > 0:
         context.bot.send_message(
@@ -409,7 +361,7 @@ def start(update: Update, context: CallbackContext, updatedResults=None, monitor
             text=f"Name: {user.first_name}, Username:@{user.username} with ID: {str(user.id)} started using the bot!\n{chosenBotMenuOption}",
             parse_mode="HTML",
         )
-    DBManager().getOTP(user.id,user.username,f"{user.first_name} {user.last_name}",validityIntervalInSeconds=configManager.otpInterval)
+    registerUser(user)
     # Tell ConversationHandler that we're in state `FIRST` now
     return START_ROUTES
 
@@ -583,11 +535,74 @@ def PScanners(update: Update, context: CallbackContext) -> str:
         )
     keyboard = [inlineMenus]
     reply_markup = InlineKeyboardMarkup(keyboard)
-    if query.message.text == menuText:
-        menuText = f"{PKDateUtilities.currentDateTime()}:\n{menuText}"
-    menuText = f"{menuText}\n\nClick /start if you want to restart the session."
-    query.edit_message_text(text=menuText, reply_markup=reply_markup)
-    DBManager().getOTP(user.id,user.username,f"{user.first_name} {user.last_name}",validityIntervalInSeconds=configManager.otpInterval)
+    menuText = f"{menuText}\nClick /start if you want to restart the session."
+    editMessageText(query=query,editedText=menuText,reply_markup=reply_markup)
+    registerUser(user)
+    return START_ROUTES
+
+def viewSubscriptionOptions(update:Update,context:CallbackContext,sendOTP=False):
+    global bot_available
+    updateCarrier = None
+    updatedResults= ""
+    if update is None:
+        return
+    else:
+        if update.callback_query is not None:
+            updateCarrier = update.callback_query
+        if update.message is not None:
+            updateCarrier = update.message
+        if updateCarrier is None:
+            return
+    # Get user that sent /start and log his name
+    user = updateCarrier.from_user
+    logger.info("User %s started the conversation.", user.first_name)
+    if not bot_available:
+        # Sometimes, either the payment does not go through or 
+        # it takes time to process the last month's payment if
+        # done in the past 24 hours while the last date was today.
+        # If that happens, we won't be able to run bots or scanners
+        # without incurring heavy charges. Let's run in the 
+        # unavailable mode instead until this gets fixed.
+        updatedResults = APOLOGY_TEXT
+    
+    if bot_available:
+        try:
+            otpValue = 0
+            alertUser = None
+            dbManager = DBManager()
+            otpValue, subsModel,subsValidity,alertUser = registerUser(user,forceFetch=True)
+        except Exception as e: # pragma: no cover
+            logger.error(e)
+            pass
+        userText = f"<b>UserID</b> : <code>{user.id}</code>"
+        try:
+            subscriptionModelNames = "\n<pre>Following basic and premium subscription models are available. Premium subscription allows for unlimited premium scans:\n"
+            for name,value in PKUserSusbscriptions().subscriptionKeyValuePairs.items():
+                if name == PKSubscriptionModel.No_Subscription.name:
+                    subscriptionModelNames = f"{subscriptionModelNames}\n₹ {str(value).ljust(6)}: {name} (Only Basic Scans are free)\n"
+                else:
+                    subscriptionModelNames = f"{subscriptionModelNames}\n₹ {str(value).ljust(6)}: {name}"
+            subscriptionModelNames = f"{subscriptionModelNames}</pre>\nPlease pay to subscribe:\n1. Using UPI(India) to <a href='https://tinyurl.com/v7h3t233'>PKScreener@APL</a> or\n2. Proudly <a href='https://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra'><b>sponsor</b></a>\n\nPlease drop a message to @ItsOnlyPK on Telegram after paying to enable subscription manually or use \n\n/check UPI_UTR_HERE_After_Making_Payment to share transaction reference number to automatically enable subscription after making payment via UPI\n"
+
+            subscriptionModelName = PKUserSusbscriptions().subscriptionValueKeyPairs[subsModel]
+            if subscriptionModelName != PKSubscriptionModel.No_Subscription.name:
+                subscriptionModelName = f"{subscriptionModelName} (Expires on: {subsValidity})"
+        except Exception as e:
+            logger.error(e)
+            subscriptionModelName = PKSubscriptionModel.No_Subscription.name
+            pass
+        if sendOTP:
+            if otpValue == 0:
+                updatedResults = f"We are having difficulty generating OTP for your {userText}. Please try again later or reach out to @ItsOnlyPK."
+            else:
+                updatedResults = f"Please use the following to login to PKScreener:\n{userText}\n<b>OTP</b>     : <code>{otpValue}</code>\n\nCurrent subscription : <b>{subscriptionModelName}</b>.\nCurrent alerts balance: <b>₹ {alertUser.balance if alertUser is not None else 0}</b>. {subscriptionModelNames}"
+        else:
+            updatedResults = f"Current subscription: <b>{subscriptionModelName}</b>.\nCurrent alerts balance: <b>₹ {alertUser.balance if alertUser is not None else 0}</b>. {subscriptionModelNames}"
+    if hasattr(updateCarrier, "reply_text"):
+        updateCarrier.reply_text(text=sanitiseTexts(updatedResults), reply_markup=default_markup(user=user),parse_mode="HTML")
+    elif hasattr(updateCarrier, "edit_message_text"):
+        editMessageText(query=updateCarrier,editedText=sanitiseTexts(updatedResults),reply_markup=default_markup(user=user))
+    shareUpdateWithChannel(update=update, context=context, optionChoices=f"/otp\n{updatedResults}")
     return START_ROUTES
 
 def subscribeToScannerAlerts(update: Update, context: CallbackContext) -> str:
@@ -622,11 +637,11 @@ def subscribeToScannerAlerts(update: Update, context: CallbackContext) -> str:
         return START_ROUTES
     dbManager = DBManager()
     alertUser = dbManager.alertsForUser(int(user.id))
-    inlineMenus = []
     query.answer()
     menuText = ""
     requiredBalance = 40 if str(scanId).upper().startswith("P") else 31
-    payWall = "Please pay to subscribe:\n\n1. Using UPI(India) to PKScreener@APL \nor\n2. Proudly sponsor: https://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra\n\nPlease drop a message to @ItsOnlyPK along with UTR and Scan details on Telegram after paying to enable subscription manually or use \n\n/check UPI_UTR_HERE_After_Making_Payment to share transaction reference number to automatically update your balance after making payment via UPI\n! After that you can try re-subscribing!"
+    # upi://pay?pa=PKScreener@APL&pn=PKScreener&cu=INR
+    payWall = "Please pay to subscribe:\n1. Using UPI(India) to <a href='https://tinyurl.com/v7h3t233'>PKScreener@APL</a> or\n2. Proudly <a href='https://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra'>sponsor</a>\n\nPlease drop a message to @ItsOnlyPK along with UTR and Scan details on Telegram after paying to enable subscription manually or use \n\n/check UPI_UTR_HERE_After_Making_Payment to share transaction reference number to automatically update your balance after making payment via UPI.\nAfter that you can try re-subscribing!"
     if alertUser is not None and alertUser.balance >= 0:
         # User has some balance
         if len(alertUser.scannerJobs) > 0:
@@ -636,7 +651,7 @@ def subscribeToScannerAlerts(update: Update, context: CallbackContext) -> str:
             else:
                 if  alertUser.balance < requiredBalance:
                     # Insufficient balance
-                    menuText = f"You need at least ₹ {requiredBalance} to subscribe to {scanId} ! Your current balance ₹ {alertUser.balance} is insufficient. {payWall}"
+                    menuText = f"You need at least <b>₹ {requiredBalance}</b> to subscribe to <b>{scanId} alerts for a day</b> ! Your current balance <b>₹ {alertUser.balance}</b> is <b>insufficient</b>. {payWall}"
                 else:
                     # Sufficient balance to subscribe to scanId
                     subscribed = dbManager.updateAlertSubscriptionModel(user.id,requiredBalance,scanId)
@@ -647,19 +662,10 @@ def subscribeToScannerAlerts(update: Update, context: CallbackContext) -> str:
     
     elif alertUser is None or alertUser.balance == 0:
         # Either user is not subscribed or has 0 balance
-        menuText = f"You need at least ₹ {requiredBalance} to subscribe to {scanId} ! {payWall}"
+        menuText = f"You need at least <b>₹ {requiredBalance}</b> to subscribe to <b>{scanId} alerts for a day</b> ! Your current balance <b>₹ 0</b> is <b>insufficient</b>. {payWall}"
 
-    inlineMenus.append(
-            InlineKeyboardButton(
-                "Start", callback_data="start"
-            )
-        )
-    keyboard = [inlineMenus]
-    reply_markup = InlineKeyboardMarkup(keyboard)
-    if query.message.text == menuText:
-        menuText = f"{PKDateUtilities.currentDateTime()}:\n{menuText}"
-    menuText = f"{menuText}\n\nClick /start if you want to restart the session."
-    query.edit_message_text(text=menuText, reply_markup=reply_markup)
+    menuText = f"{menuText}\nClick /start if you want to restart the session."
+    editMessageText(query=query,editedText=sanitiseTexts(menuText),reply_markup=default_markup(user=user))
     return START_ROUTES
         
 
@@ -756,11 +762,9 @@ def XScanners(update: Update, context: CallbackContext) -> str:
         )
     keyboard = [inlineMenus]
     reply_markup = InlineKeyboardMarkup(keyboard)
-    if query.message.text == menuText:
-        menuText = f"{PKDateUtilities.currentDateTime()}:\n{menuText}"
-    menuText = f"{menuText}\n\nClick /start if you want to restart the session."
-    query.edit_message_text(text=menuText, reply_markup=reply_markup)
-    DBManager().getOTP(user.id,user.username,f"{user.first_name} {user.last_name}",validityIntervalInSeconds=configManager.otpInterval)
+    menuText = f"{menuText}\nClick /start if you want to restart the session."
+    editMessageText(query=query,editedText=sanitiseTexts(menuText),reply_markup=reply_markup)
+    registerUser(user)
     return START_ROUTES
 
 def getinlineMenuListRow(keyboardRows=[]):
@@ -817,21 +821,23 @@ def Level2(update: Update, context: CallbackContext) -> str:
         start(update, context)
         return START_ROUTES
     
-    if len(selection) == 2 and selection[0] in ["X","B"] and selection[1] in ["P1","P2","P3"]:
+    reply_markup = default_markup(user=user)
+    if (len(selection) == 2 and selection[0] in ["X","B"] and selection[1] in ["P1","P2","P3"]) or \
+        (len(selection) == 4 and selection[0] in ["P"] and selection[3] in ["P1","P2","P3"]): # Piped scan index options
         nextOption = ""
-        if selection[1] == "P2":
+        if selection[1] == "P2" or (selection[0] in ["P"] and selection[3] == "P2"):
             skipMenus = INDEX_SKIP_MENUS_5_TO_9
             nextOption = "P3"
-        elif selection[1] == "P3":
+        elif selection[1] == "P3" or (selection[0] in ["P"] and selection[3] == "P3"):
             skipMenus = INDEX_SKIP_MENUS_10_TO_15
             nextOption = "P1"
-        elif selection[1] == "P1":
+        elif selection[1] == "P1" or (selection[0] in ["P"] and selection[3] == "P1"):
             skipMenus = INDEX_SKIP_MENUS_1_To_4
             nextOption = "P2"
         # Create the menu text labels
         menuText = (
             m1.renderForMenu(
-                m0.find(selection[0]),
+                m0.find(selection[0] if selection[0] not in ["P"] else "X"),
                 skip=skipMenus,
                 renderStyle=MenuRenderStyle.STANDALONE,
             )
@@ -846,7 +852,7 @@ def Level2(update: Update, context: CallbackContext) -> str:
 
         # Create the menu buttons
         mns = m1.renderForMenu(
-            m0.find(selection[0]),
+            m0.find(selection[0] if selection[0] not in ["P"] else "X"),
             skip=skipMenus,
             asList=True,
         )
@@ -856,14 +862,12 @@ def Level2(update: Update, context: CallbackContext) -> str:
         for mnu in mns:
             activeInlineRow = getinlineMenuListRow(keyboardRows)
             activeInlineRow.append(
-                InlineKeyboardButton(mnu.menuKey, callback_data=str(f"C{selection[0]}_{mnu.menuKey}")))
+                InlineKeyboardButton(mnu.menuKey, callback_data=str(f"C{(selection[0]+'_'+selection[1]+'_'+selection[2]) if selection[0] in ["P"] else selection[0]}_{mnu.menuKey}")))
 
         keyboard = keyboardRows
         reply_markup = InlineKeyboardMarkup(keyboard)
-        if query.message.text == menuText:
-            menuText = f"{PKDateUtilities.currentDateTime()}:\n{menuText}"
-        menuText = f"{menuText}\n\nClick /start if you want to restart the session."
-        query.edit_message_text(text=menuText, reply_markup=reply_markup)
+        menuText = f"{menuText}\nClick /start if you want to restart the session."
+        editMessageText(query=query,editedText=sanitiseTexts(menuText),reply_markup=reply_markup)
         return START_ROUTES
     if len(selection) == 2 or (len(selection) == 3 and selection[2] == "P"):
         if str(selection[1]).isnumeric():
@@ -984,7 +988,7 @@ def Level2(update: Update, context: CallbackContext) -> str:
             )
             mns.append(menu().create("H", "Home", 2))
             mns.append(menu().create("P", "More Options", 2))
-        elif str(selection[2]).isnumeric():
+        elif str(selection[2]).isnumeric() and selection[0].lower() not in ["p"]:
             preSelection = f"{selection[0]}_{selection[1]}_{selection[2]}"
             if selection[2] in SCANNER_MENUS_WITH_SUBMENU_SUPPORT:
                 menuText = m3.renderForMenu(
@@ -999,7 +1003,7 @@ def Level2(update: Update, context: CallbackContext) -> str:
                     skip=["0","M","Z"],
                 )
                 menuText = f"{menuText}\n\nH > Home"
-                menuText = f"{menuText}\n\nClick /start if you want to restart the session."
+                menuText = f"{menuText}\nClick /start if you want to restart the session."
                 mns.append(menu().create("H", "Home", 2))
             else:
                 if selection[2] == "4":  # Last N days
@@ -1028,7 +1032,7 @@ def Level2(update: Update, context: CallbackContext) -> str:
             )
         keyboard = keyboardRows
         reply_markup = InlineKeyboardMarkup(keyboard)
-    elif len(selection) >= 4:
+    if (len(selection) >= 4 and selection[0].lower() not in ["p"]) or (len(selection) >= 3 and selection[0].lower() in ["p"]):
         if len(selection) == 4:
             if selection[2] in SCANNER_SUBMENUS_CHILDLEVEL_SUPPORT.keys() and selection[3] in SCANNER_SUBMENUS_CHILDLEVEL_SUPPORT[selection[2]]:
                 m0.renderForMenu(
@@ -1077,7 +1081,7 @@ def Level2(update: Update, context: CallbackContext) -> str:
                     )
                     menuText = f"{menuText}\n\nH > Home"
                     mns.append(menu().create("H", "Home", 3))
-                    menuText = f"{menuText}\n\nClick /start if you want to restart the session."
+                    menuText = f"{menuText}\nClick /start if you want to restart the session."
             if mns is not None:
                 for mnu in mns:
                     activeInlineRow = getinlineMenuListRow(keyboardRows)
@@ -1086,21 +1090,57 @@ def Level2(update: Update, context: CallbackContext) -> str:
                 reply_markup = InlineKeyboardMarkup(keyboard)
             if len(mns) == 0:
                 menuText = ''
-        elif len(selection) > 4:
-            menuText = ''
+        elif len(selection) > 4 or (len(selection) >= 3 and selection[0].lower() in ["p"]):
+            if (selection[0] in 'P' and ((len(selection) >= 4 and len(selection[3]) == 0) or (len(selection) == 3 and str(selection[2]).isnumeric()))):
+                preSelection = query.data.upper().replace("C", "")
+                skipMenus = ["N"]
+                skipMenus.extend(INDEX_SKIP_MENUS_1_To_4)
+                # Create the menu text labels
+                menuText = (
+                    m1.renderForMenu(
+                        m0.find("X"),
+                        skip=skipMenus,
+                        renderStyle=MenuRenderStyle.STANDALONE,
+                    )
+                    .replace("     ", "")
+                    .replace("    ", "")
+                    .replace("  ", "")
+                    .replace("\t", "")
+                    .replace(colorText.FAIL,"").replace(colorText.END,"").replace(colorText.WHITE,"")
+                )
+                menuText = f"{menuText}\n\nH > Home"
+                menuText = f"{menuText}\n\nP2 > More Options"
 
-        if selection[0] in 'P' and len(selection[3]) == 0:
-            selection[3] = '12' # All stocks
+                # Create the menu buttons
+                mns = m1.renderForMenu(
+                    m0.find("X"),
+                    skip=skipMenus,
+                    asList=True,
+                )
+                mns.append(menu().create("H", "Home", 2))
+                mns.append(menu().create("P2", "Next", 2))
+                inlineMenus = []
+                query.answer()
+                for mnu in mns:
+                    inlineMenus.append(
+                        InlineKeyboardButton(
+                            mnu.menuKey, callback_data=str(f"C{preSelection}_{mnu.menuKey}")
+                        )
+                    )
+                keyboard = [inlineMenus]
+                reply_markup = InlineKeyboardMarkup(keyboard)
+            elif len(mns) == 0:
+                menuText = ''
         
         if menuText is None or len(menuText) == 0:
             optionChoices = (
-                f"{selection[0]} > {selection[1]} > {selection[2]} > {selection[3]}"
+                f"{selection[0]} > {selection[1]} > {selection[2]} > {selection[3]}".replace(" > >","").strip()
             )
-            optionChoices = f"{optionChoices}{f' > {selection[4]}' if len(selection) > 4 else ''}"
+            optionChoices = f"{optionChoices}{f' > {selection[4]}' if len(selection) > 4 else ''}".replace(" > >","").strip()
             expectedTime = f"{'10 to 15' if '> 15' in optionChoices else '1 to 2'}"
-            menuText = f"Thank you for choosing {optionChoices.replace(' >  > ','')}. You will receive the notification/results in about {expectedTime} minutes. It generally takes 1-2 minutes for NSE (2000+) stocks and 10-15 minutes for NASDAQ (7300+).\n\nPKScreener had been free for a long time, but owing to cost/budgeting issues, only a basic set of features will always remain free for everyone. Consider donating to help cover the basic server costs or subscribe to premium, if not subscribed yet:\n\nUPI (India): PKScreener@APL \n\nor\nhttps://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra"
+            menuText = f"Thank you for choosing {optionChoices.replace(' >  > ','')}. You will receive the notification/results in about {expectedTime} minutes. It generally takes 1-2 minutes for NSE (2000+) stocks and 10-15 minutes for NASDAQ (7300+).\n\nPKScreener had been free for a long time, but owing to cost/budgeting issues, only a basic set of features will always remain free for everyone. Consider donating to help cover the basic server costs or subscribe to premium, if not subscribed yet:\n\nUPI (India): <a href='https://tinyurl.com/v7h3t233'>PKScreener@APL</a> \n\nor <a href='https://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra'>sponsor</a>"
 
-            reply_markup = default_markup([])
+            reply_markup = default_markup(user=user)
             options = ":".join(selection)
             shouldSendUpdate = launchScreener(
                 options=options,
@@ -1110,7 +1150,7 @@ def Level2(update: Update, context: CallbackContext) -> str:
                 update=update,
             )
             if not shouldSendUpdate:
-                DBManager().getOTP(user.id,user.username,f"{user.first_name} {user.last_name}",validityIntervalInSeconds=configManager.otpInterval)
+                registerUser(user)
                 return START_ROUTES
         try:
             if optionChoices != "" and Channel_Id is not None and len(str(Channel_Id)) > 0:
@@ -1127,20 +1167,54 @@ def Level2(update: Update, context: CallbackContext) -> str:
         sendUpdatedMenu(
             menuText=menuText, update=update, context=context, reply_markup=reply_markup
         )
-    DBManager().getOTP(user.id,user.username,f"{user.first_name} {user.last_name}",validityIntervalInSeconds=configManager.otpInterval)
+        scanRequest = optionChoices.replace(" ", "").replace(">", "_").replace(":","_").replace("_D","").upper()
+        sendSubscriptionOption(update,context,scanRequest)
+    registerUser(user)
     return START_ROUTES
 
-def default_markup(inlineMenus):
-    mns = m0.renderForMenu(asList=True)
+def default_markup(user=None,monitorIndex=0):
+    mns = m0.renderForMenu(selectedMenu=None,
+            skip=TOP_LEVEL_SCANNER_SKIP_MENUS[:len(TOP_LEVEL_SCANNER_SKIP_MENUS)-1],
+            asList=True,
+            renderStyle=MenuRenderStyle.STANDALONE,
+        )
+    if (PKDateUtilities.isTradingTime() and not PKDateUtilities.isTodayHoliday()[0]) or ("PKDevTools_Default_Log_Level" in os.environ.keys()) or sys.argv[0].endswith(".py"):
+        mns.append(menu().create(f"MI_{monitorIndex}", "👩‍💻 🚀 Intraday Monitor", 2))
+    if user is not None and user.username == OWNER_USER:
+        mns.append(menu().create(f"DV_0", ("✅ Enable Logging" if not configManager.logsEnabled else "🚫 Disable Logging"), 2))
+        mns.append(menu().create(f"DV_1", "🔄 Restart Bot", 2))
+    keyboard = []
+    inlineMenus = []
+    lastRowMenus = []
+    rowIndex = 0
+    iconDict = {"X":"🕵️‍♂️ 🔍 ","B":"📈 🎯 ","P":"🧨 💥 ","MI":"","DV":"","VS":"🔔 📣 ","start":"🟢 🏁 "}
     for mnu in mns:
-        if mnu.menuKey in TOP_LEVEL_SCANNER_MENUS:
+        if mnu.menuKey[0:2] in TOP_LEVEL_SCANNER_MENUS:
+            rowIndex +=1
             inlineMenus.append(
-                    InlineKeyboardButton(
-                        mnu.menuText.split("(")[0],
-                        callback_data="C" + str(mnu.menuKey),
-                    )
+                InlineKeyboardButton(
+                    iconDict.get(str(mnu.menuKey[0:2])) + mnu.menuText.split("(")[0],
+                    callback_data="C" + str(mnu.menuKey),
                 )
-    keyboard = [inlineMenus]
+            )
+            if rowIndex % 2 == 0:
+                keyboard.append(inlineMenus)
+                inlineMenus = []
+    lastRowMenus.append(
+        InlineKeyboardButton(
+            iconDict.get("VS") + "Subscriptions",
+            callback_data="VS_",
+        )
+    )
+    lastRowMenus.append(
+        InlineKeyboardButton(
+            iconDict.get("start") + "Start",
+            callback_data="start",
+        )
+    )
+    if len(inlineMenus) > 0:
+        keyboard.append(inlineMenus)
+    keyboard.append(lastRowMenus)
     reply_markup = InlineKeyboardMarkup(keyboard)
     return reply_markup
 
@@ -1148,14 +1222,8 @@ def default_markup(inlineMenus):
 def sendUpdatedMenu(menuText, update: Update, context, reply_markup, replaceWhiteSpaces=True):
     try:
         menuText.replace("     ", "").replace("    ", "").replace("\t", "").replace(colorText.FAIL,"").replace(colorText.END,"").replace(colorText.WHITE,"") if replaceWhiteSpaces else menuText
-        menuText = f"{menuText}\n\nClick /start if you want to restart the session." if "/start" not in menuText else menuText
-        if update.callback_query.message.text == menuText:
-            menuText = f"{PKDateUtilities.currentDateTime()}:\n{menuText}"
-        update.callback_query.edit_message_text(
-            text=menuText,
-            parse_mode="HTML",
-            reply_markup=reply_markup,
-        )
+        menuText = f"{menuText}\nClick /start if you want to restart the session." if "/start" not in menuText else menuText
+        editMessageText(query=update.callback_query,editedText=sanitiseTexts(menuText),reply_markup=reply_markup)
     except Exception as e:# pragma: no cover
         logger.log(e)
         start(update, context)
@@ -1176,16 +1244,14 @@ def launchScreener(options, user, context, optionChoices, update):
                     isBasicScanRequest = True
                     break
             if not isBasicScanRequest:
-                responseText = f"Thank you for choosing {scanRequest}!\n\nThis scan request is,however,protected and is only available to premium subscribers. It seems like you are not subscribed to the paid/premium subscription to PKScreener.\nPlease checkout all premium options by sending out a request:\n\n/OTP\n\nFor basic/unpaid users, you can try out the following:\n /X_0 StockCode1,StockCode2,etc.\n/X_N\n/X_1\n"
+                responseText = f"Thank you for choosing {scanRequest}!\n\nThis {'Backtest' if str(scanRequest).startswith('B') else 'Scan'} request is, however, protected and is only available to premium subscribers. It seems like you are not subscribed to the paid/premium subscription to PKScreener.\nPlease checkout all premium options by sending out a request:\n\n/OTP\n\nFor basic/unpaid users, you can try out the following:\n/X_0 StockCode1,StockCode2,etc.\n/X_N\n/X_1\n"
                 if update is not None and update.message is not None:
-                    update.message.reply_text(sanitiseTexts(responseText))
+                    update.message.reply_text(sanitiseTexts(responseText),reply_markup=default_markup(user=user),parse_mode="HTML")
                 else:
-                    responseText = f"{responseText}\n\nClick /start if you want to restart the session."
-                    update.callback_query.edit_message_text(
-                        text=responseText,
-                        reply_markup=default_markup([]),
-                    )
+                    responseText = f"{responseText}\nClick /start if you want to restart the session."
+                editMessageText(query=update.callback_query,editedText=sanitiseTexts(responseText),reply_markup=default_markup(user=user))
                 shareUpdateWithChannel(update=update, context=context, optionChoices=responseText)
+                sendSubscriptionOption(update,context,scanRequest)
                 return False
 
         if str(optionChoices.upper()).startswith("B"):
@@ -1199,13 +1265,10 @@ def launchScreener(options, user, context, optionChoices, update):
             responseText = f"{responseText}\n\nStock-wise: https://pkjmesra.github.io/PKScreener/Backtest-Reports/PKScreener_{optionChoices}_backtest_result_StockSorted.html"
             responseText = f"{responseText}\n\nOther Reports: https://pkjmesra.github.io/PKScreener/BacktestReports.html"
             if update is not None and update.message is not None:
-                update.message.reply_text(sanitiseTexts(responseText))
+                update.message.reply_text(sanitiseTexts(responseText),reply_markup=default_markup(user=user),parse_mode="HTML")
             else:
-                responseText = f"{responseText}\n\nClick /start if you want to restart the session."
-                update.callback_query.edit_message_text(
-                    text=responseText,
-                    reply_markup=default_markup([]),
-                )
+                responseText = f"{responseText}\nClick /start if you want to restart the session."
+                editMessageText(query=update.callback_query,editedText=sanitiseTexts(responseText),reply_markup=default_markup(user=user))
             shareUpdateWithChannel(
                 update=update, context=context, optionChoices=optionChoices
             )
@@ -1272,15 +1335,35 @@ def BBacktests(update: Update, context: CallbackContext) -> str:
     ]
     reply_markup = InlineKeyboardMarkup(keyboard)
     responseText = "Backtesting NOT implemented yet in this Bot!\n\n\nYou can use backtesting by downloading the software from https://github.com/pkjmesra/PKScreener/"
-    responseText = f"{responseText}\n\nClick /start if you want to restart the session."
-    query.edit_message_text(
-        text=responseText,
-        reply_markup=reply_markup,
-    )
-    DBManager().getOTP(user.id,user.username,f"{user.first_name} {user.last_name}",validityIntervalInSeconds=configManager.otpInterval)
+    responseText = f"{responseText}\nClick /start if you want to restart the session."
+    editMessageText(query=query,editedText=sanitiseTexts(responseText),reply_markup=default_markup(user=user))
+    registerUser(user)
     return START_ROUTES
 
-
+def sendSubscriptionOption(update:Update,context:CallbackContext,scanId):
+    updateCarrier = None
+    if update is None:
+        return
+    else:
+        if update.callback_query is not None:
+            updateCarrier = update.callback_query
+        if update.message is not None:
+            updateCarrier = update.message
+        if updateCarrier is None:
+            return
+    # Get user that sent /start and log his name
+    user = updateCarrier.from_user
+    reply_markup = {
+        "inline_keyboard": [
+            [{"text": f"Yes! Subscribe", "callback_data": f"SUB_{scanId}"}]
+        ],
+    }
+    message=f"Would you like to subscribe to this (<b>{scanId}</b>) automated scan alert for a day during market hours (NSE - IST timezone)? You will need to pay <b>₹ {'40' if str(scanId).upper().startswith('P') else '31'} (One time per day)</b> for automated alerts to only <b>{scanId}</b> all day on the day of subscription."
+    if len(str(scanId).strip()) > 0 and not str(scanId).startswith("B"):
+        context.bot.send_message(
+            chat_id=user.id, text=message, reply_markup=reply_markup, parse_mode="HTML"
+        )
+    
 def end(update: Update, context: CallbackContext) -> str:
     """Returns `ConversationHandler.END`, which tells the
     ConversationHandler that the conversation is over.
@@ -1288,10 +1371,8 @@ def end(update: Update, context: CallbackContext) -> str:
     query = update.callback_query
     query.answer()
     responseText = "See https://github.com/pkjmesra/PKScreener/ for more details or join https://t.me/PKScreener. \n\n\nSee you next time!"
-    responseText = f"{responseText}\n\nClick /start if you want to restart the session."
-    query.edit_message_text(
-        text=responseText
-    )
+    responseText = f"{responseText}\nClick /start if you want to restart the session."
+    editMessageText(query=query,editedText=sanitiseTexts(responseText),reply_markup=default_markup(query.from_user))
     return ConversationHandler.END
 
 
@@ -1384,6 +1465,21 @@ def command_handler(update: Update, context: CallbackContext) -> None:
     if not bot_available:
         start(update, context)
         return START_ROUTES
+    updateCarrier = None
+    if update is None:
+        return
+    else:
+        if hasattr(update, "callback_query") and update.callback_query is not None:
+            updateCarrier = update.callback_query
+        if hasattr(update, "message") and update.message is not None:
+            updateCarrier = update.message
+        if hasattr(update, "effective_message") and update.effective_message is not None:
+            updateCarrier = update.effective_message
+        if updateCarrier is None:
+            return
+    # Get user that sent /start and log his name
+    user = updateCarrier.from_user
+
     msg = update.effective_message
     try:
         m = re.match(r"\s*/([0-9a-zA-Z_-]+)\s*(.*)", msg.text)
@@ -1414,7 +1510,7 @@ def command_handler(update: Update, context: CallbackContext) -> None:
     cmdText = f"{cmdText}\n/F_0 STOCK_CODE1,STOCK_CODE2 To find which all scanners had these stock codes(Reverse look up)"
 
     if cmd.upper() in TOP_LEVEL_SCANNER_MENUS:
-        shareUpdateWithChannel(update=update, context=context)
+        shareUpdateWithChannel(update=update, context=context,optionChoices=msg)
         m0.renderForMenu(
             selectedMenu=None,
             skip=TOP_LEVEL_SCANNER_SKIP_MENUS[:len(TOP_LEVEL_SCANNER_SKIP_MENUS)-1],
@@ -1437,8 +1533,8 @@ def command_handler(update: Update, context: CallbackContext) -> None:
         if cmd in ["x"]:
             cmdText = f"{cmdText}\n\nFor option 0 <Screen stocks by the stock name>, please type in the command in the following format\n/X_0 SBIN\n or \n/X_0_0 SBIN\nand hit send where SBIN is the NSE stock code.For multiple stocks, you can type in \n/X_0 SBIN,ICICIBANK,OtherStocks\nYou can put in any number of stocks separated by space or comma(,)."
         """Send a message when the command /help is issued."""
-        cmdText = f"{cmdText}\n\nClick /start if you want to restart the session."
-        update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"))
+        cmdText = f"{cmdText}\nClick /start if you want to restart the session."
+        update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"),reply_markup=default_markup(user=user),parse_mode="HTML")
         return START_ROUTES
 
     if update.message is None:
@@ -1446,7 +1542,7 @@ def command_handler(update: Update, context: CallbackContext) -> None:
         return START_ROUTES
 
     if "x_0" in cmd or "x_0_0" in cmd or "b_0" in cmd or "g_0" in cmd or "f_0" in cmd:
-        shareUpdateWithChannel(update=update, context=context)
+        shareUpdateWithChannel(update=update, context=context,optionChoices=msg)
         shouldScan = False
         if len(args) > 0:
             shouldScan = True
@@ -1467,17 +1563,19 @@ def command_handler(update: Update, context: CallbackContext) -> None:
             )
             if result:
                 sendRequestSubmitted(cmd.upper(), update=update, context=context)
+                scanRequest = cmd.upper().replace(" ", "").replace(">", "_").replace(":","_").replace("_D","").upper()
+                sendSubscriptionOption(update,context,scanRequest)
             return START_ROUTES
         else:
             if cmd in ["x"]:
                 cmdText = "For option 0 <Screen stocks by the stock name>, please type in the command in the following format\n/X_0 SBIN or /X_0_0 SBIN and hit send where SBIN is the NSE stock code.For multiple stocks, you can type in /X_0 SBIN,ICICIBANK,OtherStocks . You can put in any number of stocks separated by space or comma(,)."
             """Send a message when the command /help is issued."""
-            cmdText = f"{cmdText}\n\nClick /start if you want to restart the session."
-            update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"))
+            cmdText = f"{cmdText}\nClick /start if you want to restart the session."
+            update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"),reply_markup=default_markup(user=user),parse_mode="HTML")
             return START_ROUTES
 
     if "p_" in cmd:
-        shareUpdateWithChannel(update=update, context=context)
+        shareUpdateWithChannel(update=update, context=context,optionChoices=msg)
         selection = cmd.split("_")
         if len(selection) == 2:
             m0.renderForMenu(
@@ -1504,8 +1602,8 @@ def command_handler(update: Update, context: CallbackContext) -> None:
                 cmdText = (
                     f"{cmdText}\n\n{cmd.commandTextKey()} for {cmd.commandTextLabel()}"
                 )
-            cmdText = f"{cmdText}\n\nClick /start if you want to restart the session."
-            update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"))
+            cmdText = f"{cmdText}\nClick /start if you want to restart the session."
+            update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"),reply_markup=default_markup(user=user),parse_mode="HTML")
             return START_ROUTES
         elif len(selection) == 3:
             m0.renderForMenu(
@@ -1519,8 +1617,8 @@ def command_handler(update: Update, context: CallbackContext) -> None:
                 cmdText = (
                     f"{cmdText}\n\n/{cmd.upper()}{indexCmd.commandTextKey().replace('/X','')} for Piped scan of {indexCmd.commandTextLabel().replace('Scanners >',cmd.upper()+' >')}"
                 )
-            cmdText = f"{cmdText}\n\nClick /start if you want to restart the session."
-            update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"))
+            cmdText = f"{cmdText}\nClick /start if you want to restart the session."
+            update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"),reply_markup=default_markup(user=user),parse_mode="HTML")
             return START_ROUTES
         elif len(selection) == 4:
             options = ":".join(selection)
@@ -1533,10 +1631,12 @@ def command_handler(update: Update, context: CallbackContext) -> None:
             )
             if result:
                 sendRequestSubmitted(cmd.upper(), update=update, context=context)
+                scanRequest = cmd.upper().replace(" ", "").replace(">", "_").replace(":","_").replace("_D","").upper()
+                sendSubscriptionOption(update,context,scanRequest)
             return START_ROUTES
         
     if "x_" in cmd or "b_" in cmd or "g_" in cmd:
-        shareUpdateWithChannel(update=update, context=context)
+        shareUpdateWithChannel(update=update, context=context,optionChoices=msg)
         selection = cmd.split("_")
         if len(selection) == 2:
             m0.renderForMenu(
@@ -1568,14 +1668,16 @@ def command_handler(update: Update, context: CallbackContext) -> None:
                 )
                 if result:
                     sendRequestSubmitted(cmd.upper(), update=update, context=context)
+                    scanRequest = cmd.upper().replace(" ", "").replace(">", "_").replace(":","_").replace("_D","").upper()
+                    sendSubscriptionOption(update,context,scanRequest)
                 return START_ROUTES
             elif (
                 "x_" in cmd and selectedMenu.menuKey == "0"
             ):  # a specific stock by name
                 cmdText = "For option 0 <Screen stocks by the stock name>, please type in the command in the following format\n/X_0 SBIN or /X_0_0 SBIN and hit send where SBIN is the NSE stock code.For multiple stocks, you can type in /X_0 SBIN,ICICIBANK,OtherStocks. You can put in any number of stocks separated by space or comma(,)."
                 """Send a message when the command /help is issued."""
-                cmdText = f"{cmdText}\n\nClick /start if you want to restart the session."
-                update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"))
+                cmdText = f"{cmdText}\nClick /start if you want to restart the session."
+                update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"),reply_markup=default_markup(user=user),parse_mode="HTML")
                 return START_ROUTES
             cmds = m2.renderForMenu(
                 selectedMenu=selectedMenu,
@@ -1587,8 +1689,8 @@ def command_handler(update: Update, context: CallbackContext) -> None:
                 cmdText = (
                     f"{cmdText}\n\n{cmd.commandTextKey()} for {cmd.commandTextLabel()}"
                 )
-            cmdText = f"{cmdText}\n\nClick /start if you want to restart the session."
-            update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"))
+            cmdText = f"{cmdText}\nClick /start if you want to restart the session."
+            update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"),reply_markup=default_markup(user=user),parse_mode="HTML")
             return START_ROUTES
         elif len(selection) == 3:
             m0.renderForMenu(
@@ -1625,8 +1727,8 @@ def command_handler(update: Update, context: CallbackContext) -> None:
                 )
                 for cmd in cmds:
                     cmdText = f"{cmdText}\n\n{cmd.commandTextKey()} for {cmd.commandTextLabel()}"
-                cmdText = f"{cmdText}\n\nClick /start if you want to restart the session."
-                update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"))
+                cmdText = f"{cmdText}\nClick /start if you want to restart the session."
+                update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"),reply_markup=default_markup(user=user),parse_mode="HTML")
                 return START_ROUTES
             else:
                 if selection[2] == "4":  # Last N days
@@ -1683,8 +1785,8 @@ def command_handler(update: Update, context: CallbackContext) -> None:
                         )
                         for cmd in cmds:
                             cmdText = f"{cmdText}\n\n{cmd.commandTextKey()} for {cmd.commandTextLabel()}"
-                        cmdText = f"{cmdText}\n\nClick /start if you want to restart the session."
-                        update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"))
+                        cmdText = f"{cmdText}\nClick /start if you want to restart the session."
+                        update.message.reply_text(sanitiseTexts(f"Choose an option:\n{cmdText}"),reply_markup=default_markup(user=user),parse_mode="HTML")
                         return START_ROUTES
 
             options = ":".join(selection)
@@ -1697,31 +1799,39 @@ def command_handler(update: Update, context: CallbackContext) -> None:
             )
             if result:
                 sendRequestSubmitted(cmd.upper(), update=update, context=context)
+                scanRequest = cmd.upper().replace(" ", "").replace(">", "_").replace(":","_").replace("_D","").upper()
+                sendSubscriptionOption(update,context,scanRequest)
             return START_ROUTES
     if cmd == "y" or cmd == "h":
-        shareUpdateWithChannel(update=update, context=context)
+        shareUpdateWithChannel(update=update, context=context,optionChoices=msg)
         from pkscreener.globals import showSendConfigInfo, showSendHelpInfo
         if cmd == "y":
             showSendConfigInfo(defaultAnswer='Y',user=str(update.message.from_user.id))
         elif cmd == "h":
             showSendHelpInfo(defaultAnswer='Y',user=str(update.message.from_user.id))
-        # result = launchScreener(
-        #     options=f"{cmd.upper()}:",
-        #     user=update.message.from_user,
-        #     context=context,
-        #     optionChoices=cmd.upper(),
-        #     update=update,
-        # )
-        # sendRequestSubmitted(cmd.upper(), update=update, context=context)
         return START_ROUTES
-    update.message.reply_text(sanitiseTexts(f"{cmd.upper()} : Not implemented yet!"))
+    update.message.reply_text(sanitiseTexts(f"{cmd.upper()} : Not implemented yet!"),reply_markup=default_markup(user=user),parse_mode="HTML")
     help_command(update=update, context=context)
 
 
 def sendRequestSubmitted(optionChoices, update, context):
-    menuText = f"Thank you for choosing {optionChoices}. You will receive the notification/results in about 1-2 minutes! \n\nConsider donating to help keep this project going:\nUPI: PKScreener@APL \nor\nhttps://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra"
-    update.message.reply_text(sanitiseTexts(menuText))
-    help_command(update=update, context=context)
+    updateCarrier = None
+    if update is None:
+        return
+    else:
+        if hasattr(update, "callback_query") and update.callback_query is not None:
+            updateCarrier = update.callback_query
+        if hasattr(update, "message") and update.message is not None:
+            updateCarrier = update.message
+        if hasattr(update, "effective_message") and update.effective_message is not None:
+            updateCarrier = update.effective_message
+        if updateCarrier is None:
+            return
+    # Get user that sent /start and log his name
+    user = updateCarrier.from_user
+    menuText = f"Thank you for choosing {optionChoices}. You will receive the notification/results in about 1-2 minutes! \n\nConsider donating to help keep this project going:\nUPI: <a href='https://tinyurl.com/v7h3t233'>PKScreener@APL</a> \nor <a href='https://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra'>sponsor</a>"
+    update.message.reply_text(sanitiseTexts(menuText),reply_markup=default_markup(user=user),parse_mode="HTML")
+    # help_command(update=update, context=context)
     shareUpdateWithChannel(
         update=update, context=context, optionChoices=optionChoices
     )
@@ -1762,15 +1872,16 @@ def help_command(update: Update, context: CallbackContext) -> None:
         asList=True,
         renderStyle=MenuRenderStyle.STANDALONE,
     )
-    cmdText = "\n/otp to generate an OTP to login to PKScreener desktop console\n\n/check UPI_UTR_HERE_After_Making_Payment to share transaction reference number to automatically enable subscription after making payment via UPI"
+    cmdText = "/otp to generate an OTP to login to PKScreener desktop console\n/check UPI_UTR_HERE_After_Making_Payment to share transaction reference number to automatically enable subscription after making payment via UPI"
     for cmd in cmds:
-        cmdText = f"{cmdText}\n\n{cmd.commandTextKey()} for {cmd.commandTextLabel()}"
-    reply_markup = default_markup([])
+        if cmd.menuKey not in TOP_LEVEL_MARKUP_SKIP_MENUS:
+            cmdText = f"{cmdText}\n{cmd.commandTextKey()} : {cmd.commandTextLabel()}"
     
     """Send a message when the command /help is issued."""
     if update is not None and update.message is not None:
         update.message.reply_text(
-            sanitiseTexts(f"You can begin by typing in /start (Recommended) and hit send!\n\nOR\n\nChoose an option:\n{cmdText}\n\nWe recommend you start by clicking on this /start")
+            sanitiseTexts(f"You can begin by typing in /start (Recommended) and hit send!\nOR\nChoose an option:\n{cmdText}\n\nWe recommend you start by clicking on this /start"),
+            reply_markup=default_markup(user=user),parse_mode="HTML"
         )  #  \n\nThis bot restarts every hour starting at 5:30am IST until 10:30pm IST to keep it running on free servers. If it does not respond, please try again in a minutes to avoid the restart duration!
         query = update.message
         message = f"Name: <b>{query.from_user.first_name}</b>, Username:@{query.from_user.username} with ID: <b>@{str(query.from_user.id)}</b> began using the bot!"
@@ -1778,8 +1889,7 @@ def help_command(update: Update, context: CallbackContext) -> None:
             context.bot.send_message(
                 chat_id=int(f"-{Channel_Id}"), text=message, parse_mode="HTML"
             )
-    DBManager().getOTP(user.id,user.username,f"{user.first_name} {user.last_name}",validityIntervalInSeconds=configManager.otpInterval)
-
+    registerUser(user)
 
 def _shouldAvoidResponse(update):
     sentFrom = []
@@ -1957,30 +2067,6 @@ def runpkscreenerbot(availability=True) -> None:
     # ^ means "start of line/string"
     # $ means "end of line/string"
     # So ^ABC$ will only allow 'ABC'
-    # conv_handler = ConversationHandler(
-    #     entry_points=[CommandHandler("start", start),
-    #                   CommandHandler("otp", otp),
-    #                   CommandHandler("check", matchUTR)],
-    #     states={
-    #         START_ROUTES: [
-    #             CallbackQueryHandler(XScanners, pattern="^" + str("CX") + "$"),
-    #             CallbackQueryHandler(XScanners, pattern="^" + str("CB") + "$"),
-    #             CallbackQueryHandler(PScanners, pattern="^" + str("CP") + "$"),
-    #             CallbackQueryHandler(XScanners, pattern="^" + str("CMI_")),
-    #             CallbackQueryHandler(XDevModeHandler, pattern="^" + str("CDV_")),
-    #             # CallbackQueryHandler(XScanners, pattern="^" + str("CG") + "$"),
-    #             CallbackQueryHandler(Level2, pattern="^" + str("CX_")),
-    #             CallbackQueryHandler(Level2, pattern="^" + str("CB_")),
-    #             CallbackQueryHandler(Level2, pattern="^" + str("CP_")),
-    #             CallbackQueryHandler(subscribeToScannerAlerts, pattern="^" + str("SUB_")),
-    #             # CallbackQueryHandler(Level2, pattern="^" + str("CG_")),
-    #             CallbackQueryHandler(end, pattern="^" + str("CZ") + "$"),
-    #             CallbackQueryHandler(start, pattern="^"),
-    #         ],
-    #         END_ROUTES: [],
-    #     },
-    #     fallbacks=[CommandHandler("start", start)],
-    # )
     conv_handler = ConversationHandler(
         entry_points=[CommandHandler("start", start),
                       CommandHandler("otp", otp),
@@ -1997,6 +2083,7 @@ def runpkscreenerbot(availability=True) -> None:
                 CallbackQueryHandler(Level2, pattern="^" + str("CB_")),
                 CallbackQueryHandler(Level2, pattern="^" + str("CP_")),
                 CallbackQueryHandler(subscribeToScannerAlerts, pattern="^" + str("SUB_")),
+                CallbackQueryHandler(viewSubscriptionOptions, pattern="^" + str("VS_")),
                 # CallbackQueryHandler(Level2, pattern="^" + str("CG_")),
                 CallbackQueryHandler(end, pattern="^" + str("CZ") + "$"),
                 CallbackQueryHandler(start, pattern="^"),
@@ -2025,6 +2112,7 @@ def runpkscreenerbot(availability=True) -> None:
     if bot_available:
         # Run the intraday monitor
         initializeIntradayTimer()
+        loadRegisteredUsers()
     # Run the bot until the user presses Ctrl-C
     # application.run_polling(allowed_updates=Update.ALL_TYPES)
     # Start the Bot