chore: migrate all TimedCache usages to python commons

suggestions/bot.py

@@ -23,7 +23,6 @@
 from bot_base import BotBase, BotContext, PrefixNotFound
 
 from suggestions import State, Colors, Emojis, ErrorCode, Garven
-from suggestions.clunk import Clunk
 from suggestions.exceptions import (
     BetaOnly,
     MissingSuggestionsChannel,
@@ -49,7 +48,7 @@
 
 class SuggestionsBot(commands.AutoShardedInteractionBot, BotBase):
     def __init__(self, *args, **kwargs):
-        self.version: str = "Public Release 3.20"
+        self.version: str = "Public Release 3.21"
         self.main_guild_id: int = 601219766258106399
         self.legacy_beta_role_id: int = 995588041991274547
         self.automated_beta_role_id: int = 998173237282361425
@@ -75,7 +74,6 @@ def __init__(self, *args, **kwargs):
         self.state: State = State(self.db, self)
         self.stats: Stats = Stats(self)
         self.garven: Garven = Garven(self)
-        self.clunk: Clunk = Clunk(self.state)
         self.suggestion_emojis: Emojis = Emojis(self)
         self.old_prefixed_commands: set[str] = {
             "changelog",
@@ -595,7 +593,6 @@ async def graceful_shutdown(self) -> None:
         """
         log.debug("Attempting to shutdown")
         self.state.notify_shutdown()
-        await self.clunk.kill_all()
         await self.zonis.client.close()
         await asyncio.gather(*self.state.background_tasks)
         log.info("Shutting down")

suggestions/state.py

@@ -14,8 +14,7 @@
 from alaric.logical import AND
 from alaric.meta import Negate
 from alaric.projections import PROJECTION, SHOW
-from bot_base import NonExistentEntry
-from bot_base.caches import TimedCache
+from commons.caching import NonExistentEntry, TimedCache
 
 from suggestions.objects import GuildConfig, UserConfig
 

suggestions/stats.py

@@ -4,14 +4,12 @@
 import datetime
 import logging
 from enum import Enum
-from typing import TYPE_CHECKING, Optional, Dict, Literal, Union, Type
+from typing import TYPE_CHECKING, Optional, Type
 
 import alaric
 from alaric import Cursor, AQ
 from alaric.comparison import EQ
-from alaric.types import ObjectId
-from bot_base.caches import TimedCache
-from motor.motor_asyncio import AsyncIOMotorCollection
+from commons.caching import TimedCache
 
 from suggestions.objects.stats import MemberStats, MemberCommandStats
 

tests/conftest.py

@@ -1,13 +1,11 @@
 import os
 from unittest.mock import AsyncMock
 
-import disnake
 import pytest
 
 from causar import Causar, InjectionMetadata
 
 import suggestions
-from suggestions.clunk import ClunkLock, Clunk
 from tests.mocks import MockedSuggestionsMongoManager
 
 
@@ -43,13 +41,3 @@ async def injection_metadata(causar: Causar) -> InjectionMetadata:
     return InjectionMetadata(
         guild_id=881118111967883295, channel_id=causar.faker.generate_snowflake()
     )
-
-
-@pytest.fixture
-async def clunk_lock(causar: Causar) -> ClunkLock:
-    return ClunkLock(causar.bot.state)  # type: ignore
-
-
-@pytest.fixture
-async def clunk(causar: Causar) -> Clunk:
-    return Clunk(causar.bot.state)  # type: ignore