Skip to content

Commit de09bf2

Browse files
authored
Merge pull request #162 from satisfactorymodding/bork-fixes
2.23.1 - Fixes for some problems preventing log parse
2 parents 219dfcf + cae88ab commit de09bf2

File tree

4 files changed

+210
-203
lines changed

4 files changed

+210
-203
lines changed

fred/cogs/crashes.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ def formatted_chunks_of_100_mod_references() -> Generator[str, None, None]:
145145
for mod in queried_mods:
146146
mod_name = mod["name"]
147147
mod_compat = mod["compatibility"]
148+
if mod_compat is None:
149+
continue # we have no way of knowing
148150
compat_info = mod_compat.get("EA") or mod_compat.get("EXP")
149151
mod_latest_version = Version.parse(mod["versions"][0]["version"])
150152

@@ -391,7 +393,8 @@ async def process_message(self, message: Message) -> bool:
391393
embed = createembed.crashes(filtered_responses)
392394
embed.set_author(
393395
name=f"Automated responses for {message.author.global_name or message.author.display_name} ({message.author.id})",
394-
icon_url=message.author.avatar.url,
396+
icon_url=message.author.avatar and message.author.avatar.url,
397+
# defaults to None if no avatar, like mircea
395398
)
396399
await self.bot.reply_to_msg(message, embed=embed, propagate_reply=False)
397400
return True

fred/fred.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,18 +180,20 @@ async def send_DM(
180180
self.logger.info("The user refuses to have DMs sent to them")
181181
return False
182182

183-
if not user.dm_channel:
184-
await user.create_dm()
185-
186183
try:
184+
185+
if not user.dm_channel:
186+
await user.create_dm()
187+
187188
if not embed:
188189
embed = createembed.DM(content)
189190
content = None
191+
190192
await user.dm_channel.send(content=content, embed=embed, **kwargs)
191193
return True
192194
except Exception: # noqa
193195
self.logger.error(f"DMs: Failed to DM, reason: \n{traceback.format_exc()}")
194-
return False
196+
return False
195197

196198
async def checked_DM(self, user: nextcord.User, **kwargs) -> bool:
197199
user_meta = config.Users.create_if_missing(user)

fred/libraries/createembed.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,9 @@ async def webp_icon_as_png(url: str, bot: Bot) -> tuple[nextcord.File, str]:
336336

337337

338338
# SMR Lookup Embed Formats
339-
async def mod_embed(name: str, bot: Bot, using_id = False) -> tuple[nextcord.Embed | None, nextcord.File | None, list[dict] | None]:
339+
async def mod_embed(
340+
name: str, bot: Bot, using_id=False
341+
) -> tuple[nextcord.Embed | None, nextcord.File | None, list[dict] | None]:
340342
# GraphQL Queries
341343
# fmt: off
342344
query_values = '''

0 commit comments

Comments
 (0)