diff options
| -rw-r--r-- | bot/exts/moderation/stream.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bot/exts/moderation/stream.py b/bot/exts/moderation/stream.py index e5b2f2cc7..2d1f12469 100644 --- a/bot/exts/moderation/stream.py +++ b/bot/exts/moderation/stream.py @@ -1,5 +1,5 @@ import logging -from datetime import timedelta +from datetime import timedelta, timezone import arrow import discord @@ -85,9 +85,14 @@ class Stream(commands.Cog): Alternatively, an ISO 8601 timestamp can be provided for the duration. """ log.trace(f"Attempting to give temporary streaming permission to {member} ({member.id}).") - # If duration is none then calculate default duration + if duration is None: + # If duration is None then calculate default duration duration = arrow.utcnow() + timedelta(minutes=VideoPermission.default_permission_duration) + elif duration.tzinfo is None: + # Make duration tz-aware. + # ISODateTime could already include tzinfo, this check is so it isn't overwritten. + duration.replace(tzinfo=timezone.utc) # Check if the member already has streaming permission already_allowed = any(Roles.video == role.id for role in member.roles) @@ -120,7 +125,7 @@ class Stream(commands.Cog): self.scheduler.cancel(member.id) await self.task_cache.delete(member.id) - await ctx.send(f"{Emojis.check_mark} Changed temporary permission to permanent.") + await ctx.send(f"{Emojis.check_mark} Permanently granted {member.mention} the permission to stream.") log.debug( f"Successfully upgraded temporary streaming permission for {member} ({member.id}) to permanent." ) |