From d80fa23409c7585c45d566d133cae836a5917e74 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Thu, 17 Nov 2022 14:00:19 -0600 Subject: [PATCH] kofi: decide whether to load in __init__ this unifies some of the logic with how we load classes --- files/classes/__init__.py | 5 +++-- files/classes/transactions.py | 29 +++++++++++++---------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/files/classes/__init__.py b/files/classes/__init__.py index 642fbb7a9..dd1f6f2e1 100644 --- a/files/classes/__init__.py +++ b/files/classes/__init__.py @@ -3,7 +3,7 @@ from sqlalchemy.ext.declarative import declarative_base Base = declarative_base() # then load our required constants... -from files.helpers.const import FEATURES +from files.helpers.const import FEATURES, KOFI_TOKEN # then load all of our classes :) from .alts import * @@ -29,7 +29,8 @@ from .lottery import * from .casino_game import * from .hats import * from .marsey import * -from .transactions import * +if KOFI_TOKEN: + from .transactions import * from .sub_logs import * from .media import * if FEATURES['STREAMERS']: diff --git a/files/classes/transactions.py b/files/classes/transactions.py index e24698da1..3f9fb4441 100644 --- a/files/classes/transactions.py +++ b/files/classes/transactions.py @@ -1,19 +1,16 @@ -from files.helpers.const import KOFI_TOKEN +from sqlalchemy import Column +from sqlalchemy.sql.sqltypes import * -if KOFI_TOKEN: - from sqlalchemy import Column - from sqlalchemy.sql.sqltypes import * +from files.classes import Base - from files.classes import Base +class Transaction(Base): + __tablename__ = "transactions" + id = Column(String, primary_key=True) + created_utc = Column(Integer) + type = Column(String) + amount = Column(Integer) + email = Column(String) + claimed = Column(Boolean) - class Transaction(Base): - __tablename__ = "transactions" - id = Column(String, primary_key=True) - created_utc = Column(Integer) - type = Column(String) - amount = Column(Integer) - email = Column(String) - claimed = Column(Boolean) - - def __repr__(self): - return f"" + def __repr__(self): + return f""