use: hassattr(), remove dedunant package

Author: lorenzo132

core/utils.py

@@ -655,13 +655,11 @@ def extract_forwarded_attachments(message) -> typing.List[typing.Tuple[str, str]
     List[Tuple[str, str]]
         List of (url, filename) tuples for attachments.
     """
-    import discord
-
     attachments = []
     try:
-        if getattr(message, "message_snapshots", None):
+        if hasattr(message, "message_snapshots") and message.message_snapshots:
             for snap in message.message_snapshots:
-                if getattr(snap, "attachments", None):
+                if hasattr(snap, "attachments") and snap.attachments:
                     for a in snap.attachments:
                         url = getattr(a, "url", None)
                         filename = getattr(a, "filename", "Unknown")
@@ -686,15 +684,12 @@ def extract_forwarded_content(message) -> typing.Optional[str]:
     Optional[str]
         The extracted forwarded content, or None if not a forwarded message.
     """
-    import discord
-
     try:
         # Handle multi-forward (message_snapshots)
         # Check directly for snapshots as flags.has_snapshot can be unreliable in some versions
-        if getattr(message, "message_snapshots", None):
+        if hasattr(message, "message_snapshots") and message.message_snapshots:
             forwarded_parts = []
             for snap in message.message_snapshots:
-                author = getattr(snap, "author", None)
                 # If author is missing, we can try to rely on the container message context or just omit.
                 # Since we can't reliably get the original author from snapshot in this state, we focus on content.
 
@@ -707,7 +702,7 @@ def extract_forwarded_content(message) -> typing.Optional[str]:
                         snap_content = snap_content[:497] + "..."
                     formatted_part += "\n".join([f"{line}" for line in snap_content.splitlines()]) + "\n"
 
-                if getattr(snap, "embeds", None):
+                if hasattr(snap, "embeds") and snap.embeds:
                     for embed in snap.embeds:
                         if hasattr(embed, "description") and embed.description:
                             embed_desc = embed.description
@@ -718,26 +713,25 @@ def extract_forwarded_content(message) -> typing.Optional[str]:
                             )
                             break  # One embed preview is usually enough
 
-                if getattr(snap, "attachments", None):
-                    attachment_links = []
+                if hasattr(snap, "attachments") and snap.attachments:
+                    attachment_urls = []
                     for a in snap.attachments[:3]:
-                        filename = getattr(a, "filename", "Unknown")
                         url = getattr(a, "url", None)
                         if url:
-                            url = url.split("?")[0]
-                            attachment_links.append(f"[{filename}]({url})")
-                        else:
-                            attachment_links.append(filename)
+                            # Use direct URL for proper embedding in logviewer
+                            attachment_urls.append(url.split("?")[0])
                     if len(snap.attachments) > 3:
-                        attachment_links.append(f"(+{len(snap.attachments) - 3} more)")
-                    formatted_part += f"📎 {', '.join(attachment_links)}\n"
+                        formatted_part += f"📎 (+{len(snap.attachments) - 3} more attachments)\n"
+                    # Add URLs on separate lines for proper embedding
+                    for url in attachment_urls:
+                        formatted_part += f"{url}\n"
                 forwarded_parts.append(formatted_part)
 
             if forwarded_parts:
                 return "\n".join(forwarded_parts)
 
         # Handle single-message forward
-        elif getattr(message, "type", None) == getattr(discord.MessageType, "forward", None):
+        elif hasattr(message, "type") and message.type == getattr(discord.MessageType, "forward", None):
             ref = getattr(message, "reference", None)
             if (
                 ref
@@ -755,26 +749,27 @@ def extract_forwarded_content(message) -> typing.Optional[str]:
                             if len(ref_content) > 500:
                                 ref_content = ref_content[:497] + "..."
                             return f"**{ref_author_name}:** {ref_content}"
-                        elif getattr(ref_msg, "embeds", None):
+                        elif hasattr(ref_msg, "embeds") and ref_msg.embeds:
                             for embed in ref_msg.embeds:
                                 if hasattr(embed, "description") and embed.description:
                                     embed_desc = embed.description
                                     if len(embed_desc) > 300:
                                         embed_desc = embed_desc[:297] + "..."
                                     return f"**{ref_author_name}:** {embed_desc}"
-                        elif getattr(ref_msg, "attachments", None):
-                            attachment_links = []
+                        elif hasattr(ref_msg, "attachments") and ref_msg.attachments:
+                            attachment_urls = []
                             for a in ref_msg.attachments[:3]:
-                                filename = getattr(a, "filename", "Unknown")
                                 url = getattr(a, "url", None)
                                 if url:
-                                    url = url.split("?")[0]
-                                    attachment_links.append(f"[{filename}]({url})")
-                                else:
-                                    attachment_links.append(filename)
+                                    # Use direct URL for proper embedding in logviewer
+                                    attachment_urls.append(url.split("?")[0])
+                            result = f"**{ref_author_name}:** 📎\n"
                             if len(ref_msg.attachments) > 3:
-                                attachment_links.append(f"(+{len(ref_msg.attachments) - 3} more)")
-                            return f"**{ref_author_name}:** 📎 {', '.join(attachment_links)}"
+                                result += f"(+{len(ref_msg.attachments) - 3} more attachments)\n"
+                            # Add URLs on separate lines for proper embedding
+                            for url in attachment_urls:
+                                result += f"{url}\n"
+                            return result
                 except Exception as e:
                     # Log and continue; failing to extract a reference preview shouldn't break flow
                     logger.debug("Failed to extract reference preview: %s", e)