diff --git a/litecord/blueprints/user/billing.py b/litecord/blueprints/user/billing.py index e96be98..77a8093 100644 --- a/litecord/blueprints/user/billing.py +++ b/litecord/blueprints/user/billing.py @@ -1,14 +1,19 @@ import json +import datetime from enum import Enum from quart import Blueprint, jsonify, request, current_app as app +from logbook import Logger from litecord.auth import token_check from litecord.schemas import validate from litecord.snowflake import snowflake_datetime, get_snowflake from litecord.errors import BadRequest -from litecord.types import timestamp_ +from litecord.types import timestamp_, HOURS +from litecord.enums import UserFlags, PremiumType +from litecord.blueprints.users import mass_user_update +log = Logger(__name__) bp = Blueprint('users_billing', __name__) @@ -43,12 +48,6 @@ class PaymentStatus: FAILED = 2 -class PremiumType: - TIER_1 = 1 - TIER_2 = 2 - NONE = None - - PLAN_ID_TO_TYPE = { 'premium_month_tier_1': PremiumType.TIER_1, 'premium_month_tier_2': PremiumType.TIER_2, diff --git a/litecord/blueprints/user/billing_job.py b/litecord/blueprints/user/billing_job.py index 4bf22dc..049f413 100644 --- a/litecord/blueprints/user/billing_job.py +++ b/litecord/blueprints/user/billing_job.py @@ -11,10 +11,7 @@ from litecord.blueprints.user.billing import ( ) from litecord.snowflake import snowflake_datetime -from litecord.types import MINUTES, HOURS -from litecord.enums import UserFlags - -from litecord.blueprints.users import mass_user_update +from litecord.types import MINUTES log = Logger(__name__) diff --git a/litecord/blueprints/users.py b/litecord/blueprints/users.py index 870d4f8..3354a46 100644 --- a/litecord/blueprints/users.py +++ b/litecord/blueprints/users.py @@ -12,7 +12,7 @@ from .auth import check_password from litecord.auth import hash_data, check_username_usage from litecord.blueprints.guild.mod import remove_member -from litecord.blueprints.user.billing import PremiumType +from litecord.enums import PremiumType from litecord.images import parse_data_uri from litecord.permissions import base_permissions diff --git a/litecord/enums.py b/litecord/enums.py index 1c2a920..ecced2e 100644 --- a/litecord/enums.py +++ b/litecord/enums.py @@ -163,3 +163,9 @@ class MessageNotifications(EasyEnum): ALL = 0 MENTIONS = 1 NOTHING = 2 + + +class PremiumType: + TIER_1 = 1 + TIER_2 = 2 + NONE = None