eriks/erepublik-discord_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deduplicate messages about battle end

Browse Source
This commit is contained in:
KEriks 2021-08-10 09:13:39 +03:00
parent 16ec131aef
commit 5493b2d9a4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dbot/discord_bot.py
View File

@ -142,8 +142,10 @@ class MyClient(discord.Client):
__link = values["link"] __link = values["link"]
entry_link = __link if __link.startswith("http") else f"https://www.erepublik.com{__link}" entry_link = __link if __link.startswith("http") else f"https://www.erepublik.com{__link}"
logger.debug(kind.format.format(**dict(match.groupdict(), **{"current_country": country.name}))) logger.debug(kind.format.format(**dict(match.groupdict(), **{"current_country": country.name})))
is_latvia = country.id == 71
if country.id == 71 or any("Latvia" in v for v in values.values()): has_latvia = any("Latvia" in v for v in values.values())
is_defender = (kind.name == "Region decured" and country.name in values['defender'])
if is_latvia and has_latvia and is_defender:
text = kind.format.format(**dict(match.groupdict(), **{"current_country": country.name})) text = kind.format.format(**dict(match.groupdict(), **{"current_country": country.name}))
title = kind.name title = kind.name
else: else:
@ -159,12 +161,10 @@ class MyClient(discord.Client):
entry_datetime = datetime.datetime.fromtimestamp(entry_ts, pytz.timezone("US/Pacific")) entry_datetime = datetime.datetime.fromtimestamp(entry_ts, pytz.timezone("US/Pacific"))
embed = discord.Embed(title=title, url=entry_link, description=text) embed = discord.Embed(title=title, url=entry_link, description=text)
embed.set_author(name=country.name, icon_url=f"https://www.erepublik.com/images/flags/L/{country.link}.gif") embed.set_author(name=country.name, icon_url=f"https://www.erepublik.com/images/flags/L/{country.link}.gif")
# embed.set_thumbnail(url="https://www.erepublik.net/images/modules/homepage/logo.png")
embed.set_footer(text=f"{entry_datetime.strftime('%F %T')} (eRepublik time)") embed.set_footer(text=f"{entry_datetime.strftime('%F %T')} (eRepublik time)")
logger.debug(f"Message sent: {text}") logger.debug(f"Message sent: {text}")
await self.get_channel(DEFAULT_CHANNEL_ID).send(embed=embed) await self.get_channel(DEFAULT_CHANNEL_ID).send(embed=embed)
# await self.get_channel(DEFAULT_CHANNEL_ID).send(embed=embed)
await asyncio.sleep((self.timestamp // 300 + 1) * 300 - self.timestamp) await asyncio.sleep((self.timestamp // 300 + 1) * 300 - self.timestamp)
except Exception as e: except Exception as e: