From 052c02f841f1f07456e3ed93bdf65ea38d556239 Mon Sep 17 00:00:00 2001 From: Emi Matchu Date: Fri, 6 Sep 2024 17:29:12 -0700 Subject: [PATCH] Prefer non-glitched over newer for canonical pet state on item page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Huh, this is a bit odd, I think we took this from Impress 2020's `canonicalPetStateForBodyLoader` SQL query… but actually, it doesn't really make sense? and `petStatesForPetTypeLoader` has a more sensible ordering, and is the one the app uses in more ways. Maybe that's a mistake we made back then, or a bug we fixed only in one place? Anyway, this fixes why the item previews were like. using a LOT of glitched pet states and I was like "dang did a lot of them break recently?" Nah we were just. not pulling the right ones lol --- app/models/pet_type.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/pet_type.rb b/app/models/pet_type.rb index acbb7b77..beba90d9 100644 --- a/app/models/pet_type.rb +++ b/app/models/pet_type.rb @@ -124,8 +124,8 @@ class PetType < ApplicationRecord pet_state.mood_id.present? ? -1 : 1, # Prefer mood is labeled pet_state.mood_id, # Prefer mood is happy, then sad, then sick gender == preferred_gender ? -1 : 1, # Prefer our "random" gender - -pet_state.id, # Prefer newer pet states !pet_state.glitched? ? -1 : 1, # Prefer is not glitched + -pet_state.id, # Prefer newer pet states ] }.first end