Merge branch 'leo-release' into pillow

src/modules/ranks/ui/templates.py

@@ -16,21 +16,21 @@ Reward message defaults
 """
 
 voice_reward_msg = _p(
-    'ui:rank_editor|input:message|default|type:voice',
+    'rank_autocreate|message_defaults|type:voice',
     "Congratulations {user_mention}!\n"
     "For working hard for **{requires}**, you have achieved the rank of "
     "**{role_name}** in **{guild_name}**! Keep up the good work."
 )
 
 xp_reward_msg = _p(
-    'ui:rank_editor|input:message|default|type:xp',
+    'rank_autocreate|message_defaults|type:xp',
     "Congratulations {user_mention}!\n"
     "For earning **{requires}**, you have achieved the guild rank of "
     "**{role_name}** in **{guild_name}**!"
 )
 
 msg_reward_msg = _p(
-    'ui:rank_editor|input:message|default|type:msg',
+    'rank_autocreate|message_defaults|type:msg',
     "Congratulations {user_mention}!\n"
     "For sending **{requires}**, you have achieved the guild rank of "
     "**{role_name}** in **{guild_name}**!"

src/modules/shop/cog.py

@@ -101,8 +101,9 @@ class Shopping(LionCog):
             self.active_cogs.append(shop_cog)
 
     async def cog_unload(self):
-        for shop in self.shops:
-            await shop.unload()
+        # for shop in self.shops:
+        #     await shop.unload()
+        pass
 
     @cmds.hybrid_group(
         name=_p('group:editshop', 'editshop')

src/modules/sponsors/cog.py

@@ -20,7 +20,7 @@ class SponsorCog(LionCog):
     def __init__(self, bot: LionBot):
         self.bot = bot
         self.data: SponsorData = bot.db.load_registry(SponsorData())
-        self.settings = SponsorSettings
+        self.settings = SponsorSettings()
 
         self.whitelisted = self.settings.Whitelist._cache
 

src/modules/sysadmin/presence.py

@@ -284,7 +284,7 @@ class PresenceCtrl(LionCog):
     async def reload_presence(self) -> None:
         # Reload the presence information from the appconfig table
         # TODO: When botconfig is done, these should load from settings, instead of directly from data
-        self.data.AppPresence._cache_.pop(appname, None)
+        self.data.AppPresence._cache_.pop((appname,), None)
         self.activity_type = (await self.settings.PresenceType.get(appname)).value.value[2]
         self.activity_format = (await self.settings.PresenceName.get(appname)).value
         self.status = (await self.settings.PresenceStatus.get(appname)).value.value[2]

src/modules/topgg/cog.py

@@ -68,7 +68,7 @@ class TopggCog(LionCog):
         )
         await self._send_thanks_dm(userid)
 
-    async def voting_bonus(self, userid):
+    async def voting_bonus(self, guildid, userid, **kwargs):
         # Provides 1.25 multiplicative bonus if they have voted within 12h
         if await self.check_voted_recently(userid):
             return 1.25