Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-11-21 05:17:12 +00:00
parent a36a2c1796 6f609dc4b4
commit 8f3e5f6128
2 changed files with 208 additions and 0 deletions
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@ -74,6 +74,9 @@ class FetchLinkCardService < BaseService

    return false unless response.respond_to?(:type)

+    # The photo will change the URL. So, to avoid duplication of URLs, PreviewCard needs to be checked again.
+    @card = PreviewCard.find_by(url: response.url) || @card if response.type == 'photo'
+
    @card.type          = response.type
    @card.title         = response.respond_to?(:title)         ? response.title         : ''
    @card.author_name   = response.respond_to?(:author_name)   ? response.author_name   : ''