Skip to content

Commit 107dad6

Browse files
AmbratolmAmbratolm
authored andcommitted
Farm: Improved log embeds w/ thumbnails
1 parent ffd21cf commit 107dad6

File tree

1 file changed

+28
-12
lines changed

1 file changed

+28
-12
lines changed

bot/cogs/game_cogs/farm_cog.py

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ async def on_member_join(self, member: Member):
167167
description=f"🟢 {member.mention} joined server.",
168168
)
169169
embed.set_author(name=member.name, icon_url=member.display_avatar.url)
170+
embed.set_thumbnail(url=member.display_avatar)
170171
await log_channel.send(embed=embed)
171172

172173
db = self.bot.get_db(member.guild)
@@ -201,6 +202,7 @@ async def on_member_remove(self, member: Member):
201202
embed.set_author(
202203
name=member.name, icon_url=member.display_avatar.url
203204
)
205+
embed.set_thumbnail(url=member.display_avatar)
204206
embed.set_footer(text=entry.reason or "No reason provided.")
205207
await log_channel.send(embed=embed)
206208
action_taken = True
@@ -219,6 +221,7 @@ async def on_member_remove(self, member: Member):
219221
embed.set_author(
220222
name=member.name, icon_url=member.display_avatar.url
221223
)
224+
embed.set_thumbnail(url=member.display_avatar)
222225
embed.set_footer(text=entry.reason or "No reason provided.")
223226
await log_channel.send(embed=embed)
224227
action_taken = True
@@ -230,6 +233,7 @@ async def on_member_remove(self, member: Member):
230233
description=f"🔴 {member.mention} left server.",
231234
)
232235
embed.set_author(name=member.name, icon_url=member.display_avatar.url)
236+
embed.set_thumbnail(url=member.display_avatar)
233237
await log_channel.send(embed=embed)
234238

235239
db = self.bot.get_db(member.guild)
@@ -243,25 +247,29 @@ async def on_member_remove(self, member: Member):
243247
# * On Member Update
244248
# ----------------------------------------------------------------------------------------------------
245249
@Cog.listener()
246-
async def on_member_update(self, before: Member, after: Member):
247-
log_room = self.load_room(id=FarmCog.__name__, guild=after.guild)
250+
async def on_member_update(self, member_before: Member, member_after: Member):
251+
log_room = self.load_room(id=FarmCog.__name__, guild=member_after.guild)
248252
if not log_room:
249253
return
250254

251-
log_channel = after.guild.get_channel(log_room.channel_id)
255+
log_channel = member_after.guild.get_channel(log_room.channel_id)
252256
if not (log_channel and isinstance(log_channel, TextChannel)):
253257
return
254258

255259
# Check for timeout added
256-
if not before.is_timed_out() and after.is_timed_out() and after.timed_out_until:
260+
if (
261+
not member_before.is_timed_out()
262+
and member_after.is_timed_out()
263+
and member_after.timed_out_until
264+
):
257265
entry = None
258266
await sleep(1) # Wait for audit log to update
259-
async for e in after.guild.audit_logs(
267+
async for e in member_after.guild.audit_logs(
260268
limit=5, action=AuditLogAction.member_update
261269
):
262270
if (
263271
e.target
264-
and e.target.id == after.id
272+
and e.target.id == member_after.id
265273
and e.changes.after.timed_out_until is not None
266274
):
267275
entry = e
@@ -274,25 +282,33 @@ async def on_member_update(self, before: Member, after: Member):
274282
else "No reason provided."
275283
)
276284

277-
time_left = humanize.naturaldelta(after.timed_out_until - utils.utcnow())
285+
time_left = humanize.naturaldelta(
286+
member_after.timed_out_until - utils.utcnow()
287+
)
278288
embed = EmbedX.error(
279289
emoji="",
280290
title="",
281-
description=f"🔇 {after.mention} timed out by {moderator} for **{time_left}**.",
291+
description=f"🔇 {member_after.mention} timed out by {moderator} for **{time_left}**.",
292+
)
293+
embed.set_author(
294+
name=member_after.name, icon_url=member_after.display_avatar.url
282295
)
283-
embed.set_author(name=after.name, icon_url=after.display_avatar.url)
296+
embed.set_thumbnail(url=member_after.display_avatar)
284297
embed.set_footer(text=reason)
285298

286299
await log_channel.send(embed=embed)
287300

288301
# Check for timeout removed
289-
elif before.is_timed_out() and not after.is_timed_out():
302+
elif member_before.is_timed_out() and not member_after.is_timed_out():
290303
embed = EmbedX.success(
291304
emoji="",
292305
title="",
293-
description=f"🔊 {after.mention} timeout removed.",
306+
description=f"🔊 {member_after.mention} timeout removed.",
307+
)
308+
embed.set_author(
309+
name=member_after.name, icon_url=member_after.display_avatar.url
294310
)
295-
embed.set_author(name=after.name, icon_url=after.display_avatar.url)
311+
embed.set_thumbnail(url=member_after.display_avatar)
296312
await log_channel.send(embed=embed)
297313

298314
# ----------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)