cat

splatnet_assets/templatetags/mask_id.py

@@ -1,7 +1,6 @@
 from django import template
 from django.utils.crypto import get_random_string
 
-from splatnet_assets.fields import Color
 from splatnet_assets.models import SubWeapon, SpecialWeapon
 from users.models import User, SponsorshipTiers
 
@@ -20,6 +19,6 @@ def get_color(context, uploader: User):
         context['color'] = uploader.favorite_color
     elif hasattr(context, 'user') and context['user'].is_authenticated:
         context['color'] = context['user'].favorite_color
-    else:
-        context['color'] = Color.from_hex("000000ff")
+    if not context.get('color'):
+        context['color'] = uploader.battles.latest("played_time").teams.first().color
     return ''

users/models.py

@@ -14,7 +14,7 @@
 
 from battles.models import Battle
 from splatnet_assets.common_model_choices import XBattleDivisions
-from splatnet_assets.fields import ColorField, Color
+from splatnet_assets.fields import ColorField
 
 # Create your models here.
 
@@ -77,8 +77,6 @@ class User(AbstractUser):
     def favorite_color(self):
         if self.sponsor_tiers[SponsorshipTiers.SPONSOR] is True:
             return self.saved_favorite_color
-        else:
-            return Color.from_hex("000000ff")
 
     @property
     def display_sponsor_badge(self):