Skip to content

Fix null-safety issues spotted by Sentry #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tweirtx merged 2 commits into from
Jul 31, 2026
Merged

Fix null-safety issues spotted by Sentry #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d3b87f
Fix null-safety issues spotted by Sentry
tweirtx Jul 13, 2026
13eb89c
Actually add/remove roles
tweirtx Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dozer/cogs/actionlogs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,8 @@ async def on_raw_message_edit(self, payload: discord.RawMessageUpdateEvent):
if payload.cached_message:
return
mchannel = self.bot.get_channel(int(payload.channel_id))
if mchannel is None:
return
guild = mchannel.guild
try:
content = payload.data['content']
Expand Down
6 changes: 4 additions & 2 deletions dozer/cogs/starboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,10 @@ async def starboard_check(self, reaction: discord.Reaction, member: discord.Memb
logger.warning(f"Cannot find Starboard Message {db_msgs[0].starboard_message_id} to remove")
starboard_msg = discord.Object(db_msgs[0].starboard_message_id)
await self.remove_from_starboard(config, starboard_msg, True)

self.locked_messages.remove(msg)
try:
self.locked_messages.remove(msg)
except KeyError:
return

@Cog.listener()
async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent):
Expand Down
8 changes: 6 additions & 2 deletions dozer/cogs/voice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,16 @@ async def on_voice_state_update(self, member: discord.Member, before: discord.Vo
# leave event, take role
config = await Voicebinds.get_by(channel_id=before.channel.id)
if len(config) != 0:
await member.remove_roles(member.guild.get_role(config[0].role_id))
role_to_remove = member.guild.get_role(config[0].role_id)
if role_to_remove is not None:
await member.remove_roles(role_to_remove)
if after.channel is not None:
# join event, give role
config = await Voicebinds.get_by(channel_id=after.channel.id)
if len(config) != 0:
await member.add_roles(member.guild.get_role(config[0].role_id))
role_to_add = member.guild.get_role(config[0].role_id)
if role_to_add is not None:
await member.add_roles(role_to_add)

@Cog.listener('on_voice_state_update') # Used for auto PTT
async def on_PTT_check(self, member: discord.Member, before: discord.VoiceState, after: discord.VoiceState):
Expand Down
Loading