Skip to content

fix: upload loopback image URLs as Discord attachments #9762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wcqqq1214 wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −7
Open

fix: upload loopback image URLs as Discord attachments #9762

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions astrbot/core/platform/sources/discord/discord_platform_event.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import asyncio
from collections.abc import AsyncGenerator
from io import BytesIO
from ipaddress import ip_address
from pathlib import Path
from typing import cast
from urllib.parse import urlparse

import discord
from discord.types.interactions import ComponentInteractionData
Expand Down Expand Up @@ -163,13 +165,30 @@ async def _parse_to_discord(
continue

if file_content.startswith("http"):
logger.debug(
"[Discord] 处理 URL 图片: %s",
describe_media_ref(file_content),
)
embed = discord.Embed().set_image(url=file_content)
embeds.append(embed)
continue
host = None
try:
host = urlparse(file_content).hostname
except ValueError:
pass
is_unreachable = False
if host:
if host == "localhost":
is_unreachable = True
else:
try:
is_unreachable = ip_address(
host.strip("[]")
).is_loopback
except ValueError:
pass
if not is_unreachable:
logger.debug(
"[Discord] 处理 URL 图片: %s",
describe_media_ref(file_content),
)
embed = discord.Embed().set_image(url=file_content)
embeds.append(embed)
continue

image_data = await MediaResolver(
file_content,
Expand Down
Loading