Bug fix

controllers/api/faction/assist.py

@@ -247,14 +247,6 @@ def forward_assist(*args, **kwargs):
             },
         )
 
-    stat: StatModel = (
-        StatModel.objects(
-            Q(tid=target_tid) & (Q(globalstat=True) | Q(addedfactiontid=user.factionid) | Q(addedid=user_tid))
-        )
-        .order_by("-timeadded")
-        .first()
-    )
-
     stat: typing.Optional[Stat]
     try:
         stat = Stat.get(

controllers/api/stocks/movers.py

@@ -28,7 +28,7 @@
 def get_closest_tick(stock_id: int, start_timestamp: int):
     for n in range(1, 30):
         tick_id = int(bin(stock_id), 2) + int(bin((start_timestamp + n * 60) << 8), 2)
-        tick: typing.Optional[TickModel] = TickModel.objects(tick_id=tick_id).first()
+        tick: typing.Optional[StockTick] = StockTick.objects(tick_id=tick_id).first()
 
         if tick is not None:
             return tick

skynet/commands/faction/fulfill.py

@@ -26,31 +26,6 @@
 from skynet.skyutils import get_admin_keys
 
 
-def fulfiller_string(withdrawal: WithdrawalModel) -> str:
-    if withdrawal.fulfiller == 0:
-        return "is not fulfilled"
-    elif withdrawal.fulfiller == -1:
-        return "has been cancelled by the system"
-    elif withdrawal.fulfiller < -1:
-        user: typing.Optional[UserModel] = UserModel.objects(tid=-withdrawal.fulfiller).only("name", "tid").first()
-
-        if user is None:
-            return "has been cancelled by someone"
-
-        return f"has been cancelled by {user.name} [{user.tid}]"
-    elif withdrawal.fulfiller == 1:
-        return "has been fulfilled by someone"
-    elif withdrawal.fulfiller > 1:
-        user: typing.Optional[UserModel] = UserModel.objects(tid=withdrawal.fulfiller).only("name", "tid").first()
-
-        if user is None:
-            return "has been fulfilled by someone"
-
-        return f"has been fulfilled by {user.name} [{user.tid}]"
-
-    return "has an unknown fulfill type"
-
-
 def fulfill_command(interaction, *args, **kwargs):
     if "guild_id" not in interaction:
         return {