From 60ab06b544727d1628c82435a0f73c1f7339316a Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Thu, 17 Mar 2022 15:52:26 -0600 Subject: [PATCH] Remove phishing sync, rely on external API for now --- jarvis/__init__.py | 4 ++-- jarvis/client.py | 13 ++++++------- poetry.lock | 14 +++++++------- run.py | 4 +++- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/jarvis/__init__.py b/jarvis/__init__.py index 78628f8..38c27d8 100644 --- a/jarvis/__init__.py +++ b/jarvis/__init__.py @@ -26,7 +26,7 @@ jarvis = Jarvis(intents=intents, default_prefix="!", sync_interactions=jconfig.s __version__ = "2.0.0a1" -def run() -> None: +async def run() -> None: """Run J.A.R.V.I.S.""" connect(**jconfig.mongo["connect"], testing=jconfig.mongo["database"] != "jarvis") jconfig.get_db_config() @@ -35,4 +35,4 @@ def run() -> None: jarvis.load_extension(extension) jarvis.max_messages = jconfig.max_messages - jarvis.start(jconfig.token) + await jarvis.astart(jconfig.token) diff --git a/jarvis/client.py b/jarvis/client.py index e05e958..921e999 100644 --- a/jarvis/client.py +++ b/jarvis/client.py @@ -7,13 +7,12 @@ from aiohttp import ClientSession from dis_snek import Snake, listen from dis_snek.api.events.discord import MessageCreate, MessageDelete, MessageUpdate from dis_snek.client.utils.misc_utils import find, find_all -from dis_snek.ext.tasks.task import Task -from dis_snek.ext.tasks.triggers import TimeTrigger from dis_snek.models.discord.channel import DMChannel from dis_snek.models.discord.embed import EmbedField from dis_snek.models.discord.message import Message from dis_snek.models.discord.user import Member from dis_snek.models.snek.context import Context, InteractionContext +from dis_snek.models.snek.tasks import Task, TimeTrigger from jarvis_core.db import q from jarvis_core.db.models import Autopurge, Autoreact, Roleping, Setting, Warning from jarvis_core.filters import invites, url @@ -70,8 +69,8 @@ class Jarvis(Snake): @listen() async def on_ready(self) -> None: """Lepton on_ready override.""" - await self._sync_domains() - self._update_domains.start() + # await self._sync_domains() + # self._update_domains.start() print("Logged in as {}".format(self.user)) # noqa: T001 print("Connected to {} guild(s)".format(len(self.guilds))) # noqa: T001 print( # noqa: T001 @@ -501,16 +500,17 @@ class Jarvis(Snake): fields=fields, ) embed.set_author( - name=message.author.nick if message.author.nick else message.author.name, + name=message.author.display_name, icon_url=message.author.display_avatar.url, ) embed.set_footer( - text=f"{message.author.name}#{message.author.discriminator} | {message.author.id}" + text=f"{message.author.user.username}#{message.author.discriminator} | {message.author.id}" ) await message.channel.send(embed=embed) await message.delete() break + @listen() async def on_message(self, event: MessageCreate) -> None: """Handle on_message event. Calls other event handlers.""" message = event.message @@ -520,5 +520,4 @@ class Jarvis(Snake): await self.roleping(message) await self.autopurge(message) await self.checks(message) - await self.phishing(message) await self.malicious_url(message) diff --git a/poetry.lock b/poetry.lock index e84ca98..2d8bfcf 100644 --- a/poetry.lock +++ b/poetry.lock @@ -214,7 +214,7 @@ plugins = ["setuptools"] [[package]] name = "jarvis-core" -version = "0.5.0" +version = "0.6.0" description = "" category = "main" optional = false @@ -232,7 +232,7 @@ umongo = "^3.1.0" type = "git" url = "https://git.zevaryx.com/stark-industries/jarvis/jarvis-core.git" reference = "main" -resolved_reference = "f392757bb773cfeb9b3f14d581a599d13ee6e891" +resolved_reference = "8e3276a81575927e4484dfaa5c3e0e894e3c4707" [[package]] name = "jedi" @@ -555,18 +555,18 @@ test = ["pylint", "pycodestyle", "pyflakes", "pytest", "pytest-cov", "coverage"] [[package]] name = "python-lsp-server" -version = "1.3.3" +version = "1.4.0" description = "Python Language Server for the Language Server Protocol" category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" [package.dependencies] autopep8 = {version = ">=1.6.0,<1.7.0", optional = true, markers = "extra == \"all\""} flake8 = {version = ">=4.0.0,<4.1.0", optional = true, markers = "extra == \"all\""} jedi = ">=0.17.2,<0.19.0" mccabe = {version = ">=0.6.0,<0.7.0", optional = true, markers = "extra == \"all\""} -pluggy = "*" +pluggy = ">=1.0.0" pycodestyle = {version = ">=2.8.0,<2.9.0", optional = true, markers = "extra == \"all\""} pydocstyle = {version = ">=2.0.0", optional = true, markers = "extra == \"all\""} pyflakes = {version = ">=2.4.0,<2.5.0", optional = true, markers = "extra == \"all\""} @@ -1444,8 +1444,8 @@ python-lsp-jsonrpc = [ {file = "python_lsp_jsonrpc-1.0.0-py3-none-any.whl", hash = "sha256:079b143be64b0a378bdb21dff5e28a8c1393fe7e8a654ef068322d754e545fc7"}, ] python-lsp-server = [ - {file = "python-lsp-server-1.3.3.tar.gz", hash = "sha256:1b48ccd8b70103522e8a8b9cb9ae1be2b27a5db0dfd661e7e44e6253ebefdc40"}, - {file = "python_lsp_server-1.3.3-py3-none-any.whl", hash = "sha256:ea7b1e623591ccbfbbf8e5dfe0df8119f27863125a58bdcacbacd1937d8e8cb3"}, + {file = "python-lsp-server-1.4.0.tar.gz", hash = "sha256:769142c07573f6b66e930cbd7c588b826082550bef6267bb0aec63e7b6260009"}, + {file = "python_lsp_server-1.4.0-py3-none-any.whl", hash = "sha256:3160c97c6d1edd8456f262fc0e4aad6b322c0cfd1b58d322a41679e57787594d"}, ] pyyaml = [ {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, diff --git a/run.py b/run.py index 7e6a73e..d53ee79 100755 --- a/run.py +++ b/run.py @@ -1,5 +1,7 @@ """Main run file for J.A.R.V.I.S.""" +import asyncio + from jarvis import run if __name__ == "__main__": - run() + asyncio.run(run())