I hate filters

4 files changed, 20 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index 083c59f..fea5da0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -134,4 +134,5 @@ dmypy.json
 
 FunnyPineappleBot.service
 config.py
-samples.txt
\ No newline at end of file
+samples.txt
+tmp/
\ No newline at end of file
diff --git a/handlers/gif.py b/handlers/gif.py
index 3961502..caf025c 100644
--- a/handlers/gif.py
+++ b/handlers/gif.py
@@ -9,10 +9,25 @@ from shared.instances import dp
 
 @dp.message_handler(
     filters.Command("gif", ignore_caption=False),
-    content_types=[t.ContentType.PHOTO, t.ContentType.DOCUMENT, t.ContentType.TEXT],
-    commands=["gif"]
+    content_types=[t.ContentType.PHOTO, t.ContentType.DOCUMENT],
 )
-async def высрать_гиф(msg: t.Message):
+async def высрать_гифку_по_фото(msg: t.Message):
+    await скачать_файл(msg)
+    with open("tmp/gif.mp4", "rb") as file:
+        await msg.reply_animation(file, caption=получить_говно())
+
+
+@dp.message_handler(
+    commands=["gif"],
+    content_types=[t.ContentType.TEXT],
+)
+async def высрать_гифку_по_ответу(msg: t.Message):
+    await скачать_файл(msg)
+    with open("tmp/gif.mp4", "rb") as file:
+        await msg.reply_animation(file, caption=получить_говно())
+
+
+async def скачать_файл(msg: t.Message):
     tmp = "tmp/"
     inp = tmp + "gif.jpg"
     out = tmp + "gif.mp4"
@@ -36,6 +51,3 @@ async def высрать_гиф(msg: t.Message):
         return
 
     run(f"ffmpeg -loglevel quiet -y -i {inp} {out}")
-
-    with open(out, "rb") as file:
-        await msg.reply_animation(file, caption=получить_говно())
diff --git a/tmp/gif.jpg b/tmp/gif.jpg
deleted file mode 100644
index 194c251..0000000
--- a/tmp/gif.jpg
+++ /dev/null
diff --git a/tmp/gif.mp4 b/tmp/gif.mp4
deleted file mode 100644
index e69de29..0000000
--- a/tmp/gif.mp4
+++ /dev/null