Skip to content

Slight change to fix narrative images. #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2025
Merged

Slight change to fix narrative images. #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions app/resources/card_resource.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class CardResource < ApplicationResource # rubocop:disable Metrics/ClassLength

unless @object.num_extra_faces.zero?
@object.face_indices.each do |index|
f = { index:, images: images(@object.latest_printing_id, index) }
f = { index:, images: images(@object.latest_printing_id, face_index: index) }
f[:base_link] = @object.faces_base_link[index] if @object.faces_base_link[index]
f[:display_subtypes] = @object.faces_display_subtypes[index] if @object.faces_display_subtypes[index]
f[:card_subtype_ids] = @object.faces_card_subtype_ids[index].compact if @object.faces_card_subtype_ids[index]
Expand All @@ -93,7 +93,7 @@ class CardResource < ApplicationResource # rubocop:disable Metrics/ClassLength
attribute :restrictions, :hash
attribute :latest_printing_id, :string
attribute :latest_printing_images, :hash do
images(@object.latest_printing_id)
images(@object.latest_printing_id, has_narrative_image: @object.narrative_text.present?)
end

filter :card_cycle_id, :string do
Expand Down Expand Up @@ -163,10 +163,9 @@ class CardResource < ApplicationResource # rubocop:disable Metrics/ClassLength

private

def images(id, face_index = nil)
def images(id, has_narrative_image: false, face_index: nil)
url_prefix = Rails.configuration.x.printing_images.nrdb_classic_prefix
face_suffix = "-#{face_index}" unless face_index.nil?
has_narrative_image = :narrative_text.presence && face_index.nil?
image_sizes = {
'tiny' => "#{url_prefix}/tiny/#{id}#{face_suffix}.jpg",
'small' => "#{url_prefix}/small/#{id}#{face_suffix}.jpg",
Expand Down
7 changes: 3 additions & 4 deletions app/resources/printing_resource.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class PrintingResource < ApplicationResource # rubocop:disable Metrics/ClassLeng
attribute :pronunciation_ipa, :string

attribute :images, :hash do
images(@object.id)
images(@object.id, has_narrative_image: @object.narrative_text.present?)
end
attribute :card_abilities, :hash
attribute :latest_printing_id, :string
Expand All @@ -99,7 +99,7 @@ class PrintingResource < ApplicationResource # rubocop:disable Metrics/ClassLeng

unless @object.num_extra_faces.zero?
@object.face_indices.each do |index|
f = { index:, images: images(@object.id, index) }
f = { index:, images: images(@object.id, face_index: index) }
f[:base_link] = @object.faces_base_link[index] if @object.faces_base_link[index]
f[:copy_quantity] = @object.faces_copy_quantity[index] if @object.faces_copy_quantity[index]
f[:flavor] = @object.faces_flavor[index] if @object.faces_flavor[index]
Expand Down Expand Up @@ -179,10 +179,9 @@ class PrintingResource < ApplicationResource # rubocop:disable Metrics/ClassLeng

private

def images(id, face_index = nil)
def images(id, has_narrative_image: false, face_index: nil)
url_prefix = Rails.configuration.x.printing_images.nrdb_classic_prefix
face_suffix = "-#{face_index}" unless face_index.nil?
has_narrative_image = :narrative_text.presence && face_index.nil?
image_sizes = {
'tiny' => "#{url_prefix}/tiny/#{id}#{face_suffix}.jpg",
'small' => "#{url_prefix}/small/#{id}#{face_suffix}.jpg",
Expand Down