Beta

tronx/modules/pastebin.py

@@ -28,28 +28,27 @@
 @app.on_message(gen(["paste", "bin"], allow = ["sudo"]))
 async def paster(_, m: Message):
 	reply = m.reply_to_message
-	m = await app.send_edit(m, "`Pasting to nekobin ...`")
 
-	if reply:
-		text = reply.text
+	if reply and reply.text or reply.caption:
+		text = reply.text or reply.caption
 	elif not reply and app.long(m) > 1:
 		text = m.text.split(None, 1)[1]
-	else:
-		return await app.send_edit(m, "Please reply to a message or give some text after command.", delme=2)
+	elif not reply and app.long(m) == 1:
+		return await app.send_edit(m, "Please reply to a message or give some text after command.", mono=True, delme=4)
 
 	try:
 		async with aiohttp.ClientSession() as session:
 			async with session.post(
-				"https://nekobin.com/api/documents", json={"content": text}, timeout=3
+				"https://www.toptal.com/developers/hastebin/documents", data=text.encode("utf-8"), timeout=3
 			) as response:
-				key = (await response.json())["result"]["key"]
+				key = (await response.json())["key"]
 	except Exception as e:
-		return await app.send_edit(m, "Pasting failed, Try again . . .", delme=2, mono=True)
-		print(e)
+		await app.error(m, e)
+		return await app.send_edit(m, "Pasting failed, Try again later . . .", delme=4, mono=True)
 
 	else:
-		url = f"https://nekobin.com/{key}"
-		reply_text = f"**Nekobin** : [Here]({url})"
+		url = f"https://hastebin.com/raw/{key}"
+		reply_text = f"**Hastebin** : [Click Here]({url})"
 		delete = (True if app.long(m) > 1 and m.command[1] in ["d", "del"] and reply.from_user.is_self else False)
 		if delete:
 			await asyncio.gather(

tronx/modules/tools.py

@@ -68,9 +68,9 @@ async def get_word_links(_, m: Message):
 			return await app.send_edit(m, "Please give some text to search in chat ...")
 
 		else:
-			m = await app.send_edit(m, "Finding word in this chat . . .", mono=True)
 			info = await app.get_history(m.chat.id)
 			query = m.text.split(None, 1)[1]
+			m = await app.send_edit(m, "Finding word in this chat . . .", mono=True)
 			for words in info:
 				if query in words.text:
 					links.append(words.link)

tronx/modules/utils.py

@@ -201,7 +201,6 @@ async def tag_all_users(app, m: Message):
 	async for x in app.iter_chat_members(m.chat.id):
 		if x.user.is_bot is False:
 			text += app.MentionHtml(x.user.id, "\u200b")
-	await m.delete()
 	if reply:
 		await app.send_message(m.chat.id, text, reply_to_message_id=reply.message_id, parse_mode="html")
 	else:

tronx/modules/welcome.py

@@ -25,26 +25,27 @@
 )
 
 
-IgnoreList = []
+IgnoreChat = []
 
 
 
 
-@app.on_message(filters.new_chat_members & filters.group & ~filters.chat(IgnoreList))
+@app.on_message(filters.new_chat_members & filters.group & ~filters.chat(IgnoreChat))
 async def send_welcome(_, m: Message):
 	chat = app.get_welcome(str(m.chat.id))
 	if bool(chat) is True:
 		if chat["file_id"] is None:
-			IgnoreList.append(m.chat.id) # decrease the number of updates per chat
-			return
+			if not m.chat.id in IgnoreChat:
+				IgnoreChat.append(m.chat.id) # decrease the number of updates per chat
+				return
 
 	try:
 		file_id = chat["file_id"] if chat["file_id"] else False
 		caption = chat["caption"] if chat["caption"] else False
-		if file_id and not file_id.startswith("#"):
+		if file_id and not file_id.startswith("#"): # as a text
 			return await app.send_message(m.chat.id, f"{file_id}", reply_to_message_id=m.message_id)
 
-		elif file_id and file_id.startswith("#"):
+		elif file_id and file_id.startswith("#"): # as a file id 
 			file_id = file_id.replace("#", "")
 
 		if caption:
@@ -68,7 +69,9 @@ async def send_welcome(_, m: Message):
 
 @app.on_message(gen(["setwelcome", "setwc"], allow = ["sudo", "channel"]))
 async def save_welcome(_, m: Message):
-	await app.private(m)
+	if await app.private(m):
+		return
+
 	await app.send_edit(m, "Setting this media as a welcome message . . .", mono=True)
 	reply = m.reply_to_message
 	if reply:
@@ -84,7 +87,7 @@ async def save_welcome(_, m: Message):
 					app.set_welcome(str(m.chat.id), "#" + file_id)
 				await app.send_edit(m, "Added this media to welcome message . . .", delme=2, mono=True)
 			elif bool(reply.media) is False:
-				app.set_welcome(str(m.chat.id), reply.text)
+				app.set_welcome(str(m.chat.id), reply.text.markdown)
 				await app.send_edit(m, "Added this text to welcome message . . .", delme=2, mono=True)
 		except Exception as e:
 			await app.error(m, e)
@@ -97,7 +100,9 @@ async def save_welcome(_, m: Message):
 
 @app.on_message(gen(["delwelcome", "delwc"], allow = ["sudo", "channel"]))
 async def delete_welcome(_, m: Message):
-	await app.private(m)
+	if await app.private(m):
+		return
+
 	try:
 		await app.send_edit(m, "Checking welcome message for this group . . .", mono=True)
 		app.del_welcome(str(m.chat.id))
@@ -110,7 +115,9 @@ async def delete_welcome(_, m: Message):
 
 @app.on_message(gen(["getwelcome", "getwc"], allow = ["sudo", "channel"]))
 async def delete_welcome(_, m: Message):
-	await app.private(m)
+	if await app.private(m):
+		return
+
 	try:
 		await app.send_edit(m, "Getting welcome message of this group . . .")
 		data = app.get_welcome(str(m.chat.id))