TheLovinator/discord-rss-bot
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make code shorter

Browse Source
This commit is contained in:
Joakim Hellsén
2022-12-28 17:38:31 +01:00
parent 4f17aba177
commit e598455836
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
discord_rss_bot/feeds.py
View File

@ -74,15 +74,10 @@ def send_to_discord(custom_reader: Reader | None = None, feed=None, do_once=Fals
webhook_message: str = f":robot: :mega: {entry.title}\n{entry.link}" webhook_message: str = f":robot: :mega: {entry.title}\n{entry.link}"
webhook: DiscordWebhook = DiscordWebhook(url=webhook_url, content=webhook_message, rate_limit_retry=True) webhook: DiscordWebhook = DiscordWebhook(url=webhook_url, content=webhook_message, rate_limit_retry=True)
blacklisted: bool = should_be_skipped(reader, entry)
whitelisted: bool = should_be_sent(reader, entry)
if_whitelist_tags: bool = has_white_tags(reader, feed)
# Check if the entry has a whitelist # Check if the entry has a whitelist
if if_whitelist_tags: if has_white_tags(reader, feed):
# Only send the entry if it is whitelisted, otherwise, mark it as read and continue. # Only send the entry if it is whitelisted, otherwise, mark it as read and continue.
if whitelisted: if should_be_sent(reader, entry):
response: Response = webhook.execute() response: Response = webhook.execute()
reader.set_entry_read(entry, True) # type: ignore reader.set_entry_read(entry, True) # type: ignore
if not response.ok: if not response.ok:
@ -93,7 +88,7 @@ def send_to_discord(custom_reader: Reader | None = None, feed=None, do_once=Fals
continue continue
# Check if the entry is blacklisted, if it is, mark it as read and continue. # Check if the entry is blacklisted, if it is, mark it as read and continue.
if blacklisted: if should_be_skipped(reader, entry):
print(f"Blacklisted entry: {entry.title}, not sending to Discord.") print(f"Blacklisted entry: {entry.title}, not sending to Discord.")
reader.set_entry_read(entry, True) # type: ignore reader.set_entry_read(entry, True) # type: ignore
continue continue