backup forwarded content
This commit is contained in:
parent
8563826442
commit
f33a860d5e
1 changed files with 18 additions and 2 deletions
|
|
@ -342,6 +342,7 @@ class DiscordExporter:
|
||||||
thread_msg_count += (t.message_count or 0)
|
thread_msg_count += (t.message_count or 0)
|
||||||
|
|
||||||
output_data = {
|
output_data = {
|
||||||
|
"channelName": channel_name,
|
||||||
"channelID": str(channel_id),
|
"channelID": str(channel_id),
|
||||||
"messageCount": len(messages),
|
"messageCount": len(messages),
|
||||||
"threadCount": thread_count,
|
"threadCount": thread_count,
|
||||||
|
|
@ -478,17 +479,32 @@ class DiscordExporter:
|
||||||
"format": str(s.format).split(".")[-1]
|
"format": str(s.format).split(".")[-1]
|
||||||
})
|
})
|
||||||
|
|
||||||
# Determine message type (Override if it's a thread starter)
|
# Determine message type (Override if it's a thread starter or forward)
|
||||||
msg_type = str(msg.type).split(".")[-1].capitalize()
|
msg_type = str(msg.type).split(".")[-1].capitalize()
|
||||||
if msg.thread:
|
if msg.thread:
|
||||||
msg_type = "ThreadStarter"
|
msg_type = "ThreadStarter"
|
||||||
|
|
||||||
|
# Check for forwarded flags (newer discord.py feature)
|
||||||
|
try:
|
||||||
|
if hasattr(msg.flags, "forwarded") and msg.flags.forwarded:
|
||||||
|
msg_type = "Forward"
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
msg_content = msg.content
|
||||||
|
if msg_type == "Forward" and not msg_content:
|
||||||
|
try:
|
||||||
|
if hasattr(msg, "message_snapshots") and msg.message_snapshots:
|
||||||
|
msg_content = msg.message_snapshots[0].content
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
data = {
|
data = {
|
||||||
"messageID": str(msg.id),
|
"messageID": str(msg.id),
|
||||||
"type": msg_type,
|
"type": msg_type,
|
||||||
"timestamp": msg.created_at.isoformat(),
|
"timestamp": msg.created_at.isoformat(),
|
||||||
"isPinned": msg.pinned,
|
"isPinned": msg.pinned,
|
||||||
"content": msg.content,
|
"content": msg_content,
|
||||||
"userID": user_id,
|
"userID": user_id,
|
||||||
"attachments": attachments,
|
"attachments": attachments,
|
||||||
"embeds": [e.to_dict() for e in msg.embeds],
|
"embeds": [e.to_dict() for e in msg.embeds],
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue