diff options
Diffstat (limited to '')
| -rw-r--r-- | bot/bot.py | 5 | ||||
| -rw-r--r-- | bot/cogs/alias.py | 3 | ||||
| -rw-r--r-- | bot/cogs/antimalware.py | 3 | ||||
| -rw-r--r-- | bot/cogs/antispam.py | 3 | ||||
| -rw-r--r-- | bot/cogs/bot.py | 3 | ||||
| -rw-r--r-- | bot/cogs/clean.py | 3 | ||||
| -rw-r--r-- | bot/cogs/defcon.py | 3 | ||||
| -rw-r--r-- | bot/cogs/doc.py | 3 | ||||
| -rw-r--r-- | bot/cogs/duck_pond.py | 3 | ||||
| -rw-r--r-- | bot/cogs/error_handler.py | 3 | ||||
| -rw-r--r-- | bot/cogs/eval.py | 3 | ||||
| -rw-r--r-- | bot/cogs/extensions.py | 1 | ||||
| -rw-r--r-- | bot/cogs/filtering.py | 3 | ||||
| -rw-r--r-- | bot/cogs/free.py | 3 | ||||
| -rw-r--r-- | bot/cogs/information.py | 3 | ||||
| -rw-r--r-- | bot/cogs/jams.py | 3 | ||||
| -rw-r--r-- | bot/cogs/logging.py | 3 | ||||
| -rw-r--r-- | bot/cogs/moderation/__init__.py | 13 | ||||
| -rw-r--r-- | bot/cogs/off_topic_names.py | 3 | ||||
| -rw-r--r-- | bot/cogs/reddit.py | 3 | ||||
| -rw-r--r-- | bot/cogs/reminders.py | 3 | ||||
| -rw-r--r-- | bot/cogs/security.py | 3 | ||||
| -rw-r--r-- | bot/cogs/site.py | 3 | ||||
| -rw-r--r-- | bot/cogs/snekbox.py | 3 | ||||
| -rw-r--r-- | bot/cogs/sync/__init__.py | 7 | ||||
| -rw-r--r-- | bot/cogs/tags.py | 3 | ||||
| -rw-r--r-- | bot/cogs/token_remover.py | 3 | ||||
| -rw-r--r-- | bot/cogs/utils.py | 3 | ||||
| -rw-r--r-- | bot/cogs/verification.py | 3 | ||||
| -rw-r--r-- | bot/cogs/watchchannels/__init__.py | 10 | ||||
| -rw-r--r-- | bot/cogs/wolfram.py | 3 | 
31 files changed, 34 insertions, 80 deletions
| diff --git a/bot/bot.py b/bot/bot.py index 05734ac1d..f39bfb50a 100644 --- a/bot/bot.py +++ b/bot/bot.py @@ -28,3 +28,8 @@ class Bot(commands.Bot):          self.api_client = api.APIClient(loop=asyncio.get_event_loop())          log.addHandler(api.APILoggingHandler(self.api_client)) + +    def add_cog(self, cog: commands.Cog) -> None: +        """Adds a "cog" to the bot and logs the operation.""" +        super().add_cog(cog) +        log.info(f"Cog loaded: {cog.qualified_name}") diff --git a/bot/cogs/alias.py b/bot/cogs/alias.py index 4ee5a2aed..c1db38462 100644 --- a/bot/cogs/alias.py +++ b/bot/cogs/alias.py @@ -148,6 +148,5 @@ class Alias (Cog):  def setup(bot: Bot) -> None: -    """Alias cog load.""" +    """Load the Alias cog."""      bot.add_cog(Alias(bot)) -    log.info("Cog loaded: Alias") diff --git a/bot/cogs/antimalware.py b/bot/cogs/antimalware.py index 03c1e28a1..28e3e5d96 100644 --- a/bot/cogs/antimalware.py +++ b/bot/cogs/antimalware.py @@ -50,6 +50,5 @@ class AntiMalware(Cog):  def setup(bot: Bot) -> None: -    """Antimalware cog load.""" +    """Load the AntiMalware cog."""      bot.add_cog(AntiMalware(bot)) -    log.info("Cog loaded: AntiMalware") diff --git a/bot/cogs/antispam.py b/bot/cogs/antispam.py index 88912038a..f454061a6 100644 --- a/bot/cogs/antispam.py +++ b/bot/cogs/antispam.py @@ -277,7 +277,6 @@ def validate_config(rules: Mapping = AntiSpamConfig.rules) -> Dict[str, str]:  def setup(bot: Bot) -> None: -    """Antispam cog load.""" +    """Validate the AntiSpam configs and load the AntiSpam cog."""      validation_errors = validate_config()      bot.add_cog(AntiSpam(bot, validation_errors)) -    log.info("Cog loaded: AntiSpam") diff --git a/bot/cogs/bot.py b/bot/cogs/bot.py index a2edb7576..b5642da82 100644 --- a/bot/cogs/bot.py +++ b/bot/cogs/bot.py @@ -378,6 +378,5 @@ class Bot(Cog):  def setup(bot: Bot) -> None: -    """Bot cog load.""" +    """Load the Bot cog."""      bot.add_cog(Bot(bot)) -    log.info("Cog loaded: Bot") diff --git a/bot/cogs/clean.py b/bot/cogs/clean.py index 3365d0934..c7168122d 100644 --- a/bot/cogs/clean.py +++ b/bot/cogs/clean.py @@ -212,6 +212,5 @@ class Clean(Cog):  def setup(bot: Bot) -> None: -    """Clean cog load.""" +    """Load the Clean cog."""      bot.add_cog(Clean(bot)) -    log.info("Cog loaded: Clean") diff --git a/bot/cogs/defcon.py b/bot/cogs/defcon.py index f062a7546..3e7350fcc 100644 --- a/bot/cogs/defcon.py +++ b/bot/cogs/defcon.py @@ -237,6 +237,5 @@ class Defcon(Cog):  def setup(bot: Bot) -> None: -    """DEFCON cog load.""" +    """Load the Defcon cog."""      bot.add_cog(Defcon(bot)) -    log.info("Cog loaded: Defcon") diff --git a/bot/cogs/doc.py b/bot/cogs/doc.py index 7df159fd9..9506b195a 100644 --- a/bot/cogs/doc.py +++ b/bot/cogs/doc.py @@ -508,6 +508,5 @@ class Doc(commands.Cog):  def setup(bot: Bot) -> None: -    """Doc cog load.""" +    """Load the Doc cog."""      bot.add_cog(Doc(bot)) -    log.info("Cog loaded: Doc") diff --git a/bot/cogs/duck_pond.py b/bot/cogs/duck_pond.py index 879071d1b..345d2856c 100644 --- a/bot/cogs/duck_pond.py +++ b/bot/cogs/duck_pond.py @@ -178,6 +178,5 @@ class DuckPond(Cog):  def setup(bot: Bot) -> None: -    """Load the duck pond cog.""" +    """Load the DuckPond cog."""      bot.add_cog(DuckPond(bot)) -    log.info("Cog loaded: DuckPond") diff --git a/bot/cogs/error_handler.py b/bot/cogs/error_handler.py index cf90e9f48..700f903a6 100644 --- a/bot/cogs/error_handler.py +++ b/bot/cogs/error_handler.py @@ -144,6 +144,5 @@ class ErrorHandler(Cog):  def setup(bot: Bot) -> None: -    """Error handler cog load.""" +    """Load the ErrorHandler cog."""      bot.add_cog(ErrorHandler(bot)) -    log.info("Cog loaded: Events") diff --git a/bot/cogs/eval.py b/bot/cogs/eval.py index 5daec3e39..9c729f28a 100644 --- a/bot/cogs/eval.py +++ b/bot/cogs/eval.py @@ -198,6 +198,5 @@ async def func():  # (None,) -> Any  def setup(bot: Bot) -> None: -    """Code eval cog load.""" +    """Load the CodeEval cog."""      bot.add_cog(CodeEval(bot)) -    log.info("Cog loaded: Eval") diff --git a/bot/cogs/extensions.py b/bot/cogs/extensions.py index 4d77d8205..f16e79fb7 100644 --- a/bot/cogs/extensions.py +++ b/bot/cogs/extensions.py @@ -234,4 +234,3 @@ class Extensions(commands.Cog):  def setup(bot: Bot) -> None:      """Load the Extensions cog."""      bot.add_cog(Extensions(bot)) -    log.info("Cog loaded: Extensions") diff --git a/bot/cogs/filtering.py b/bot/cogs/filtering.py index 2e54ccecb..74538542a 100644 --- a/bot/cogs/filtering.py +++ b/bot/cogs/filtering.py @@ -371,6 +371,5 @@ class Filtering(Cog):  def setup(bot: Bot) -> None: -    """Filtering cog load.""" +    """Load the Filtering cog."""      bot.add_cog(Filtering(bot)) -    log.info("Cog loaded: Filtering") diff --git a/bot/cogs/free.py b/bot/cogs/free.py index bbc9f063b..49cab6172 100644 --- a/bot/cogs/free.py +++ b/bot/cogs/free.py @@ -99,6 +99,5 @@ class Free(Cog):  def setup(bot: Bot) -> None: -    """Free cog load.""" +    """Load the Free cog."""      bot.add_cog(Free()) -    log.info("Cog loaded: Free") diff --git a/bot/cogs/information.py b/bot/cogs/information.py index 56bd37bec..1ede95ff4 100644 --- a/bot/cogs/information.py +++ b/bot/cogs/information.py @@ -392,6 +392,5 @@ class Information(Cog):  def setup(bot: Bot) -> None: -    """Information cog load.""" +    """Load the Information cog."""      bot.add_cog(Information(bot)) -    log.info("Cog loaded: Information") diff --git a/bot/cogs/jams.py b/bot/cogs/jams.py index 0c82e7962..985f28ce5 100644 --- a/bot/cogs/jams.py +++ b/bot/cogs/jams.py @@ -110,6 +110,5 @@ class CodeJams(commands.Cog):  def setup(bot: Bot) -> None: -    """Code Jams cog load.""" +    """Load the CodeJams cog."""      bot.add_cog(CodeJams(bot)) -    log.info("Cog loaded: CodeJams") diff --git a/bot/cogs/logging.py b/bot/cogs/logging.py index 44c771b42..d1b7dcab3 100644 --- a/bot/cogs/logging.py +++ b/bot/cogs/logging.py @@ -38,6 +38,5 @@ class Logging(Cog):  def setup(bot: Bot) -> None: -    """Logging cog load.""" +    """Load the Logging cog."""      bot.add_cog(Logging(bot)) -    log.info("Cog loaded: Logging") diff --git a/bot/cogs/moderation/__init__.py b/bot/cogs/moderation/__init__.py index 0cbdb3aa6..5243cb92d 100644 --- a/bot/cogs/moderation/__init__.py +++ b/bot/cogs/moderation/__init__.py @@ -1,24 +1,13 @@ -import logging -  from bot.bot import Bot  from .infractions import Infractions  from .management import ModManagement  from .modlog import ModLog  from .superstarify import Superstarify -log = logging.getLogger(__name__) -  def setup(bot: Bot) -> None: -    """Load the moderation extension (Infractions, ModManagement, ModLog, & Superstarify cogs).""" +    """Load the Infractions, ModManagement, ModLog, and Superstarify cogs."""      bot.add_cog(Infractions(bot)) -    log.info("Cog loaded: Infractions") -      bot.add_cog(ModLog(bot)) -    log.info("Cog loaded: ModLog") -      bot.add_cog(ModManagement(bot)) -    log.info("Cog loaded: ModManagement") -      bot.add_cog(Superstarify(bot)) -    log.info("Cog loaded: Superstarify") diff --git a/bot/cogs/off_topic_names.py b/bot/cogs/off_topic_names.py index 18d9cfb01..bf777ea5a 100644 --- a/bot/cogs/off_topic_names.py +++ b/bot/cogs/off_topic_names.py @@ -185,6 +185,5 @@ class OffTopicNames(Cog):  def setup(bot: Bot) -> None: -    """Off topic names cog load.""" +    """Load the OffTopicNames cog."""      bot.add_cog(OffTopicNames(bot)) -    log.info("Cog loaded: OffTopicNames") diff --git a/bot/cogs/reddit.py b/bot/cogs/reddit.py index c76fcd937..bec316ae7 100644 --- a/bot/cogs/reddit.py +++ b/bot/cogs/reddit.py @@ -218,6 +218,5 @@ class Reddit(Cog):  def setup(bot: Bot) -> None: -    """Reddit cog load.""" +    """Load the Reddit cog."""      bot.add_cog(Reddit(bot)) -    log.info("Cog loaded: Reddit") diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py index b805b24c5..45bf9a8f4 100644 --- a/bot/cogs/reminders.py +++ b/bot/cogs/reminders.py @@ -291,6 +291,5 @@ class Reminders(Scheduler, Cog):  def setup(bot: Bot) -> None: -    """Reminders cog load.""" +    """Load the Reminders cog."""      bot.add_cog(Reminders(bot)) -    log.info("Cog loaded: Reminders") diff --git a/bot/cogs/security.py b/bot/cogs/security.py index 45d0eb2f5..c680c5e27 100644 --- a/bot/cogs/security.py +++ b/bot/cogs/security.py @@ -27,6 +27,5 @@ class Security(Cog):  def setup(bot: Bot) -> None: -    """Security cog load.""" +    """Load the Security cog."""      bot.add_cog(Security(bot)) -    log.info("Cog loaded: Security") diff --git a/bot/cogs/site.py b/bot/cogs/site.py index 1d7bd03e4..2ea8c7a2e 100644 --- a/bot/cogs/site.py +++ b/bot/cogs/site.py @@ -139,6 +139,5 @@ class Site(Cog):  def setup(bot: Bot) -> None: -    """Site cog load.""" +    """Load the Site cog."""      bot.add_cog(Site(bot)) -    log.info("Cog loaded: Site") diff --git a/bot/cogs/snekbox.py b/bot/cogs/snekbox.py index 1ea61a8da..da33e27b2 100644 --- a/bot/cogs/snekbox.py +++ b/bot/cogs/snekbox.py @@ -228,6 +228,5 @@ class Snekbox(Cog):  def setup(bot: Bot) -> None: -    """Snekbox cog load.""" +    """Load the Snekbox cog."""      bot.add_cog(Snekbox(bot)) -    log.info("Cog loaded: Snekbox") diff --git a/bot/cogs/sync/__init__.py b/bot/cogs/sync/__init__.py index 0da81c60e..fe7df4e9b 100644 --- a/bot/cogs/sync/__init__.py +++ b/bot/cogs/sync/__init__.py @@ -1,12 +1,7 @@ -import logging -  from bot.bot import Bot  from .cog import Sync -log = logging.getLogger(__name__) -  def setup(bot: Bot) -> None: -    """Sync cog load.""" +    """Load the Sync cog."""      bot.add_cog(Sync(bot)) -    log.info("Cog loaded: Sync") diff --git a/bot/cogs/tags.py b/bot/cogs/tags.py index 2ece0095d..970301013 100644 --- a/bot/cogs/tags.py +++ b/bot/cogs/tags.py @@ -161,6 +161,5 @@ class Tags(Cog):  def setup(bot: Bot) -> None: -    """Tags cog load.""" +    """Load the Tags cog."""      bot.add_cog(Tags(bot)) -    log.info("Cog loaded: Tags") diff --git a/bot/cogs/token_remover.py b/bot/cogs/token_remover.py index 7af7ed63a..5d6618338 100644 --- a/bot/cogs/token_remover.py +++ b/bot/cogs/token_remover.py @@ -120,6 +120,5 @@ class TokenRemover(Cog):  def setup(bot: Bot) -> None: -    """Token Remover cog load.""" +    """Load the TokenRemover cog."""      bot.add_cog(TokenRemover(bot)) -    log.info("Cog loaded: TokenRemover") diff --git a/bot/cogs/utils.py b/bot/cogs/utils.py index 0ed996430..47a59db66 100644 --- a/bot/cogs/utils.py +++ b/bot/cogs/utils.py @@ -177,6 +177,5 @@ class Utils(Cog):  def setup(bot: Bot) -> None: -    """Utils cog load.""" +    """Load the Utils cog."""      bot.add_cog(Utils(bot)) -    log.info("Cog loaded: Utils") diff --git a/bot/cogs/verification.py b/bot/cogs/verification.py index 74eb0dbf8..b32b9a29e 100644 --- a/bot/cogs/verification.py +++ b/bot/cogs/verification.py @@ -225,6 +225,5 @@ class Verification(Cog):  def setup(bot: Bot) -> None: -    """Verification cog load.""" +    """Load the Verification cog."""      bot.add_cog(Verification(bot)) -    log.info("Cog loaded: Verification") diff --git a/bot/cogs/watchchannels/__init__.py b/bot/cogs/watchchannels/__init__.py index e18aea88a..69d118df6 100644 --- a/bot/cogs/watchchannels/__init__.py +++ b/bot/cogs/watchchannels/__init__.py @@ -1,17 +1,9 @@ -import logging -  from bot.bot import Bot  from .bigbrother import BigBrother  from .talentpool import TalentPool -log = logging.getLogger(__name__) - -  def setup(bot: Bot) -> None: -    """Monitoring cogs load.""" +    """Load the BigBrother and TalentPool cogs."""      bot.add_cog(BigBrother(bot)) -    log.info("Cog loaded: BigBrother") -      bot.add_cog(TalentPool(bot)) -    log.info("Cog loaded: TalentPool") diff --git a/bot/cogs/wolfram.py b/bot/cogs/wolfram.py index c3c193cb9..5d6b4630b 100644 --- a/bot/cogs/wolfram.py +++ b/bot/cogs/wolfram.py @@ -268,6 +268,5 @@ class Wolfram(Cog):  def setup(bot: Bot) -> None: -    """Wolfram cog load.""" +    """Load the Wolfram cog."""      bot.add_cog(Wolfram(bot)) -    log.info("Cog loaded: Wolfram") | 
