Anaffer migration (dis-snek -> naff rename)

jarvis_tasks/__init__.py

@@ -3,9 +3,9 @@ import asyncio
 from typing import Optional
 
 import rook
-from dis_snek import Intents, Snake
 from jarvis_core.db import connect
 from jarvis_core.log import get_logger
+from naff import Client, Intents
 
 from jarvis_tasks import const
 from jarvis_tasks.config import TaskConfig
@@ -49,7 +49,7 @@ async def _start(config: Optional[str] = "config.yaml") -> None:
     # Login as bot
     logger.debug("Logging in bot")
     intents = Intents.DEFAULT | Intents.GUILD_MEMBERS
-    bot = Snake(intents=intents, loop=loop)
+    bot = Client(intents=intents, loop=loop)
     await bot.login(config.token)
     logger.info(f"Logged in as {bot.user.username}#{bot.user.discriminator}")
 

jarvis_tasks/tasks/autokick.py

@@ -3,16 +3,16 @@ import asyncio
 import logging
 from datetime import datetime, timedelta, timezone
 
-from dis_snek import Snake
 from jarvis_core.db import q
 from jarvis_core.db.models import Setting
+from naff import Client
 
 logger = logging.getLogger(__name__)
 
 resync = {}
 
 
-async def autokick(bot: Snake) -> None:
+async def autokick(bot: Client) -> None:
     """
     Autokick unverified usersself.
 

jarvis_tasks/tasks/ban.py

@@ -3,12 +3,12 @@ import asyncio
 import logging
 from datetime import datetime, timedelta, timezone
 
-from dis_snek import Snake
-from dis_snek.client.errors import NotFound
-from dis_snek.models.discord.guild import Guild
-from dis_snek.models.discord.user import User
 from jarvis_core.db import q
 from jarvis_core.db.models import Ban, Unban
+from naff import Client
+from naff.client.errors import NotFound
+from naff.models.discord.guild import Guild
+from naff.models.discord.user import User
 
 from jarvis_tasks.util import runat
 
@@ -36,12 +36,12 @@ async def _unban(bot: int, guild: Guild, user: User, ban: Ban) -> None:
     queue.remove(ban.id)
 
 
-async def unban(bot: Snake) -> None:
+async def unban(bot: Client) -> None:
     """
     Unban users when ban expires.
 
     Args:
-        bot: Snake instance
+        bot: Client instance
     """
     logger.debug("Starting Task-ban")
     while True:

jarvis_tasks/tasks/lock.py

@@ -3,11 +3,11 @@ import asyncio
 import logging
 from datetime import datetime, timedelta, timezone
 
-from dis_snek import Snake
-from dis_snek.client.utils.misc_utils import get
-from dis_snek.models.discord.channel import GuildChannel
 from jarvis_core.db import q
 from jarvis_core.db.models import Lock
+from naff import Client
+from naff.client.utils.misc_utils import get
+from naff.models.discord.channel import GuildChannel
 
 from jarvis_tasks.util import runat
 
@@ -37,7 +37,7 @@ async def _unlock(channel: GuildChannel, lock: Lock) -> None:
     queue.remove(lock.id)
 
 
-async def unlock(bot: Snake) -> None:
+async def unlock(bot: Client) -> None:
     """
     Unlock locked channels.
 

jarvis_tasks/tasks/lockdown.py

@@ -3,11 +3,11 @@ import asyncio
 import logging
 from datetime import datetime, timedelta, timezone
 
-from dis_snek import Snake
-from dis_snek.models.discord.enums import Permissions
-from dis_snek.models.discord.role import Role
 from jarvis_core.db import q
 from jarvis_core.db.models import Lockdown
+from naff import Client
+from naff.models.discord.enums import Permissions
+from naff.models.discord.role import Role
 
 from jarvis_tasks.util import runat
 
@@ -24,7 +24,7 @@ async def _lift(role: Role, lock: Lockdown) -> None:
     queue.remove(lock.id)
 
 
-async def lift(bot: Snake) -> None:
+async def lift(bot: Client) -> None:
     """
     Lift a lockdown.
 

jarvis_tasks/tasks/reddit.py

@@ -8,11 +8,11 @@ from asyncpraw import Reddit
 from asyncpraw.models.reddit.submission import Submission
 from asyncpraw.models.reddit.submission import Subreddit as Sub
 from asyncprawcore.exceptions import Forbidden, NotFound
-from dis_snek import Snake
-from dis_snek.client.errors import NotFound as DNotFound
-from dis_snek.models.discord.embed import Embed
 from jarvis_core.db import q
 from jarvis_core.db.models import Subreddit, SubredditFollow
+from naff import Client
+from naff.client.errors import NotFound as DNotFound
+from naff.models.discord.embed import Embed
 
 from jarvis_tasks import const
 from jarvis_tasks.config import TaskConfig
@@ -86,13 +86,13 @@ async def post_embeds(sub: Sub, post: Submission) -> Optional[List[Embed]]:
     return embeds
 
 
-async def _stream(sub: Sub, bot: Snake) -> None:
+async def _stream(sub: Sub, bot: Client) -> None:
     """
     Stream a subreddit
 
     Args:
         sub: Subreddit to stream
-        bot: Snake instance
+        bot: Client instance
     """
     now = datetime.now(tz=timezone.utc)
     await sub.load()
@@ -151,12 +151,12 @@ async def _stream(sub: Sub, bot: Snake) -> None:
     running.remove(sub.display_name)
 
 
-async def reddit(bot: Snake) -> None:
+async def reddit(bot: Client) -> None:
     """
     Sync Reddit posts in the background.
 
     Args:
-        bot: Snake instance
+        bot: Client instance
     """
     if not config.reddit:
         logger.warn("Missing Reddit config, not starting")

jarvis_tasks/tasks/reminder.py

@@ -4,12 +4,12 @@ import logging
 from datetime import datetime, timedelta, timezone
 from typing import Optional
 
-from dis_snek import Snake
-from dis_snek.models.discord.channel import GuildText
-from dis_snek.models.discord.embed import Embed
-from dis_snek.models.discord.user import User
 from jarvis_core.db import q
 from jarvis_core.db.models import Reminder
+from naff import Client
+from naff.models.discord.channel import GuildText
+from naff.models.discord.embed import Embed
+from naff.models.discord.user import User
 
 from jarvis_tasks.util import build_embed, runat
 
@@ -56,12 +56,12 @@ async def _remind(
     queue.remove(reminder.id)
 
 
-async def remind(bot: Snake) -> None:
+async def remind(bot: Client) -> None:
     """
     Run reminders in the background.
 
     Args:
-        bot: Snake instance
+        bot: Client instance
     """
     logger.debug("Starting Task-remind")
     while True:

jarvis_tasks/tasks/temprole.py

@@ -3,9 +3,9 @@ import asyncio
 import logging
 from datetime import datetime, timedelta, timezone
 
-from dis_snek import Snake
 from jarvis_core.db import q
 from jarvis_core.db.models import Temprole
+from naff import Client
 
 from jarvis_tasks.util import runat
 
@@ -13,7 +13,7 @@ queue = []
 logger = logging.getLogger(__name__)
 
 
-async def _remove(bot: Snake, temprole: Temprole) -> None:
+async def _remove(bot: Client, temprole: Temprole) -> None:
     logger.debug(f"Removing temprole {temprole.id}")
     guild = await bot.fetch_guild(temprole.guild)
     if not guild:
@@ -42,12 +42,12 @@ async def _remove(bot: Snake, temprole: Temprole) -> None:
     await temprole.delete()
 
 
-async def remove(bot: Snake) -> None:
+async def remove(bot: Client) -> None:
     """
     Remove temproles when they expire.
 
     Args:
-        bot: Snake instance
+        bot: Client instance
     """
     logger.debug("Starting Task-remove")
     while True:

jarvis_tasks/tasks/twitter.py

@@ -4,11 +4,11 @@ from datetime import datetime, timedelta, timezone
 from typing import List
 
 import tweepy.asynchronous
-from dis_snek import Snake
-from dis_snek.client.errors import NotFound
-from dis_snek.models.discord.embed import Embed
 from jarvis_core.db import q
 from jarvis_core.db.models import TwitterAccount, TwitterFollow
+from naff import Client
+from naff.client.errors import NotFound
+from naff.models.discord.embed import Embed
 from tweepy.asynchronous import AsyncStream
 from tweepy.models import Status
 
@@ -78,7 +78,7 @@ def tweet_embeds(tweet: Status) -> List[Embed]:
 class JARVISTwitterStream(AsyncStream):
     """JARVIS Twitter AsyncStream client."""
 
-    def __init__(self, bot: Snake, *args, **kwargs):
+    def __init__(self, bot: Client, *args, **kwargs):
         if not bot:
             raise ValueError("Missing bot")
         super().__init__(*args, **kwargs)
@@ -152,12 +152,12 @@ class JARVISTwitterStream(AsyncStream):
             self.disconnect()
 
 
-async def twitter(bot: Snake) -> None:
+async def twitter(bot: Client) -> None:
     """
     Sync tweets in the background.
 
     Args:
-        bot: Snake instance
+        bot: Client instance
     """
     if not config.twitter:
         logger.warn("Missing Twitter config, not starting")

jarvis_tasks/tasks/warning.py

@@ -3,9 +3,9 @@ import asyncio
 import logging
 from datetime import datetime, timedelta, timezone
 
-from dis_snek import Snake
 from jarvis_core.db import q
 from jarvis_core.db.models import Warning
+from naff import Client
 
 from jarvis_tasks.util import runat
 
@@ -20,12 +20,12 @@ async def _unwarn(warn: Warning) -> None:
     queue.remove(warn.id)
 
 
-async def unwarn(bot: Snake) -> None:
+async def unwarn(bot: Client) -> None:
     """
     Deactivate warnings when they expire.
 
     Args:
-        bot: Snake instance
+        bot: Client instance
     """
     logger.debug("Starting Task-unwarn")
     while True:

jarvis_tasks/util.py

@@ -4,7 +4,7 @@ from datetime import datetime, timezone
 from logging import Logger
 from typing import Coroutine
 
-from dis_snek.models.discord.embed import Embed
+from naff.models.discord.embed import Embed
 
 
 async def runat(when: datetime, coro: Coroutine, logger: Logger) -> None: