3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix preview card image not being re-fetched even if link is re-posted (#11981) 

Fix #11956
signup-info-prompt
Eugen Rochko 2019-09-28 01:33:16 +02:00 committed by GitHub
parent 32ff78f749
commit 3ec80c7aec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/preview_card.rb
View File

@ -47,6 +47,10 @@ class PreviewCard < ApplicationRecord
before_save :extract_dimensions, if: :link? before_save :extract_dimensions, if: :link?
def missing_image?
width.present? && height.present? && image_file_name.blank?
end
def save_with_optional_image! def save_with_optional_image!
save! save!
rescue ActiveRecord::RecordInvalid rescue ActiveRecord::RecordInvalid

2
app/services/fetch_link_card_service.rb
View File

@ -22,7 +22,7 @@ class FetchLinkCardService < BaseService
RedisLock.acquire(lock_options) do |lock| RedisLock.acquire(lock_options) do |lock|
if lock.acquired? if lock.acquired?
@card = PreviewCard.find_by(url: @url) @card = PreviewCard.find_by(url: @url)
process_url if @card.nil? || @card.updated_at <= 2.weeks.ago process_url if @card.nil? || @card.updated_at <= 2.weeks.ago || @card.missing_image?
else else
raise Mastodon::RaceConditionError raise Mastodon::RaceConditionError
end end