attempted to fix some errors from mypy and updated gitignore and requirements.txt

Author: BCurbs

.gitignore

@@ -19,4 +19,7 @@ venv/
 *~
 
 #VSCode
-settings.json
+settings.json
+
+#for mypy
+/.mypy_cache/

dozer/__main__.py

@@ -60,7 +60,7 @@
 
 if config['sentry_url'] != "":
     sentry_sdk.init(  # pylint: disable=abstract-class-instantiated  # noqa: E0110
-        config['sentry_url'],
+        str(config['sentry_url']),
         traces_sample_rate=1.0,
     )
 
@@ -76,7 +76,7 @@
 
 intents = discord.Intents.default()
 intents.members = True
-intents.presences = config['presences_intents']
+intents.presences = bool(config['presences_intents'])
 
 bot = Dozer(config, intents=intents, max_messages=config['cache_size'])
 

dozer/cogs/_utils.py

@@ -4,7 +4,7 @@
 import logging
 import typing
 from collections.abc import Mapping
-from typing import Dict
+from typing import Dict, Union
 
 import discord
 from discord.ext import commands
@@ -175,7 +175,8 @@ def stop(self):
         self._action = self._stop_reaction
 
     def _check_reaction(self, reaction: discord.Reaction, member: discord.Member):
-        return reaction.message.id == self.message.id and member.id == self.caller.id
+        if self.message is not None:
+            return reaction.message.id == self.message.id and member.id == self.caller.id
 
 
 class Paginator(Reactor):
@@ -237,7 +238,7 @@ async def __aiter__(self):
                 else:  # Only valid option left is 4
                     self.stop()
 
-    def go_to_page(self, page: int):
+    def go_to_page(self, page: Union[int, str]):
         """Goes to a specific help page"""
         if isinstance(page, int):
             page = page % self.len_pages

dozer/cogs/filter.py

@@ -52,6 +52,7 @@ async def check_filters_messages(self, message: discord.Message):
         """Check all the filters for a certain message (with it's guild)"""
         if message.author.id == self.bot.user.id or not hasattr(message.author, 'roles'):
             return
+
         roles = await self.word_filter_role_whitelist.query_all(guild_id=message.guild.id)
         whitelisted_ids = set(role.role_id for role in roles)
         if any(x.id in whitelisted_ids for x in message.author.roles):
@@ -236,14 +237,14 @@ async def remove(self, ctx: DozerContext, filter_id: int):
     @guild_only()
     @has_permissions(manage_guild=True)
     @filter.command(name="dm")
-    async def dm_config(self, ctx: DozerContext, config: bool):
+    async def dm_config(self, ctx: DozerContext, config: str):
         """Set whether filter words should be DMed when used in bot messages"""
-        config = str(int(config))  # turns into "1" or "0" idk man
+        config: str = str(int(config))  # turns into "1" or "0" idk man
         results = await WordFilterSetting.get_by(guild_id=ctx.guild.id, setting_type="dm")
         if results:
             before_setting = results[0].value
             # Due to the settings table having a serial ID, inserts always succeed, so update_or_add can't be used to
-            # update in place. Instead we have to delete and reinsert the record.
+            # update in place. Instead, we have to delete and reinsert the record.
             await WordFilterSetting.delete(guild_id=results[0].guild_id, setting_type=results[0].setting_type)
         else:
             before_setting = None
@@ -254,7 +255,8 @@ async def dm_config(self, ctx: DozerContext, config: bool):
             "The DM setting for this guild has been changed from {} to {}.".format(before_setting == "1",
                                                                                    result.value == "1"))
 
-    dm_config.example_usage = "`{prefix}filter dm_config True` - Makes all messages containining filter lists to be sent through DMs"
+    dm_config.example_usage = "`{prefix}filter dm_config True` - Makes all messages containining filter lists to be " \
+                              "sent through DMs "
 
     @guild_only()
     @filter.group(invoke_without_command=True)
@@ -316,7 +318,7 @@ def setup(bot):
 class WordFilter(db.DatabaseTable):
     """Object for each filter"""
     __tablename__ = 'word_filters'
-    __uniques__ = 'filter_id'
+    __uniques__ = ['filter_id']
 
     @classmethod
     async def initial_create(cls):
@@ -354,7 +356,7 @@ async def get_by(cls, **kwargs):
 class WordFilterSetting(db.DatabaseTable):
     """Each filter-related setting"""
     __tablename__ = 'word_filter_settings'
-    __uniques__ = 'id'
+    __uniques__ = ['id']
 
     @classmethod
     async def initial_create(cls):
@@ -388,7 +390,7 @@ async def get_by(cls, **kwargs):
 class WordFilterRoleWhitelist(db.DatabaseTable):
     """Object for each whitelisted role"""
     __tablename__ = 'word_filter_role_whitelist'
-    __uniques__ = 'role_id'
+    __uniques__ = ['role_id']
 
     @classmethod
     async def initial_create(cls):

dozer/sources/AbstractSources.py

@@ -6,10 +6,10 @@
 class Source:
     """Abstract base class for a data source."""
 
-    full_name = "Source Name"
-    short_name = "src"
-    base_url = None
-    aliases = tuple()
+    full_name: str = "Source Name"
+    short_name: str = "src"
+    base_url: str = ""
+    aliases: tuple = tuple()
     description = "Description"
     disabled = False
 
@@ -100,9 +100,9 @@ class DataPoint:
             full_name: The string that will be displayed to the user of your cleaned, verified data.
         """
 
-        def __init__(self, short_name, full_name):
-            self.short_name = short_name
-            self.full_name = full_name
+        def __init__(self, short_name: str, full_name: str):
+            self.short_name: str = short_name
+            self.full_name: str = full_name
 
         def __str__(self):
             return self.short_name

dozer/sources/RSSSources.py

@@ -19,16 +19,16 @@ def clean_html(raw_html):
 
 class RSSSource(Source):
     """Given an arbitrary RSS feed, get new posts from it"""
-    url = None
+    url: str = ""
     color = discord.colour.Color.blurple()
     date_formats = ["%a, %d %b %Y %H:%M:%S %z",
                     "%a, %d %b %Y %H:%M:%S %Z"]  # format for datetime.strptime()
-    base_url = None
-    read_more_str = "...\n Read More"
+    base_url: str = ""
+    read_more_str: str = "...\n Read More"
 
     def __init__(self, aiohttp_session: aiohttp.ClientSession, bot):
         super().__init__(aiohttp_session, bot)
-        self.guids_seen = set()
+        self.guids_seen: set = set()
 
     async def first_run(self):
         """Fetch the current posts in the feed and add them to the guids_seen set"""
@@ -154,8 +154,8 @@ def generate_plain_text(self, data):
 
 class FRCBlogPosts(RSSSource):
     """Official blog posts from the FIRST Robotics Competition"""
-    url = "https://www.firstinspires.org/robotics/frc/blog-rss"
-    base_url = "https://www.firstinspires.org/robotics/frc/blog/"
+    url: str = "https://www.firstinspires.org/robotics/frc/blog-rss"
+    base_url: str = "https://www.firstinspires.org/robotics/frc/blog/"
     full_name = "FRC Blog Posts"
     short_name = "frc"
     description = "Official blog posts from the FIRST Robotics Competition"
@@ -228,7 +228,7 @@ class JVNBlog(RSSSource):
     base_url = "https://johnvneun.com/"
     full_name = "JVN's Blog"
     short_name = "jvn"
-    aliases = ['148', 'robowranglers']
+    aliases = '148', 'robowranglers'
     description = "Blog posts by John V Neun, 148 Head Engineer"
     color = discord.colour.Color(value=000000)
 
@@ -239,7 +239,7 @@ class SpectrumBlog(RSSSource):
     base_url = "http://spectrum3847.org/category/blog/"
     full_name = "Spectrum Blog"
     short_name = "spectrum"
-    aliases = ['3847']
+    aliases = '3847'
     description = "Blog Posts from team 3847, Spectrum"
     color = discord.colour.Color.purple()
 

requirements.txt

@@ -1,4 +1,4 @@
-asyncpg~=0.21.0
+asyncpg~=0.23.0
 py-cord
 tbapi~=1.3.1b5
 aiotba~=0.0.2.post1