From d0ea61a5bea5069d79ee030a2f2ecf3dc955c9e6 Mon Sep 17 00:00:00 2001 From: Leander Furumo Date: Thu, 11 Apr 2024 05:12:26 +0200 Subject: [PATCH] run pre-commit --- bot/requirements.txt | 2 +- bot/src/cogs/dev_tools.py | 3 +-- bot/src/cogs/errors.py | 3 +-- bot/src/cogs/galtinn.py | 7 +++---- bot/src/cogs/info.py | 5 ++--- bot/src/cogs/viteboka.py | 3 +-- bot/src/run.py | 1 - verification_server/requirements.txt | 2 +- verification_server/src/server.py | 3 +-- 9 files changed, 11 insertions(+), 18 deletions(-) diff --git a/bot/requirements.txt b/bot/requirements.txt index 0b2f8ec..9a19a8e 100644 --- a/bot/requirements.txt +++ b/bot/requirements.txt @@ -1,7 +1,7 @@ asyncio==3.4.* +asyncpg==0.29.* discord.py==2.3.* psutil==5.9.* -asyncpg==0.29.* pypandoc==1.13.* python-dotenv==1.0.* regex==2023.12.25 diff --git a/bot/src/cogs/dev_tools.py b/bot/src/cogs/dev_tools.py index 8438534..b9961d0 100644 --- a/bot/src/cogs/dev_tools.py +++ b/bot/src/cogs/dev_tools.py @@ -2,9 +2,8 @@ import asyncio from os import listdir import discord -from discord.ext import commands - from cogs.utils import embed_templates +from discord.ext import commands class DevTools(commands.Cog): diff --git a/bot/src/cogs/errors.py b/bot/src/cogs/errors.py index 037e8eb..ea51ac6 100644 --- a/bot/src/cogs/errors.py +++ b/bot/src/cogs/errors.py @@ -1,11 +1,10 @@ import traceback import discord +from cogs.utils import embed_templates from discord import app_commands from discord.ext import commands -from cogs.utils import embed_templates - class Errors(commands.Cog): """Error handlers for commands""" diff --git a/bot/src/cogs/galtinn.py b/bot/src/cogs/galtinn.py index 7dae31c..1dd4a49 100644 --- a/bot/src/cogs/galtinn.py +++ b/bot/src/cogs/galtinn.py @@ -1,16 +1,15 @@ import asyncio -from datetime import datetime import secrets import urllib.parse +from datetime import datetime import discord +from cogs.utils import embed_templates +from cogs.utils import misc_utils from discord import app_commands from discord.ext import commands from discord.ext import tasks -from cogs.utils import embed_templates -from cogs.utils import misc_utils - class Galtinn(commands.Cog): """Manage Galtinn membership and roles for users""" diff --git a/bot/src/cogs/info.py b/bot/src/cogs/info.py index fd4893d..ee56495 100644 --- a/bot/src/cogs/info.py +++ b/bot/src/cogs/info.py @@ -1,10 +1,9 @@ import discord -from discord import app_commands -from discord.ext import commands - from cogs.utils import discord_utils from cogs.utils import embed_templates from cogs.utils import misc_utils +from discord import app_commands +from discord.ext import commands class Info(commands.Cog): diff --git a/bot/src/cogs/viteboka.py b/bot/src/cogs/viteboka.py index bdda7f7..9edc53a 100644 --- a/bot/src/cogs/viteboka.py +++ b/bot/src/cogs/viteboka.py @@ -2,11 +2,10 @@ import discord import pypandoc import regex # This should be redundant as re now supports recursive patterns, but apparently it doesn't import requests +from cogs.utils import embed_templates from discord import app_commands from discord.ext import commands -from cogs.utils import embed_templates - WIKI_BASE_URL = "https://viteboka.studentersamfundet.no" API_URL = f"{WIKI_BASE_URL}/w/api.php" diff --git a/bot/src/run.py b/bot/src/run.py index a47c3ac..2f53807 100644 --- a/bot/src/run.py +++ b/bot/src/run.py @@ -5,7 +5,6 @@ import asyncpg import discord from discord.ext import commands from dotenv import load_dotenv - from logger import BotLogger # Load config file diff --git a/verification_server/requirements.txt b/verification_server/requirements.txt index 2358332..7f0deaf 100644 --- a/verification_server/requirements.txt +++ b/verification_server/requirements.txt @@ -1,6 +1,6 @@ aiohttp==3.9.* +asyncpg==0.29.* fastapi==0.110.* jinja2==3.1.* -asyncpg==0.29.* python-dotenv==1.0.* uvicorn==0.29.* diff --git a/verification_server/src/server.py b/verification_server/src/server.py index 5d1ff3a..d44270d 100644 --- a/verification_server/src/server.py +++ b/verification_server/src/server.py @@ -1,7 +1,7 @@ import os -import asyncpg import aiohttp +import asyncpg from dotenv import load_dotenv from fastapi import FastAPI from fastapi import Request @@ -46,7 +46,6 @@ async def index(): @app.get("/callback") async def callback(request: Request, code: str, state: str): - # Check if user is pending verification verification = await app.state.pool.fetchrow( """