diff --git a/controllers/faction/banking.py b/controllers/faction/banking.py index a8c14177..4b12b1bc 100644 --- a/controllers/faction/banking.py +++ b/controllers/faction/banking.py @@ -18,7 +18,7 @@ from flask import redirect, render_template, request from flask_login import current_user, login_required -from peewee import DataError, DoesNotExist +from peewee import JOIN, DataError, DoesNotExist from tornium_celery.tasks.api import discordget, discordpatch from tornium_celery.tasks.misc import send_dm from tornium_commons.errors import DiscordError @@ -114,7 +114,7 @@ def banking(): User.last_action, User.faction_position, ) - .join(FactionPosition) + .join(FactionPosition, JOIN.LEFT_OUTER) .where(User.tid == banker) .first() ) diff --git a/skynet/skyutils.py b/skynet/skyutils.py index e3d3d54a..fce401e8 100644 --- a/skynet/skyutils.py +++ b/skynet/skyutils.py @@ -20,9 +20,8 @@ import flask from nacl.signing import VerifyKey from peewee import DoesNotExist -from tornium_celery.tasks.api import tornget from tornium_celery.tasks.user import update_user -from tornium_commons import Config, rds +from tornium_commons import Config from tornium_commons.errors import MissingKeyError, NetworkingError, TornError from tornium_commons.models import Faction, Server, User from tornium_commons.skyutils import SKYNET_ERROR