diff --git a/away/__init__.py b/away/__init__.py index 9e35c63..3ee8de9 100644 --- a/away/__init__.py +++ b/away/__init__.py @@ -1,7 +1,5 @@ -from discord.ext import commands from .away import Away -def setup(bot: commands.Bot): - n = Away(bot) - bot.add_cog(n) +def setup(bot): + bot.add_cog(Away(bot)) diff --git a/away/away.py b/away/away.py index f836061..90ea1a6 100644 --- a/away/away.py +++ b/away/away.py @@ -1,8 +1,5 @@ import discord -from discord.ext import commands - -from redbot.core import Config -from redbot.core.bot import Red +from redbot.core import Config, commands, checks class Away: @@ -11,7 +8,7 @@ class Away: default_global_settings = {"ign_servers": []} default_user_settings = {"MESSAGE": False} - def __init__(self, bot: Red): + def __init__(self, bot): self.bot = bot self._away = Config.get_conf(self, 8423491260, force_registration=True) @@ -78,7 +75,7 @@ class Away: await ctx.send(msg) @commands.command(name="toggleaway") - @commands.has_permissions(administrator=True) + @checks.admin_or_permissions(administrator=True) async def _ignore(self, ctx): """Toggle away messages on the whole server.""" guild = ctx.message.guild diff --git a/blurplefy/__init__.py b/blurplefy/__init__.py index 6f46173..19b6f43 100644 --- a/blurplefy/__init__.py +++ b/blurplefy/__init__.py @@ -1,6 +1,5 @@ from .blurplefy import Blurplefy -from discord.ext import commands -def setup(bot: commands.Bot): +def setup(bot): bot.add_cog(Blurplefy(bot)) diff --git a/blurplefy/blurplefy.py b/blurplefy/blurplefy.py index 0df6e87..7495876 100644 --- a/blurplefy/blurplefy.py +++ b/blurplefy/blurplefy.py @@ -3,8 +3,6 @@ # pip install pillow import discord -from discord.ext import commands -from discord.ext.commands.cooldowns import BucketType from PIL import Image, ImageEnhance, ImageSequence from io import BytesIO import aiohttp @@ -14,7 +12,7 @@ import datetime import io import math from resizeimage import resizeimage -from redbot.core import Config, checks +from redbot.core import Config, commands, checks blurple = (114, 137, 218) blurplehex = 0x7289da @@ -24,6 +22,7 @@ white = (255, 255, 255) class Blurplefy: def __init__(self, bot): + """Blurplefy images and check content of images.""" self.bot = bot self.config = Config.get_conf(self, 2778931480, force_registration=True) @@ -100,7 +99,7 @@ class Blurplefy: @commands.guild_only() @commands.command() - @commands.cooldown(rate=1, per=30, type=BucketType.user) + @commands.cooldown(rate=1, per=30, type=commands.BucketType.user) async def blurple(self, ctx, user: discord.Member = None): """Check a user or uploaded image for blurple content.""" picture = None @@ -209,7 +208,7 @@ class Blurplefy: @commands.guild_only() @commands.command() - @commands.cooldown(rate=1, per=30, type=BucketType.user) + @commands.cooldown(rate=1, per=30, type=commands.BucketType.user) async def blurplefy(self, ctx, user: discord.Member = None): """Blurplefy a user or uploaded image.""" picture = None diff --git a/chatchart/__init__.py b/chatchart/__init__.py index b63ef6d..1d48999 100644 --- a/chatchart/__init__.py +++ b/chatchart/__init__.py @@ -1,7 +1,5 @@ -from discord.ext import commands from .chatchart import Chatchart -def setup(bot: commands.Bot): - n = Chatchart(bot) - bot.add_cog(n) +def setup(bot): + bot.add_cog(Chatchart(bot)) diff --git a/chatchart/chatchart.py b/chatchart/chatchart.py index 57b8fb5..2df9a7a 100644 --- a/chatchart/chatchart.py +++ b/chatchart/chatchart.py @@ -13,7 +13,7 @@ matplotlib.use("agg") import matplotlib.pyplot as plt plt.switch_backend("agg") -from discord.ext import commands +from redbot.core import commands class Chatchart: diff --git a/dungeon/dungeon.py b/dungeon/dungeon.py index 1120547..c03aed0 100644 --- a/dungeon/dungeon.py +++ b/dungeon/dungeon.py @@ -379,7 +379,7 @@ class Dungeon: except discord.Forbidden: if announce_channel: return await channel_object.send( - f"I couldn't DM {user} to let them know they've been banned, they've blocked me." + f"I couldn't DM {member} ({member.id}) to let them know they've been banned, they've blocked me." ) else: print(perm_msg) @@ -391,7 +391,7 @@ class Dungeon: except discord.Forbidden: if announce_channel: return await channel_object.send( - "I tried to auto-ban someone ({member}, {member.id}) but I don't have ban permissions." + f"I tried to auto-ban someone ({member}, {member.id}) but I don't have ban permissions." ) else: print(perm_msg) diff --git a/dungeon/info.json b/dungeon/info.json index 75dcb9c..56fe4e3 100644 --- a/dungeon/info.json +++ b/dungeon/info.json @@ -10,7 +10,7 @@ "manage_channels", "manage_roles" ], - "short": "", + "short": "Specialized raid protection.", "tags": [ "dungeon", "autoban" diff --git a/inspirobot/inspirobot.py b/inspirobot/inspirobot.py index 02ec853..da90335 100644 --- a/inspirobot/inspirobot.py +++ b/inspirobot/inspirobot.py @@ -4,6 +4,7 @@ from redbot.core import commands class Inspirobot: + """Posts images generated by https://inspirobot.me""" def __init__(self, bot): self.bot = bot self.session = aiohttp.ClientSession() diff --git a/partycrash/__init__.py b/partycrash/__init__.py index bc059e7..2b7db1f 100644 --- a/partycrash/__init__.py +++ b/partycrash/__init__.py @@ -1,6 +1,5 @@ -from discord.ext import commands from .partycrash import PartyCrash -def setup(bot: commands.Bot): +def setup(bot): bot.add_cog(PartyCrash(bot)) diff --git a/pingtime/pingtime.py b/pingtime/pingtime.py index 77c6c30..042abd2 100644 --- a/pingtime/pingtime.py +++ b/pingtime/pingtime.py @@ -1,7 +1,8 @@ -from discord.ext import commands +from redbot.core import commands class Pingtime: + """🏓""" def __init__(self, bot): self.bot = bot diff --git a/retrosign/__init__.py b/retrosign/__init__.py index f2d0b29..5c13c78 100644 --- a/retrosign/__init__.py +++ b/retrosign/__init__.py @@ -1,7 +1,5 @@ -from discord.ext import commands from .retrosign import Retrosign -def setup(bot: commands.Bot): - n = Retrosign(bot) - bot.add_cog(n) +def setup(bot): + bot.add_cog(Retrosign(bot)) diff --git a/retrosign/retrosign.py b/retrosign/retrosign.py index 4b17271..34bea85 100644 --- a/retrosign/retrosign.py +++ b/retrosign/retrosign.py @@ -12,6 +12,7 @@ import re class Retrosign: + """Make an 80s retro sign. Originally by Anismash""" def __init__(self, bot): self.bot = bot self.session = aiohttp.ClientSession() diff --git a/rndstatus/rndstatus.py b/rndstatus/rndstatus.py index 7742d64..28b15f3 100644 --- a/rndstatus/rndstatus.py +++ b/rndstatus/rndstatus.py @@ -35,6 +35,7 @@ class RndStatus: @commands.guild_only() @checks.is_owner() async def rndstatus(self, ctx): + """Rndstatus group commands.""" pass @rndstatus.command(name="set") @@ -63,7 +64,7 @@ class RndStatus: if not botstats == False: await self.bot.change_presence(activity=None) - @rndstatus.command(pass_context=True) + @rndstatus.command() async def delay(self, ctx, seconds: int): """Sets interval of random status switch. diff --git a/seen/__init__.py b/seen/__init__.py index d948d5a..4c69a5e 100644 --- a/seen/__init__.py +++ b/seen/__init__.py @@ -1,7 +1,5 @@ -from discord.ext import commands from .seen import Seen -def setup(bot: commands.Bot): - n = Seen(bot) - bot.add_cog(n) +def setup(bot): + bot.add_cog(Seen(bot)) diff --git a/seen/seen.py b/seen/seen.py index 535d547..5918f79 100644 --- a/seen/seen.py +++ b/seen/seen.py @@ -1,12 +1,11 @@ import asyncio import discord import time -from discord.ext import commands from datetime import datetime -from redbot.core import Config - +from redbot.core import Config, commands class Seen: + """Shows last time a user was seen in chat""" def __init__(self, bot): self.bot = bot self.config = Config.get_conf(self, 2784481001, force_registration=True) diff --git a/wolfram/__init__.py b/wolfram/__init__.py index 29d812c..9842c14 100644 --- a/wolfram/__init__.py +++ b/wolfram/__init__.py @@ -1,7 +1,5 @@ -from discord.ext import commands from .wolfram import Wolfram -def setup(bot: commands.Bot): - n = Wolfram(bot) - bot.add_cog(n) +def setup(bot): + bot.add_cog(Wolfram(bot))