Skip to content

Commit 2b70a95

Browse files
committed
Check that the card is NSG before serving xlarge images
1 parent 6023cf1 commit 2b70a95

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

app/resources/card_resource.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class CardResource < ApplicationResource # rubocop:disable Metrics/ClassLength
7474

7575
unless @object.num_extra_faces.zero?
7676
@object.face_indices.each do |index|
77-
f = { index:, images: images(@object.latest_printing_id, face_index: index) }
77+
f = { index:, images: images(@object.latest_printing_id, @object.designed_by, face_index: index) }
7878
f[:base_link] = @object.faces_base_link[index] if @object.faces_base_link[index]
7979
f[:display_subtypes] = @object.faces_display_subtypes[index] if @object.faces_display_subtypes[index]
8080
f[:card_subtype_ids] = @object.faces_card_subtype_ids[index].compact if @object.faces_card_subtype_ids[index]
@@ -93,7 +93,7 @@ class CardResource < ApplicationResource # rubocop:disable Metrics/ClassLength
9393
attribute :restrictions, :hash
9494
attribute :latest_printing_id, :string
9595
attribute :latest_printing_images, :hash do
96-
images(@object.latest_printing_id, has_narrative_image: @object.narrative_text.present?)
96+
images(@object.latest_printing_id, @object.designed_by, has_narrative_image: @object.narrative_text.present?)
9797
end
9898

9999
filter :card_cycle_id, :string do
@@ -163,16 +163,16 @@ class CardResource < ApplicationResource # rubocop:disable Metrics/ClassLength
163163

164164
private
165165

166-
def images(id, has_narrative_image: false, face_index: nil)
166+
def images(id, designed_by, has_narrative_image: false, face_index: nil)
167167
url_prefix = Rails.configuration.x.printing_images.nrdb_classic_prefix
168168
face_suffix = "-#{face_index}" unless face_index.nil?
169169
image_sizes = {
170170
'tiny' => "#{url_prefix}/tiny/#{id}#{face_suffix}.jpg",
171171
'small' => "#{url_prefix}/small/#{id}#{face_suffix}.jpg",
172172
'medium' => "#{url_prefix}/medium/#{id}#{face_suffix}.jpg",
173-
'large' => "#{url_prefix}/large/#{id}#{face_suffix}.jpg",
174-
'xlarge' => "#{url_prefix}/xlarge/#{id}#{face_suffix}.webp"
173+
'large' => "#{url_prefix}/large/#{id}#{face_suffix}.jpg"
175174
}
175+
image_sizes[:xlarge] = "#{url_prefix}/xlarge/#{id}#{face_suffix}.webp" if designed_by == 'null_signal_games'
176176

177177
image_sizes['narrative'] = "#{url_prefix}/xlarge/#{id}#{face_suffix}-narrative.webp" if has_narrative_image
178178

app/resources/printing_resource.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class PrintingResource < ApplicationResource # rubocop:disable Metrics/ClassLeng
8585
attribute :pronunciation_ipa, :string
8686

8787
attribute :images, :hash do
88-
images(@object.id, has_narrative_image: @object.narrative_text.present?)
88+
images(@object.id, @object.designed_by, has_narrative_image: @object.narrative_text.present?)
8989
end
9090
attribute :card_abilities, :hash
9191
attribute :latest_printing_id, :string
@@ -99,7 +99,7 @@ class PrintingResource < ApplicationResource # rubocop:disable Metrics/ClassLeng
9999

100100
unless @object.num_extra_faces.zero?
101101
@object.face_indices.each do |index|
102-
f = { index:, images: images(@object.id, face_index: index) }
102+
f = { index:, images: images(@object.id, @object.designed_by, face_index: index) }
103103
f[:base_link] = @object.faces_base_link[index] if @object.faces_base_link[index]
104104
f[:copy_quantity] = @object.faces_copy_quantity[index] if @object.faces_copy_quantity[index]
105105
f[:flavor] = @object.faces_flavor[index] if @object.faces_flavor[index]
@@ -179,16 +179,16 @@ class PrintingResource < ApplicationResource # rubocop:disable Metrics/ClassLeng
179179

180180
private
181181

182-
def images(id, has_narrative_image: false, face_index: nil)
182+
def images(id, designed_by, has_narrative_image: false, face_index: nil)
183183
url_prefix = Rails.configuration.x.printing_images.nrdb_classic_prefix
184184
face_suffix = "-#{face_index}" unless face_index.nil?
185185
image_sizes = {
186186
'tiny' => "#{url_prefix}/tiny/#{id}#{face_suffix}.jpg",
187187
'small' => "#{url_prefix}/small/#{id}#{face_suffix}.jpg",
188188
'medium' => "#{url_prefix}/medium/#{id}#{face_suffix}.jpg",
189-
'large' => "#{url_prefix}/large/#{id}#{face_suffix}.jpg",
190-
'xlarge' => "#{url_prefix}/xlarge/#{id}#{face_suffix}.webp"
189+
'large' => "#{url_prefix}/large/#{id}#{face_suffix}.jpg"
191190
}
191+
image_sizes[:xlarge] = "#{url_prefix}/xlarge/#{id}#{face_suffix}.webp" if designed_by == 'null_signal_games'
192192

193193
image_sizes['narrative'] = "#{url_prefix}/xlarge/#{id}#{face_suffix}-narrative.webp" if has_narrative_image
194194

0 commit comments

Comments
 (0)