From 4da802bf64b4cb0bddf6b20710d246b19d596c87 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Wed, 12 Jun 2024 15:22:47 +0530
Subject: [PATCH 01/21] Update config.py
---
config.py | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/config.py b/config.py
index 1328158a..64e14bfa 100644
--- a/config.py
+++ b/config.py
@@ -15,22 +15,22 @@
TG_BOT_TOKEN = os.environ.get("TG_BOT_TOKEN", "")
-APP_ID = int(os.environ.get("APP_ID", ""))
-API_HASH = os.environ.get("API_HASH", "")
+APP_ID = int(os.environ.get("APP_ID", "1949389"))
+API_HASH = os.environ.get("API_HASH", "b6866140cf6064d6c27de44915015879")
-OWNER = os.environ.get("OWNER", "") #Owner username
-OWNER_ID = int(os.environ.get("OWNER_ID", "")) #Owner user id
-DB_URL = os.environ.get("DB_URL", "")
-DB_NAME = os.environ.get("DB_NAME", "madflixbotz")
+OWNER = os.environ.get("OWNER", "@Minato2op") #Owner username
+OWNER_ID = int(os.environ.get("OWNER_ID", "1308086294")) #Owner user id
+DB_URL = os.environ.get("DB_URL", "mongodb+srv://hshhentai:hshhentai@cluster0.vhi4kjp.mongodb.net/?retryWrites=true&w=majority")
+DB_NAME = os.environ.get("DB_NAME", "Cluster0")
-CHANNEL_ID = int(os.environ.get("CHANNEL_ID", ""))
-FORCE_SUB_CHANNEL = int(os.environ.get("FORCE_SUB_CHANNEL", "0"))
-FORCE_SUB_CHANNEL2 = int(os.environ.get("FORCE_SUB_CHANNEL2", "0"))
+CHANNEL_ID = int(os.environ.get("CHANNEL_ID", "-1001766230079"))
+FORCE_SUB_CHANNEL = int(os.environ.get("FORCE_SUB_CHANNEL", "-1002145190977"))
+FORCE_SUB_CHANNEL2 = int(os.environ.get("FORCE_SUB_CHANNEL2", "-1002241322609"))
-SECONDS = int(os.getenv("SECONDS", "600")) # auto delete in seconds
+SECONDS = int(os.getenv("SECONDS", "900")) # auto delete in seconds
@@ -40,17 +40,17 @@
-START_MSG = os.environ.get("START_MESSAGE", "Hello {first}\n\nI can store private files in Specified Channel and other users can access it from special link.")
+START_MSG = os.environ.get("START_MESSAGE", "ʜᴇʟʟᴏ {first}\n\nɪ ᴀᴍ ᴀ ꜰɪʟᴇ ꜱᴛᴏʀᴇʀ ʙᴏᴛ ᴏꜰ ɪᴀꜱ ᴍᴏᴠɪᴇꜱ & ꜱᴇʀɪᴇꜱ, ɪ ꜱᴛᴏʀᴇ ꜰɪʟᴇꜱ ɪɴꜱɪᴅᴇ ᴍᴇ ᴀɴᴅ ʏᴏᴜ ᴄᴀɴ ɢᴇᴛ ᴛʜᴇᴍ ʙʏ ꜱᴏʟᴠɪɴɢ ꜱʜᴏʀᴛᴇɴᴇʀ ꜰʀᴏᴍ ᴏᴜʀ ᴄʜᴀɴɴᴇʟ!\n» @IAS_MOVIESANDSERIES")
try:
- ADMINS=[7085541484]
+ ADMINS=[1308086294 2006429070]
for x in (os.environ.get("ADMINS", "5115691197 6273945163 6103092779 5231212075").split()):
ADMINS.append(int(x))
except ValueError:
raise Exception("Your Admins list does not contain valid integers.")
-FORCE_MSG = os.environ.get("FORCE_SUB_MESSAGE", "Hello {first}\n\nYou need to join in my Channel/Group to use me\n\nKindly Please join Channel")
+FORCE_MSG = os.environ.get("FORCE_SUB_MESSAGE", "𝐒𝐨𝐫𝐫𝐲 {first} 𝐲𝐨𝐮 𝐡𝐚𝐯𝐞 𝐭𝐨 𝐣𝐨𝐢𝐧 𝐦𝐲 𝐜𝐡𝐚𝐧𝐧𝐞𝐥𝐬 𝐟𝐢𝐫𝐬𝐭 𝐭𝐨 𝐚𝐜𝐜𝐞𝐬𝐬 𝐟𝐢𝐥𝐞𝐬...\n\n 𝐒𝐨 𝐩𝐥𝐞𝐚𝐬𝐞 𝐣𝐨𝐢𝐧 𝐦𝐲 𝐜𝐡𝐚𝐧𝐧𝐞𝐥𝐬 𝐟𝐢𝐫𝐬𝐭 𝐚𝐧𝐝 𝐜𝐥𝐢𝐜𝐤 𝐨𝐧 “Try Again” 𝐛𝐮𝐭𝐭𝐨𝐧...!")
CUSTOM_CAPTION = os.environ.get("CUSTOM_CAPTION", None)
@@ -59,10 +59,10 @@
DISABLE_CHANNEL_BUTTON = os.environ.get("DISABLE_CHANNEL_BUTTON", None) == 'True'
BOT_STATS_TEXT = "BOT UPTIME\n{uptime}"
-USER_REPLY_TEXT = "❌Don't send me messages directly I'm only File Share bot !"
+USER_REPLY_TEXT = "Nigha! You Ain't My Owner!!\n\n» My Owner : @Minato2op""
ADMINS.append(OWNER_ID)
-ADMINS.append(7085541484)
+ADMINS.append(1308086294)
LOG_FILE_NAME = "filesharingbot.txt"
From 034754533da33626dd123b58e0e4f466c5b0c699 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Wed, 12 Jun 2024 15:23:54 +0530
Subject: [PATCH 02/21] Update main.py
---
main.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/main.py b/main.py
index 1ff905fd..a7275c47 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +1,7 @@
+import pyrogram.utils
+
+pyrogram.utils.MIN_CHANNEL_ID = -1002241322609
+
from bot import Bot
Bot().run()
From 4511559e614c4ecfad3ab4ef480a1c75aaf46b73 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Wed, 12 Jun 2024 15:26:24 +0530
Subject: [PATCH 03/21] Update app.json
---
app.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app.json b/app.json
index d4861d3a..737090ca 100644
--- a/app.json
+++ b/app.json
@@ -58,12 +58,12 @@
},
"START_MESSAGE": {
"description": "Optional: start message of bot, use HTML parsemode format",
- "value": "Hello {mention}\n\nI Can Store Private Files In Specified Channel And Other Users Can Access It From Special Link.",
+ "value": "ʜᴇʟʟᴏ {first}\n\nɪ ᴀᴍ ᴀ ꜰɪʟᴇ ꜱᴛᴏʀᴇʀ ʙᴏᴛ ᴏꜰ ɪᴀꜱ ᴍᴏᴠɪᴇꜱ & ꜱᴇʀɪᴇꜱ, ɪ ꜱᴛᴏʀᴇ ꜰɪʟᴇꜱ ɪɴꜱɪᴅᴇ ᴍᴇ ᴀɴᴅ ʏᴏᴜ ᴄᴀɴ ɢᴇᴛ ᴛʜᴇᴍ ʙʏ ꜱᴏʟᴠɪɴɢ ꜱʜᴏʀᴛᴇɴᴇʀ ꜰʀᴏᴍ ᴏᴜʀ ᴄʜᴀɴɴᴇʟ!\n» @IAS_MOVIESANDSERIES",
"required": false
},
"FORCE_SUB_MESSAGE": {
"description": "Optional: Force Sub message of bot, use HTML parsemode format",
- "value": "Hello {mention}\n\nYou Need To Join In My Channel To Use Me\n\nKindly Please Join Channel",
+ "value": "𝐒𝐨𝐫𝐫𝐲 {first} 𝐲𝐨𝐮 𝐡𝐚𝐯𝐞 𝐭𝐨 𝐣𝐨𝐢𝐧 𝐦𝐲 𝐜𝐡𝐚𝐧𝐧𝐞𝐥𝐬 𝐟𝐢𝐫𝐬𝐭 𝐭𝐨 𝐚𝐜𝐜𝐞𝐬𝐬 𝐟𝐢𝐥𝐞𝐬...\n\n 𝐒𝐨 𝐩𝐥𝐞𝐚𝐬𝐞 𝐣𝐨𝐢𝐧 𝐦𝐲 𝐜𝐡𝐚𝐧𝐧𝐞𝐥𝐬 𝐟𝐢𝐫𝐬𝐭 𝐚𝐧𝐝 𝐜𝐥𝐢𝐜𝐤 𝐨𝐧 “𝐍𝐨𝐰 𝐂𝐥𝐢𝐜𝐤 𝐡𝐞𝐫𝐞” 𝐛𝐮𝐭𝐭𝐨𝐧...!",
"required": false
},
"ADMINS": {
@@ -78,7 +78,7 @@
},
"SECONDS": {
"description": "auto delete in seconds",
- "value": "600",
+ "value": "900",
"required": false
}
},
From b9cdb2d1cb16518cfc974013b31401d2d275be01 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Wed, 12 Jun 2024 15:34:55 +0530
Subject: [PATCH 04/21] Update cbb.py
---
plugins/cbb.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/cbb.py b/plugins/cbb.py
index a9b51958..4ae7db2f 100644
--- a/plugins/cbb.py
+++ b/plugins/cbb.py
@@ -19,7 +19,7 @@ async def cb_handler(client: Bot, query: CallbackQuery):
data = query.data
if data == "about":
await query.message.edit_text(
- text = f"🤖 My Name : File Sharing Bot \n📝 Language : Python 3 \n📚 Library : Pyrogram {__version__} \n🚀 Server : Heroku \n📢 Channel : Madflix Botz \n🧑💻 Developer : Jishu Developer",
+ text = f"○ ᴏᴡɴᴇʀ : ᴍɪɴᴀᴛᴏ-ꜱᴀᴍᴀ\n○ ᴍᴏᴠɪᴇ ᴄʜᴀɴɴᴇʟ : Channel\n○ ʀᴇQᴜᴇꜱᴛ ɢʀᴏᴜᴘ : Chat\n○ ʙᴀᴄᴋᴜᴘ ᴄʜᴀɴɴᴇʟ : Channel",
disable_web_page_preview = True,
reply_markup = InlineKeyboardMarkup(
[
From 82c71d16bd1801ec130c2499abec927c82a9a6e4 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Wed, 12 Jun 2024 15:41:02 +0530
Subject: [PATCH 05/21] Update start.py
---
plugins/start.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/plugins/start.py b/plugins/start.py
index 19531621..e57bcd00 100644
--- a/plugins/start.py
+++ b/plugins/start.py
@@ -21,7 +21,7 @@
# add time im seconds for waitingwaiting before delete
# 1 minutes = 60, 2 minutes = 60×2=120, 5 minutes = 60×5=300
-SECONDS = int(os.getenv("SECONDS", "600"))
+SECONDS = int(os.getenv("SECONDS", "900"))
@@ -93,10 +93,10 @@ async def start_command(client: Client, message: Message):
except:
pass
- k = await client.send_message(chat_id = message.from_user.id, text=f"❗️ IMPORTANT ❗️\n\nThis video / file will be deleted in 10 minutes (Due to copyright issues).\n\n📌 Please forward this video / file to somewhere else and start downloading there.")
+ k = await client.send_message(chat_id = message.from_user.id, text=f"❗️ IMPORTANT ❗️\n\nThis File Will Be Deleted In 15 minutes (Due To Copyright Issues).\n\n📌 Please Forward This File To Your Saved Messages Or Somewhere Else And Start Downloading There.")
await asyncio.sleep(SECONDS)
await f.delete()
- await k.edit_text("Your video / file is successfully deleted !")
+ await k.edit_text("Your File is Successfully Deleted !")
return
@@ -128,7 +128,7 @@ async def start_command(client: Client, message: Message):
WAIT_MSG = """"Processing ..."""
-REPLY_ERROR = """Use this command as a replay to any telegram message with out any spaces."""
+REPLY_ERROR = """Use this command as a reply to any telegram message with out any spaces."""
#=====================================================================================##
@@ -138,15 +138,15 @@ async def start_command(client: Client, message: Message):
async def not_joined(client: Client, message: Message):
buttons = [
[
- InlineKeyboardButton(text="Join Channel", url=client.invitelink),
- InlineKeyboardButton(text="Join Channel", url=client.invitelink2),
+ InlineKeyboardButton(text="• ᴊᴏɪɴ ᴄʜᴀɴɴᴇʟ •", url=client.invitelink),
+ InlineKeyboardButton(text="• ᴊᴏɪɴ ᴄʜᴀɴɴᴇʟ •", url=client.invitelink2),
]
]
try:
buttons.append(
[
InlineKeyboardButton(
- text = 'Try Again',
+ text = '• ᴛʀʏ ᴀɢᴀɪɴ •',
url = f"https://t.me/{client.username}?start={message.command[1]}"
)
]
@@ -188,7 +188,7 @@ async def send_text(client: Bot, message: Message):
deleted = 0
unsuccessful = 0
- pls_wait = await message.reply("Broadcasting Message.. This will Take Some Time")
+ pls_wait = await message.reply("Broadcasting Message... This Will Take Some Time")
for chat_id in query:
try:
await broadcast_msg.copy(chat_id)
From c3b73b009739a05bfd452ec47f3c9091956c32ca Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Wed, 12 Jun 2024 15:52:58 +0530
Subject: [PATCH 06/21] Update config.py
---
config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.py b/config.py
index 64e14bfa..63145838 100644
--- a/config.py
+++ b/config.py
@@ -59,7 +59,7 @@
DISABLE_CHANNEL_BUTTON = os.environ.get("DISABLE_CHANNEL_BUTTON", None) == 'True'
BOT_STATS_TEXT = "BOT UPTIME\n{uptime}"
-USER_REPLY_TEXT = "Nigha! You Ain't My Owner!!\n\n» My Owner : @Minato2op""
+USER_REPLY_TEXT = "Nigha! You Ain't My Owner!!\n\n» My Owner : @Minato2op"
ADMINS.append(OWNER_ID)
ADMINS.append(1308086294)
From 1900587ea509a0fa322d3600fc11f233e486fb32 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Wed, 12 Jun 2024 15:55:48 +0530
Subject: [PATCH 07/21] Update config.py
---
config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.py b/config.py
index 63145838..b0298df2 100644
--- a/config.py
+++ b/config.py
@@ -43,7 +43,7 @@
START_MSG = os.environ.get("START_MESSAGE", "ʜᴇʟʟᴏ {first}\n\nɪ ᴀᴍ ᴀ ꜰɪʟᴇ ꜱᴛᴏʀᴇʀ ʙᴏᴛ ᴏꜰ ɪᴀꜱ ᴍᴏᴠɪᴇꜱ & ꜱᴇʀɪᴇꜱ, ɪ ꜱᴛᴏʀᴇ ꜰɪʟᴇꜱ ɪɴꜱɪᴅᴇ ᴍᴇ ᴀɴᴅ ʏᴏᴜ ᴄᴀɴ ɢᴇᴛ ᴛʜᴇᴍ ʙʏ ꜱᴏʟᴠɪɴɢ ꜱʜᴏʀᴛᴇɴᴇʀ ꜰʀᴏᴍ ᴏᴜʀ ᴄʜᴀɴɴᴇʟ!\n» @IAS_MOVIESANDSERIES")
try:
- ADMINS=[1308086294 2006429070]
+ ADMINS=[1308086294, 2006429070]
for x in (os.environ.get("ADMINS", "5115691197 6273945163 6103092779 5231212075").split()):
ADMINS.append(int(x))
except ValueError:
From b6b015b9e0528e859bb2ab16d9c863b0b73d0cfe Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Wed, 12 Jun 2024 16:06:40 +0530
Subject: [PATCH 08/21] Update cbb.py
---
plugins/cbb.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/cbb.py b/plugins/cbb.py
index 4ae7db2f..1108ff76 100644
--- a/plugins/cbb.py
+++ b/plugins/cbb.py
@@ -19,7 +19,7 @@ async def cb_handler(client: Bot, query: CallbackQuery):
data = query.data
if data == "about":
await query.message.edit_text(
- text = f"○ ᴏᴡɴᴇʀ : ᴍɪɴᴀᴛᴏ-ꜱᴀᴍᴀ\n○ ᴍᴏᴠɪᴇ ᴄʜᴀɴɴᴇʟ : Channel\n○ ʀᴇQᴜᴇꜱᴛ ɢʀᴏᴜᴘ : Chat\n○ ʙᴀᴄᴋᴜᴘ ᴄʜᴀɴɴᴇʟ : Channel",
+ text = f"○ ᴏᴡɴᴇʀ : ᴍɪɴᴀᴛᴏ-ꜱᴀᴍᴀ\n○ ᴄʜᴀɴɴᴇʟ : ɪᴀꜱ: ᴍᴏᴠɪᴇꜱᴀɴᴅꜱᴇʀɪᴇꜱ\n○ ʙᴀᴄᴋᴜᴘ : ɪᴀꜱ ᴍ&ꜱ ʙᴀᴄᴋᴜ\n○ ɢʀᴏᴜᴘ : ɪᴀꜱ ᴄʜᴀᴛ ɢʀᴏᴜᴘ",
disable_web_page_preview = True,
reply_markup = InlineKeyboardMarkup(
[
From a40a9974e216b3a32c424c5c63e7d67478992c3f Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Wed, 12 Jun 2024 16:39:30 +0530
Subject: [PATCH 09/21] Update cbb.py
---
plugins/cbb.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/cbb.py b/plugins/cbb.py
index 1108ff76..984a6610 100644
--- a/plugins/cbb.py
+++ b/plugins/cbb.py
@@ -19,7 +19,7 @@ async def cb_handler(client: Bot, query: CallbackQuery):
data = query.data
if data == "about":
await query.message.edit_text(
- text = f"○ ᴏᴡɴᴇʀ : ᴍɪɴᴀᴛᴏ-ꜱᴀᴍᴀ\n○ ᴄʜᴀɴɴᴇʟ : ɪᴀꜱ: ᴍᴏᴠɪᴇꜱᴀɴᴅꜱᴇʀɪᴇꜱ\n○ ʙᴀᴄᴋᴜᴘ : ɪᴀꜱ ᴍ&ꜱ ʙᴀᴄᴋᴜ\n○ ɢʀᴏᴜᴘ : ɪᴀꜱ ᴄʜᴀᴛ ɢʀᴏᴜᴘ",
+ text = f"○ ᴏᴡɴᴇʀ : ᴍɪɴᴀᴛᴏ-ꜱᴀᴍᴀ\n○ ᴄʜᴀɴɴᴇʟ : ɪᴀꜱ: ᴍᴏᴠɪᴇꜱᴀɴᴅꜱᴇʀɪᴇꜱ\n○ ʙᴀᴄᴋᴜᴘ : ɪᴀꜱ ᴍ&ꜱ ʙᴀᴄᴋᴜᴘ\n○ ɢʀᴏᴜᴘ : ɪᴀꜱ ᴄʜᴀᴛ ɢʀᴏᴜᴘ",
disable_web_page_preview = True,
reply_markup = InlineKeyboardMarkup(
[
From 40c1147a02bce93d5b0c37d6852fd27acc509362 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Wed, 12 Jun 2024 16:41:24 +0530
Subject: [PATCH 10/21] Update helper_func.py
---
helper_func.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/helper_func.py b/helper_func.py
index b0ff4425..4d351240 100644
--- a/helper_func.py
+++ b/helper_func.py
@@ -113,7 +113,7 @@ async def get_message_id(client, message):
elif message.forward_sender_name:
return 0
elif message.text:
- pattern = "https://t.me/(?:c/)?(.*)/(\d+)"
+ pattern = "https://t.me/(?:c/)?(.*)/(\\d+)"
matches = re.match(pattern,message.text)
if not matches:
return 0
From 184b2955570c0c81ae5507c15aae0e9f9b99c833 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Thu, 13 Jun 2024 16:33:43 +0530
Subject: [PATCH 11/21] Update main.py
---
main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.py b/main.py
index a7275c47..93e255e2 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,6 @@
import pyrogram.utils
-pyrogram.utils.MIN_CHANNEL_ID = -1002241322609
+pyrogram.utils.MIN_CHANNEL_ID = -1009147483647
from bot import Bot
From ca46554b291a3c20eaca23a2224531902c0a199b Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Thu, 13 Jun 2024 17:05:55 +0530
Subject: [PATCH 12/21] Update helper_func.py
---
helper_func.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/helper_func.py b/helper_func.py
index 4d351240..b0ff4425 100644
--- a/helper_func.py
+++ b/helper_func.py
@@ -113,7 +113,7 @@ async def get_message_id(client, message):
elif message.forward_sender_name:
return 0
elif message.text:
- pattern = "https://t.me/(?:c/)?(.*)/(\\d+)"
+ pattern = "https://t.me/(?:c/)?(.*)/(\d+)"
matches = re.match(pattern,message.text)
if not matches:
return 0
From 8cac681edce8731783bacfacc7a930b5b779c6f5 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Thu, 13 Jun 2024 17:56:59 +0530
Subject: [PATCH 13/21] Update config.py
---
config.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.py b/config.py
index b0298df2..a5b91ca5 100644
--- a/config.py
+++ b/config.py
@@ -21,8 +21,8 @@
OWNER = os.environ.get("OWNER", "@Minato2op") #Owner username
OWNER_ID = int(os.environ.get("OWNER_ID", "1308086294")) #Owner user id
-DB_URL = os.environ.get("DB_URL", "mongodb+srv://hshhentai:hshhentai@cluster0.vhi4kjp.mongodb.net/?retryWrites=true&w=majority")
-DB_NAME = os.environ.get("DB_NAME", "Cluster0")
+DB_URL = os.environ.get("DB_URL", "")
+DB_NAME = os.environ.get("DB_NAME", "")
CHANNEL_ID = int(os.environ.get("CHANNEL_ID", "-1001766230079"))
From 1dfd7ac65ce38a24875b378110908bbbf61ee466 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Thu, 13 Jun 2024 20:17:37 +0530
Subject: [PATCH 14/21] Update start.py
---
plugins/start.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/plugins/start.py b/plugins/start.py
index e57bcd00..76150fcf 100644
--- a/plugins/start.py
+++ b/plugins/start.py
@@ -85,12 +85,11 @@ async def start_command(client: Client, message: Message):
reply_markup = None
try:
- f = await msg.copy(chat_id=message.from_user.id, caption = caption, parse_mode = ParseMode.HTML, reply_markup = reply_markup, protect_content=PROTECT_CONTENT)
-
+ await msg.copy(chat_id=message.from_user.id, caption = caption, parse_mode = ParseMode.HTML, reply_markup = reply_markup, protect_content=PROTECT_CONTENT)
+ await asyncio.sleep(0.5)
except FloodWait as e:
await asyncio.sleep(e.x)
- f = await msg.copy(chat_id=message.from_user.id, caption = caption, parse_mode = ParseMode.HTML, reply_markup = reply_markup, protect_content=PROTECT_CONTENT)
-
+ await msg.copy(chat_id=message.from_user.id, caption = caption, parse_mode = ParseMode.HTML, reply_markup = reply_markup, protect_content=PROTECT_CONTENT)
except:
pass
k = await client.send_message(chat_id = message.from_user.id, text=f"❗️ IMPORTANT ❗️\n\nThis File Will Be Deleted In 15 minutes (Due To Copyright Issues).\n\n📌 Please Forward This File To Your Saved Messages Or Somewhere Else And Start Downloading There.")
From 4d48946d3b988a70bda0a768da42bdee79d804f8 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Thu, 13 Jun 2024 20:33:10 +0530
Subject: [PATCH 15/21] Update helper_func.py
---
helper_func.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/helper_func.py b/helper_func.py
index b0ff4425..978fc6d3 100644
--- a/helper_func.py
+++ b/helper_func.py
@@ -113,7 +113,7 @@ async def get_message_id(client, message):
elif message.forward_sender_name:
return 0
elif message.text:
- pattern = "https://t.me/(?:c/)?(.*)/(\d+)"
+ pattern = "https://telegram.me/(?:c/)?(.*)/(\\d+)"
matches = re.match(pattern,message.text)
if not matches:
return 0
From 45f382145fd5b9b9331e208ce4d890df28c17b9a Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Thu, 13 Jun 2024 20:33:48 +0530
Subject: [PATCH 16/21] Update link_generator.py
---
plugins/link_generator.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/link_generator.py b/plugins/link_generator.py
index cd29430a..843c5d3d 100644
--- a/plugins/link_generator.py
+++ b/plugins/link_generator.py
@@ -43,7 +43,7 @@ async def batch(client: Client, message: Message):
string = f"get-{f_msg_id * abs(client.db_channel.id)}-{s_msg_id * abs(client.db_channel.id)}"
base64_string = await encode(string)
- link = f"https://t.me/{client.username}?start={base64_string}"
+ link = f"https://telegram.me/{client.username}?start={base64_string}"
reply_markup = InlineKeyboardMarkup([[InlineKeyboardButton("🔁 Share URL", url=f'https://telegram.me/share/url?url={link}')]])
await second_message.reply_text(f"Here is your link\n\n{link}", quote=True, reply_markup=reply_markup)
@@ -65,7 +65,7 @@ async def link_generator(client: Client, message: Message):
continue
base64_string = await encode(f"get-{msg_id * abs(client.db_channel.id)}")
- link = f"https://t.me/{client.username}?start={base64_string}"
+ link = f"https://telegram.me/{client.username}?start={base64_string}"
reply_markup = InlineKeyboardMarkup([[InlineKeyboardButton("🔁 Share URL", url=f'https://telegram.me/share/url?url={link}')]])
await channel_message.reply_text(f"Here is your link\n\n{link}", quote=True, reply_markup=reply_markup)
@@ -79,4 +79,4 @@ async def link_generator(client: Client, message: Message):
# Don't Remove Credit 🥺
# Telegram Channel @Madflix_Bots
# Backup Channel @JishuBotz
-# Developer @JishuDeveloper
\ No newline at end of file
+# Developer @JishuDeveloper
From 1f0d8dfa71d34412c7f7e33940d4c5a4bb325271 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Thu, 13 Jun 2024 20:58:22 +0530
Subject: [PATCH 17/21] Update start.py
---
plugins/start.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/start.py b/plugins/start.py
index 76150fcf..e8fb6c3f 100644
--- a/plugins/start.py
+++ b/plugins/start.py
@@ -94,7 +94,7 @@ async def start_command(client: Client, message: Message):
pass
k = await client.send_message(chat_id = message.from_user.id, text=f"❗️ IMPORTANT ❗️\n\nThis File Will Be Deleted In 15 minutes (Due To Copyright Issues).\n\n📌 Please Forward This File To Your Saved Messages Or Somewhere Else And Start Downloading There.")
await asyncio.sleep(SECONDS)
- await f.delete()
+ await k.delete()
await k.edit_text("Your File is Successfully Deleted !")
From 856a619950d30366c9b6e458bb0d6e9a1bab2246 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Thu, 13 Jun 2024 21:15:18 +0530
Subject: [PATCH 18/21] Update start.py
---
plugins/start.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/start.py b/plugins/start.py
index e8fb6c3f..450e313b 100644
--- a/plugins/start.py
+++ b/plugins/start.py
@@ -85,16 +85,16 @@ async def start_command(client: Client, message: Message):
reply_markup = None
try:
- await msg.copy(chat_id=message.from_user.id, caption = caption, parse_mode = ParseMode.HTML, reply_markup = reply_markup, protect_content=PROTECT_CONTENT)
+ f=await msg.copy(chat_id=message.from_user.id, caption = caption, parse_mode = ParseMode.HTML, reply_markup = reply_markup, protect_content=PROTECT_CONTENT)
await asyncio.sleep(0.5)
except FloodWait as e:
await asyncio.sleep(e.x)
- await msg.copy(chat_id=message.from_user.id, caption = caption, parse_mode = ParseMode.HTML, reply_markup = reply_markup, protect_content=PROTECT_CONTENT)
+ f=await msg.copy(chat_id=message.from_user.id, caption = caption, parse_mode = ParseMode.HTML, reply_markup = reply_markup, protect_content=PROTECT_CONTENT)
except:
pass
k = await client.send_message(chat_id = message.from_user.id, text=f"❗️ IMPORTANT ❗️\n\nThis File Will Be Deleted In 15 minutes (Due To Copyright Issues).\n\n📌 Please Forward This File To Your Saved Messages Or Somewhere Else And Start Downloading There.")
await asyncio.sleep(SECONDS)
- await k.delete()
+ await f.delete()
await k.edit_text("Your File is Successfully Deleted !")
From 32c90ff82342731754ef044b2fd4622362438a4f Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Fri, 14 Jun 2024 10:13:50 +0530
Subject: [PATCH 19/21] Update start.py
---
plugins/start.py | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/plugins/start.py b/plugins/start.py
index 450e313b..1f4c53cd 100644
--- a/plugins/start.py
+++ b/plugins/start.py
@@ -92,12 +92,7 @@ async def start_command(client: Client, message: Message):
f=await msg.copy(chat_id=message.from_user.id, caption = caption, parse_mode = ParseMode.HTML, reply_markup = reply_markup, protect_content=PROTECT_CONTENT)
except:
pass
- k = await client.send_message(chat_id = message.from_user.id, text=f"❗️ IMPORTANT ❗️\n\nThis File Will Be Deleted In 15 minutes (Due To Copyright Issues).\n\n📌 Please Forward This File To Your Saved Messages Or Somewhere Else And Start Downloading There.")
- await asyncio.sleep(SECONDS)
- await f.delete()
- await k.edit_text("Your File is Successfully Deleted !")
-
-
+
return
else:
reply_markup = InlineKeyboardMarkup(
From 29e12c2680d0bbf01990f89522d3c55e1ddbb804 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Mon, 8 Jul 2024 18:54:58 +0530
Subject: [PATCH 20/21] Update channel_post.py
---
plugins/channel_post.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/channel_post.py b/plugins/channel_post.py
index cb8cd180..d09cb643 100644
--- a/plugins/channel_post.py
+++ b/plugins/channel_post.py
@@ -32,7 +32,7 @@ async def channel_post(client: Client, message: Message):
converted_id = post_message.id * abs(client.db_channel.id)
string = f"get-{converted_id}"
base64_string = await encode(string)
- link = f"https://t.me/{client.username}?start={base64_string}"
+ link = f"https://telegram.me/{client.username}?start={base64_string}"
reply_markup = InlineKeyboardMarkup([[InlineKeyboardButton("🔁 Share URL", url=f'https://telegram.me/share/url?url={link}')]])
@@ -54,7 +54,7 @@ async def new_post(client: Client, message: Message):
converted_id = message.id * abs(client.db_channel.id)
string = f"get-{converted_id}"
base64_string = await encode(string)
- link = f"https://t.me/{client.username}?start={base64_string}"
+ link = f"https://telegram.me/{client.username}?start={base64_string}"
reply_markup = InlineKeyboardMarkup([[InlineKeyboardButton("🔁 Share URL", url=f'https://telegram.me/share/url?url={link}')]])
try:
await message.edit_reply_markup(reply_markup)
@@ -71,4 +71,4 @@ async def new_post(client: Client, message: Message):
# Don't Remove Credit 🥺
# Telegram Channel @Madflix_Bots
# Backup Channel @JishuBotz
-# Developer @JishuDeveloper
\ No newline at end of file
+# Developer @JishuDeveloper
From 9ccda48be798a80e4568afac1cf694217d982768 Mon Sep 17 00:00:00 2001
From: Minato86-dev <79691253+Minato86-dev@users.noreply.github.com>
Date: Mon, 8 Jul 2024 18:56:51 +0530
Subject: [PATCH 21/21] Update main.py
---
main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.py b/main.py
index 93e255e2..a7275c47 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,6 @@
import pyrogram.utils
-pyrogram.utils.MIN_CHANNEL_ID = -1009147483647
+pyrogram.utils.MIN_CHANNEL_ID = -1002241322609
from bot import Bot