From cc8858b7acfb6532b0ede926ab97fd4d7f412b06 Mon Sep 17 00:00:00 2001 From: Yusur Princeps Date: Sun, 31 Aug 2025 19:54:41 +0200 Subject: [PATCH] fix imports --- freak/__init__.py | 17 +++++++++-------- freak/website/moderation.py | 4 +++- pyproject.toml | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/freak/__init__.py b/freak/__init__.py index 15b37ba..287fae0 100644 --- a/freak/__init__.py +++ b/freak/__init__.py @@ -26,7 +26,7 @@ from suou import twocolon_list, WantsContentType from .colors import color_themes, theme_classes -__version__ = '0.5.0-dev33' +__version__ = '0.5.0-dev34' APP_BASE_DIR = os.path.dirname(os.path.dirname(__file__)) @@ -253,15 +253,15 @@ async def find_guild_or_user(name: str) -> str | None: gu = (await session.execute(select(Guild).where(Guild.name == name))).scalar() user = (await session.execute(select(User).where(User.username == name))).scalar() - if gu is not None: - await flash(f'There is nothing at /{name}. Luckily, a guild with name {gu.handle()} happens to exist. Next time, remember to add + before!') - return gu.url() + if gu is not None: + await flash(f'There is nothing at /{name}. Luckily, a guild with name {gu.handle()} happens to exist. Next time, remember to add + before!') + return gu.url() - if user is not None: - await flash(f'There is nothing at /{name}. Luckily, a user named {user.handle()} happens to exist. Next time, remember to add @ before!') - return user.url() + if user is not None: + await flash(f'There is nothing at /{name}. Luckily, a user named {user.handle()} happens to exist. Next time, remember to add @ before!') + return user.url() - return None + return None @app.errorhandler(404) async def error_404(body): @@ -273,6 +273,7 @@ async def error_404(body): except Exception as e: logger.error(f'Exception in find_guild_or_user: {e}') pass + print(request.host) return await error_handler_for(404, 'Not found', '404.html') @app.errorhandler(405) diff --git a/freak/website/moderation.py b/freak/website/moderation.py index f7affb0..31595a2 100644 --- a/freak/website/moderation.py +++ b/freak/website/moderation.py @@ -1,10 +1,12 @@ +from __future__ import annotations from quart import Blueprint, abort, flash, render_template, request from quart_auth import current_user, login_required from sqlalchemy import select import datetime -from freak.utils import get_request_form +from .. import UserLoader +from ..utils import get_request_form from ..models import db, User, Guild diff --git a/pyproject.toml b/pyproject.toml index 72716f7..65d7a3c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ dependencies = [ "libsass", "setuptools>=78.1.0", "Hypercorn", - "sakuragasaki46-suou>=0.5.0" + "sakuragasaki46-suou>=0.5.2" ] requires-python = ">=3.10" classifiers = [