diff --git a/redbot/cogs/mod/kickban.py b/redbot/cogs/mod/kickban.py index ef21e4d6e..be420ef63 100644 --- a/redbot/cogs/mod/kickban.py +++ b/redbot/cogs/mod/kickban.py @@ -620,12 +620,14 @@ class KickBanMixin(MixinMeta): await ctx.send(_("I cannot do that due to Discord hierarchy rules.")) return + guild_data = await self.config.guild(guild).all() + if duration is None: - duration = timedelta(seconds=await self.config.guild(guild).default_tempban_duration()) + duration = timedelta(seconds=guild_data["default_tempban_duration"]) unban_time = datetime.now(timezone.utc) + duration if days is None: - days = await self.config.guild(guild).default_days() + days = guild_data["default_days"] if not (0 <= days <= 7): await ctx.send(_("Invalid days. Must be between 0 and 7.")) @@ -643,8 +645,10 @@ class KickBanMixin(MixinMeta): msg = _("You have been temporarily banned from {server_name} until {date}.").format( server_name=guild.name, date=unban_time.strftime("%m-%d-%Y %H:%M:%S") ) + if guild_data["dm_on_kickban"] and reason: + msg += _("\n\n**Reason:** {reason}").format(reason=reason) if invite: - msg += _(" Here is an invite for when your ban expires: {invite_link}").format( + msg += _("\n\nHere is an invite for when your ban expires: {invite_link}").format( invite_link=invite ) await member.send(msg)