diff --git a/files/helpers/actions.py b/files/helpers/actions.py index 8864ae9eb..c709d0426 100644 --- a/files/helpers/actions.py +++ b/files/helpers/actions.py @@ -68,13 +68,13 @@ def execute_snappy(post:Submission, v:User): else: body = "wow, a good lawlzpost for once!" else: if IS_DKD(): - SNAPPY_CHOICES = SNAPPY_MARSEYS - elif SNAPPY_MARSEYS and SNAPPY_QUOTES: + SNAPPY_CHOICES = SNAPPY_EMOJIS + elif SNAPPY_EMOJIS and SNAPPY_QUOTES: if IS_FISTMAS() or random.random() > 0.5: SNAPPY_CHOICES = SNAPPY_QUOTES else: - SNAPPY_CHOICES = SNAPPY_MARSEYS - elif SNAPPY_MARSEYS: SNAPPY_CHOICES = SNAPPY_MARSEYS + SNAPPY_CHOICES = SNAPPY_EMOJIS + elif SNAPPY_EMOJIS: SNAPPY_CHOICES = SNAPPY_EMOJIS elif SNAPPY_QUOTES: SNAPPY_CHOICES = SNAPPY_QUOTES else: SNAPPY_CHOICES = [""] diff --git a/files/helpers/const_stateful.py b/files/helpers/const_stateful.py index 2d7c87885..d5aa47bb4 100644 --- a/files/helpers/const_stateful.py +++ b/files/helpers/const_stateful.py @@ -9,7 +9,7 @@ dk_const = [] marseys_const = [] marseys_const2 = [] marsey_mappings = {} -SNAPPY_MARSEYS = [] +SNAPPY_EMOJIS = [] SNAPPY_QUOTES = [] def const_initialize(db:scoped_session): @@ -33,12 +33,12 @@ def _initialize_marseys(db:scoped_session): def _initialize_snappy_marseys_and_quotes(): - global SNAPPY_MARSEYS, SNAPPY_QUOTES + global SNAPPY_EMOJIS, SNAPPY_QUOTES if IS_DKD(): - SNAPPY_MARSEYS = [f':#{x}:' for x in dk_const] + SNAPPY_EMOJIS = [f':#{x}:' for x in dk_const] else: - SNAPPY_MARSEYS = [f':#{x}:' for x in marseys_const2] + SNAPPY_EMOJIS = [f':#{x}:' for x in marseys_const2] if IS_FISTMAS(): filename = f"snappy_fistmas_{SITE_NAME}.txt"