github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge #7353: [discord] fix "parent" keyword inconsistency (#7341)

Browse Source
This commit is contained in:
Mike Fährmann
2025-04-12 16:57:49 +02:00
parent 8eba4e6434 a27bcf6bbb
commit 81ff0219a1
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gallery_dl/extractor/discord.py
View File

@@ -49,7 +49,10 @@ class DiscordExtractor(Extractor):
text_content.append(field.get("name", "")) text_content.append(field.get("name", ""))
text_content.append(field.get("value", "")) text_content.append(field.get("value", ""))
text_content.append(embed.get("footer", {}).get("text", "")) try:
text_content.append(embed["footer"]["text"])
except Exception:
pass
if message.get("poll"): if message.get("poll"):
text_content.append(message["poll"]["question"]["text"]) text_content.append(message["poll"]["question"]["text"])
@@ -224,10 +227,12 @@ class DiscordExtractor(Extractor):
return self.server_metadata return self.server_metadata
def build_server_and_channels(self, server_id): def build_server_and_channels(self, server_id):
server = self.api.get_server(server_id) self.parse_server(self.api.get_server(server_id))
self.parse_server(server)
for channel in self.api.get_server_channels(server_id): for channel in sorted(
self.api.get_server_channels(server_id),
key=lambda ch: ch["type"] != 4
):
self.parse_channel(channel) self.parse_channel(channel)
@@ -353,7 +358,8 @@ class DiscordAPI():
"limit": MESSAGES_BATCH, "limit": MESSAGES_BATCH,
"before": before "before": before
}) })
before = messages[-1]["id"] if messages:
before = messages[-1]["id"]
return messages return messages
return self._pagination(_method, MESSAGES_BATCH) return self._pagination(_method, MESSAGES_BATCH)