↪ forward support for медиа

Author: bth123

cogs/mod/auto_threads.py

@@ -1,12 +1,15 @@
 import discord
 from discord.ext import commands
-from discord import app_commands
+
 from settings import MEDIA_CHANNEL_ID, FB_IDEAS_CHANNEL_ID
+from asyncio import sleep
 from re import sub
 
+
 class AutoThreads(commands.Cog):
 	def __init__(self, bot):
 		self.bot = bot
+		self.waiting_for_forward_comment = False
 
 	@commands.Cog.listener("on_message")
 	async def auto_threads(self, msg):
@@ -15,17 +18,35 @@ async def auto_threads(self, msg):
 		if msg.author.bot:
 			return
 		if msg.channel.id == FB_IDEAS_CHANNEL_ID and "https://discord.com/channels/1138536747932864532" in msg.content:
-			print("hi")
 			await create_auto_thread(msg) 
-		elif msg.channel.id == MEDIA_CHANNEL_ID and (msg.attachments != [] or "https://" in msg.content or "http://" in msg.content):
-			print(msg.channel.id == MEDIA_CHANNEL_ID) 
-			await create_auto_thread(msg)
+		if msg.channel.id == MEDIA_CHANNEL_ID:
+			if (msg.attachments != [] or "https://" in msg.content or "http://" in msg.content):
+				await create_auto_thread(msg)
+			elif msg.flags.forwarded:
+				self.waiting_for_forward_comment = True
+				await self.handle_forward(msg)
+			elif not self.waiting_for_forward_comment:
+				await msg.delete()
+				await msg.channel.send(f"{msg.author.mention} Обсуждайте в ветках!", delete_after=3)
 		else:
 			await msg.delete()
 			await msg.channel.send(f"{msg.author.mention} Обсуждайте в ветках!", delete_after=3)
 
-async def create_auto_thread(msg):
-	content = sub(r"https?:\/\/\S+", "", msg.content)
+	async def handle_forward(self, msg):
+		end_msg = msg
+		msg_content = msg.message_snapshots[0].content
+		await sleep(0.7)
+		self.waiting_for_forward_comment = False
+		if msg.channel.last_message_id != msg.id:
+			end_msg = await msg.channel.fetch_message(msg.channel.last_message_id)
+			if not msg_content:
+				msg_content = end_msg.content
+		await create_auto_thread(end_msg, msg_content)
+
+
+async def create_auto_thread(msg, msg_content=None):
+	msg_content = msg_content if msg_content else msg.content
+	content = sub(r"https?:\/\/\S+", "", msg_content)
 	thread_name = content[:97]
 	if len(thread_name) == 97:
 		thread_name += "..."
@@ -34,4 +55,3 @@ async def create_auto_thread(msg):
 	except discord.errors.HTTPException:
 		channel_name = sub(r"[^\w-]*", "", msg.channel.name)
 		await msg.create_thread(name=f"Обсуждение {channel_name} {msg.author.display_name}")
-		

utils/__init__.py

@@ -0,0 +1,10 @@
+from utils.fake_user import fake_send
+from utils.general import handle_errors
+from utils.msg_utils import get_msg_by_id_arg, split_msg, user_from_embed, Emojis
+from utils.pack_generator import Templates, PGenerator, Modals
+from utils.packmcmeta import update_mcmeta_info, get_mcmeta_ver
+from utils.shortcuts import no_color, no_ping
+from utils.time import get_secs
+from utils.tree_gen import generate_tree
+from utils.users_db import DB
+from utils.validator import validate, is_valid_image, all_valid, closest_match

utils/msg_utils.py

@@ -13,7 +13,7 @@ async def get_msg_by_id_arg(self, ctx, bot, arg:str):
 	except Exception as e:
 		return e
 
-# Thx bing/copilot 😘
+
 def split_msg(s):
 	MAX_LENGTH = 2000
 	blocks = split(r'(```.*?```)', s, flags=DOTALL)