updates to python 3.11

PlaceDE-Official · Jul 20, 2023 · 9cad4b7 · 9cad4b7
1 parent 717abdf
commit 9cad4b7
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 1,086 deletions.
diff --git a/administration/sudo/cog.py b/administration/sudo/cog.py
@@ -10,7 +10,7 @@
 from PyDrocsid.environment import OWNER_ID
 from PyDrocsid.events import call_event_handlers
 from PyDrocsid.permission import permission_override
-from PyDrocsid.redis import redis
+from PyDrocsid.redis_client import redis
 from PyDrocsid.translations import t
 
 from .permissions import SudoPermission

diff --git a/general/custom_commands/cog.py b/general/custom_commands/cog.py
@@ -21,7 +21,7 @@
 from PyDrocsid.embeds import send_long_embed
 from PyDrocsid.logger import get_logger
 from PyDrocsid.permission import BasePermissionLevel
-from PyDrocsid.redis import redis
+from PyDrocsid.redis_client import redis
 from PyDrocsid.translations import t
 from PyDrocsid.util import check_message_send_permissions
 

diff --git a/general/voice_channel/cog.py b/general/voice_channel/cog.py
@@ -38,7 +38,7 @@
 from PyDrocsid.emojis import name_to_emoji
 from PyDrocsid.multilock import MultiLock
 from PyDrocsid.prefix import get_prefix
-from PyDrocsid.redis import redis
+from PyDrocsid.redis_client import redis
 from PyDrocsid.settings import RoleSettings
 from PyDrocsid.translations import t
 from PyDrocsid.util import check_role_assignable, send_editable_log

diff --git a/integrations/adventofcode/cog.py b/integrations/adventofcode/cog.py
@@ -50,7 +50,7 @@ def load(cls) -> bool:
         if not cls.SESSION:
             return False
 
-        response = requests.get(BASE_URL + "leaderboard/private", cookies={"session": cls.SESSION})
+        response = requests.get(BASE_URL + "leaderboard/private", cookies={"session": cls.SESSION}, timeout=10)
         if not response.ok or not response.url.endswith("private"):
             return False
 
@@ -64,7 +64,7 @@ def load(cls) -> bool:
 
     @classmethod
     def _request(cls, url):
-        return requests.get(url, cookies={"session": cls.SESSION})
+        return requests.get(url, cookies={"session": cls.SESSION}, timeout=10)
 
     @classmethod
     async def get_leaderboard(cls, disable_hook: bool = False) -> dict:
@@ -177,10 +177,10 @@ def get_git_repo(url: str) -> Optional[str]:
         if not (match := re.match(pattern, url)):
             continue
         _, user, repo, path = match.groups()
-        if not (response := requests.get(api.format(user=user, repo=repo))).ok:
+        if not (response := requests.get(api.format(user=user, repo=repo), timeout=10)).ok:
             break
         url = response.json()[web_url_key] + (path or "")
-        if not requests.head(url).ok:
+        if not requests.head(url, timeout=10).ok:
             break
         return url
     return None

diff --git a/integrations/python_docs/cog.py b/integrations/python_docs/cog.py
@@ -40,7 +40,7 @@
 from PyDrocsid.command import reply
 from PyDrocsid.environment import CACHE_TTL
 from PyDrocsid.logger import get_logger
-from PyDrocsid.redis import redis
+from PyDrocsid.redis_client import redis
 from PyDrocsid.translations import t
 
 from .colors import Colors

diff --git a/integrations/reddit/cog.py b/integrations/reddit/cog.py
@@ -3,7 +3,7 @@
 from typing import List, Optional
 
 from aiohttp import ClientSession
-from discord import Embed, TextChannel
+from discord import Embed, TextChannel, Thread
 from discord.ext import commands, tasks
 from discord.ext.commands import CommandError, Context, UserInputError, guild_only
 
@@ -115,7 +115,7 @@ async def pull_hot_posts(self):
         logger.info("pulling hot reddit posts")
         limit = await RedditSettings.limit.get()
         async for reddit_channel in await db.stream(select(RedditChannel)):  # type: RedditChannel
-            text_channel: Optional[TextChannel] = self.bot.get_channel(reddit_channel.channel)
+            text_channel: Optional[TextChannel | Thread] = self.bot.get_channel(reddit_channel.channel)
             if text_channel is None:
                 await db.delete(reddit_channel)
                 continue
@@ -171,7 +171,7 @@ async def reddit(self, ctx: Context):
 
         out = []
         async for reddit_channel in await db.stream(select(RedditChannel)):  # type: RedditChannel
-            text_channel: Optional[TextChannel] = self.bot.get_channel(reddit_channel.channel)
+            text_channel: Optional[TextChannel | Thread] = self.bot.get_channel(reddit_channel.channel)
             if text_channel is None:
                 await db.delete(reddit_channel)
             else:
@@ -183,7 +183,7 @@ async def reddit(self, ctx: Context):
 
     @reddit.command(name="add", aliases=["a", "+"])
     @RedditPermission.write.check
-    async def reddit_add(self, ctx: Context, subreddit: str, channel: TextChannel):
+    async def reddit_add(self, ctx: Context, subreddit: str, channel: TextChannel | Thread):
         """
         create a link between a subreddit and a channel
         """
@@ -203,7 +203,7 @@ async def reddit_add(self, ctx: Context, subreddit: str, channel: TextChannel):
 
     @reddit.command(name="remove", aliases=["r", "del", "d", "-"])
     @RedditPermission.write.check
-    async def reddit_remove(self, ctx: Context, subreddit: str, channel: TextChannel):
+    async def reddit_remove(self, ctx: Context, subreddit: str, channel: TextChannel | Thread):
         """
         remove a reddit link
         """

diff --git a/moderation/autorole/models.py b/moderation/autorole/models.py
@@ -5,7 +5,7 @@
 from PyDrocsid.async_thread import lock_deco
 from PyDrocsid.database import Base, db, delete, select
 from PyDrocsid.environment import CACHE_TTL
-from PyDrocsid.redis import redis
+from PyDrocsid.redis_client import redis
 
 
 @lock_deco

diff --git a/moderation/content_filter/cog.py b/moderation/content_filter/cog.py
@@ -11,7 +11,7 @@
 from PyDrocsid.emojis import name_to_emoji
 from PyDrocsid.environment import CACHE_TTL
 from PyDrocsid.events import StopEventHandling
-from PyDrocsid.redis import redis
+from PyDrocsid.redis_client import redis
 from PyDrocsid.translations import t
 
 from .colors import Colors

diff --git a/moderation/content_filter/models.py b/moderation/content_filter/models.py
@@ -8,7 +8,7 @@
 
 from PyDrocsid.database import Base, UTCDateTime, db, select
 from PyDrocsid.environment import CACHE_TTL
-from PyDrocsid.redis import redis
+from PyDrocsid.redis_client import redis
 
 
 async def sync_redis() -> list[str]:

diff --git a/moderation/logging/cog.py b/moderation/logging/cog.py
@@ -14,7 +14,7 @@
 from PyDrocsid.embeds import send_long_embed
 from PyDrocsid.environment import CACHE_TTL
 from PyDrocsid.logger import get_logger
-from PyDrocsid.redis import redis
+from PyDrocsid.redis_client import redis
 from PyDrocsid.translations import t
 from PyDrocsid.util import calculate_edit_distance, check_message_send_permissions
 

diff --git a/moderation/mediaonly/models.py b/moderation/mediaonly/models.py
@@ -8,7 +8,7 @@
 
 from PyDrocsid.database import Base, UTCDateTime, db, delete, filter_by, select
 from PyDrocsid.environment import CACHE_TTL
-from PyDrocsid.redis import redis
+from PyDrocsid.redis_client import redis
 
 
 class MediaOnlyChannel(Base):

diff --git a/moderation/spam_detection/cog.py b/moderation/spam_detection/cog.py
@@ -7,7 +7,7 @@
 
 from PyDrocsid.cog import Cog
 from PyDrocsid.command import CommandError, docs, reply
-from PyDrocsid.redis import redis
+from PyDrocsid.redis_client import redis
 from PyDrocsid.translations import t
 
 from .colors import Colors

diff --git a/moderation/threads/cog.py b/moderation/threads/cog.py
@@ -10,7 +10,7 @@
 from PyDrocsid.cog import Cog
 from PyDrocsid.command import docs
 from PyDrocsid.embeds import send_long_embed
-from PyDrocsid.redis import redis
+from PyDrocsid.redis_client import redis
 from PyDrocsid.settings import RoleSettings
 from PyDrocsid.translations import t