diff --git a/litecord/blueprints/admin_api/users.py b/litecord/blueprints/admin_api/users.py index b8b0acd..b1bbe98 100644 --- a/litecord/blueprints/admin_api/users.py +++ b/litecord/blueprints/admin_api/users.py @@ -20,13 +20,17 @@ along with this program. If not, see . from quart import Blueprint, jsonify, current_app as app, request from litecord.auth import admin_check -from litecord.blueprints.auth import create_user from litecord.schemas import validate from litecord.admin_schemas import USER_CREATE, USER_UPDATE from litecord.errors import BadRequest, Forbidden from litecord.utils import async_map -from litecord.blueprints.users import delete_user, user_disconnect, mass_user_update from litecord.enums import UserFlags +from litecord.common.users import ( + create_user, + delete_user, + user_disconnect, + mass_user_update, +) bp = Blueprint("users_admin", __name__) diff --git a/litecord/blueprints/auth.py b/litecord/blueprints/auth.py index ba0a2a5..4b60a69 100644 --- a/litecord/blueprints/auth.py +++ b/litecord/blueprints/auth.py @@ -25,7 +25,8 @@ import bcrypt from quart import Blueprint, jsonify, request, current_app as app from logbook import Logger -from litecord.auth import token_check, create_user +from litecord.auth import token_check +from litecord.common.users import create_user from litecord.schemas import validate, REGISTER, REGISTER_WITH_INVITE from litecord.errors import BadRequest from litecord.snowflake import get_snowflake diff --git a/litecord/blueprints/users.py b/litecord/blueprints/users.py index 7009bd5..cf49d9f 100644 --- a/litecord/blueprints/users.py +++ b/litecord/blueprints/users.py @@ -27,7 +27,7 @@ from ..errors import Forbidden, BadRequest, Unauthorized from ..schemas import validate, USER_UPDATE, GET_MENTIONS from .guilds import guild_check -from litecord.auth import token_check, hash_data, check_username_usage, roll_discrim +from litecord.auth import token_check, hash_data from litecord.common.guilds import remove_member from litecord.enums import PremiumType @@ -36,7 +36,12 @@ from litecord.permissions import base_permissions from litecord.blueprints.auth import check_password from litecord.utils import to_update -from litecord.common.users import mass_user_update, delete_user +from litecord.common.users import ( + mass_user_update, + delete_user, + check_username_usage, + roll_discrim, +) bp = Blueprint("user", __name__) log = Logger(__name__)