From 334b6596ea086a981f1579285dba2e9a86cd5fc9 Mon Sep 17 00:00:00 2001
From: jsl12 <32917998+jsl12@users.noreply.github.com>
Date: Fri, 21 Jan 2022 17:53:54 -0600
Subject: [PATCH] first switch to nextcord

---
 Dockerfile             | 4 +++-
 kwaylon/jokes/base.py  | 2 +-
 kwaylon/jokes/jokes.py | 6 ++++--
 kwaylon/kwaylon.py     | 7 +++----
 main.py                | 4 ++--
 requirements.txt       | 4 ++--
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d89f1bb..ddfdea9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,11 +3,13 @@ FROM python:latest
 RUN python -m pip install --upgrade pip
 
 RUN pip install pandas
-RUN pip install discord.py
+# RUN pip install discord.py
 RUN pip install nltk
 RUN python -m nltk.downloader -d /usr/local/share/nltk_data all
 RUN pip install python-dotenv
 
+RUN pip install nextcord
+
 WORKDIR /usr/src/app
 COPY ./ ./
 
diff --git a/kwaylon/jokes/base.py b/kwaylon/jokes/base.py
index 2cf5319..2e5ce76 100644
--- a/kwaylon/jokes/base.py
+++ b/kwaylon/jokes/base.py
@@ -1,6 +1,6 @@
 import re
 
-import discord
+import nextcord as discord
 
 
 class Joke:
diff --git a/kwaylon/jokes/jokes.py b/kwaylon/jokes/jokes.py
index 1f59451..3feccbb 100644
--- a/kwaylon/jokes/jokes.py
+++ b/kwaylon/jokes/jokes.py
@@ -1,11 +1,13 @@
 import re
 
-import discord
-# import stockquotes
+import nextcord as discord
 
 from . import base, helpers
 
 
+# import stockquotes
+
+
 # TODO implement new jokes
 # - j'accuse
 # - egos
diff --git a/kwaylon/kwaylon.py b/kwaylon/kwaylon.py
index 6cca1a0..16878e3 100644
--- a/kwaylon/kwaylon.py
+++ b/kwaylon/kwaylon.py
@@ -2,11 +2,10 @@ import logging
 import re
 from pathlib import Path
 
-import discord
+import nextcord as discord
 import pandas as pd
-from discord import RawReactionActionEvent
 
-from . import data, jokes
+from . import jokes
 
 LIL_STINKY_ID = 704043422276780072
 
@@ -69,7 +68,7 @@ class Kwaylon(discord.Client):
                     LOGGER.info(f'{joke.__class__.__name__} detected: {message.content}, {m.group()}')
                     await joke.respond(message, self, m)
 
-    async def handle_raw_reaction(self, payload: RawReactionActionEvent):
+    async def handle_raw_reaction(self, payload: discord.RawReactionActionEvent):
         LOGGER.info(payload)
         guild = await self.fetch_guild(payload.guild_id)
         channel = await guild.fetch_channel(payload.channel_id)
diff --git a/main.py b/main.py
index 9fefa11..1250e2e 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,6 @@
 import os
 
-from discord import Message, RawReactionActionEvent
+import nextcord as discord
 from dotenv import load_dotenv
 
 from kwaylon import Kwaylon
@@ -23,7 +23,7 @@ if __name__ == '__main__':
 
 
     @client.event
-    async def on_message(message: Message):
+    async def on_message(message: discord.Message):
         await client.handle_message(message)
 
 
diff --git a/requirements.txt b/requirements.txt
index d981308..166b589 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 pandas
-discord.py
-# nextcord
+# discord.py
+nextcord
 nltk
 python-dotenv