TheHamkerCat 5 rokov pred
rodič
commit
21fabaa8ed
3 zmenil súbory, kde vykonal 33 pridanie a 27 odobranie
  1. 2 0
      wbb/modules/chatbot.py
  2. 4 1
      wbb/modules/notes.py
  3. 27 26
      wbb/modules/paste.py

+ 2 - 0
wbb/modules/chatbot.py

@@ -109,6 +109,8 @@ async def chatbot_talk(_, message: Message):
         return
     if not message.reply_to_message:
         return
+    if not message.reply_to_message.from_user:
+        return
     if message.reply_to_message.from_user.id != BOT_ID:
         return
     await type_and_send(message)

+ 4 - 1
wbb/modules/notes.py

@@ -87,7 +87,10 @@ async def get_notes(_, message):
 
 
 @app.on_message(
-    filters.regex(r"^#.+") & ~filters.edited & ~filters.private
+    filters.regex(r"^#.+")
+    & filters.text
+    & ~filters.edited 
+    & ~filters.private
 )
 @capture_err
 async def get_one_note(_, message):

+ 27 - 26
wbb/modules/paste.py

@@ -60,33 +60,34 @@ async def isPreviewUp(preview: str) -> bool:
 @app.on_message(filters.command("paste") & ~filters.edited)
 @capture_err
 async def paste_func(_, message):
-    if message.reply_to_message:
-        m = await message.reply_text("Pasting...")
-        if message.reply_to_message.text:
-            content = str(message.reply_to_message.text)
-
-        elif message.reply_to_message.document:
-            document = message.reply_to_message.document
-            if document.file_size > 1048576:
-                return await m.edit(
-                    "You can only paste files smaller than 1MB."
-                )
-            if not pattern.search(document.mime_type):
-                return await m.edit("Only text files can be pasted.")
-            doc = await message.reply_to_message.download()
-            async with aiofiles.open(doc, mode="r") as f:
-                content = await f.read()
-            os.remove(doc)
-        link = await paste(content)
-        preview = link + "/preview.png"
-        button = InlineKeyboard(row_width=1)
-        button.add(InlineKeyboardButton(text="Paste Link", url=link))
+    if not message.reply_to_message:
+        return await message.reply_text("Reply To A Message With /paste")
+    m = await message.reply_text("Pasting...")
+    if message.reply_to_message.text:
+        content = str(message.reply_to_message.text)
+    elif message.reply_to_message.document:
+        document = message.reply_to_message.document
+        if document.file_size > 1048576:
+            return await m.edit(
+                "You can only paste files smaller than 1MB."
+            )
+        if not pattern.search(document.mime_type):
+            return await m.edit("Only text files can be pasted.")
+        doc = await message.reply_to_message.download()
+        async with aiofiles.open(doc, mode="r") as f:
+            content = await f.read()
+        os.remove(doc)
+    link = await paste(content)
+    preview = link + "/preview.png"
+    button = InlineKeyboard(row_width=1)
+    button.add(InlineKeyboardButton(text="Paste Link", url=link))
 
-        if await isPreviewUp(preview):
+    if await isPreviewUp(preview):
+        try:
             await message.reply_photo(
                 photo=preview, quote=False, reply_markup=button
             )
-            return await m.delete()
-        await m.edit(link)
-    else:
-        await message.reply_text("Reply To A Message With /paste")
+            await m.delete()
+        except Exception:
+            pass
+    return await m.edit(link)