lib/onebox/engine/standard_embed.rb in onebox-1.8.16 vs lib/onebox/engine/standard_embed.rb in onebox-1.8.17

@@ -56,15 +56,17 @@
           headers = { 'Cookie' => options[:cookie] } if options[:cookie]
 
           response = (Onebox::Helpers.fetch_response(url, nil, nil, headers) rescue nil)
           doc = Nokogiri::HTML(response)
 
-          # prefer canonical link
-          canonical_link = doc.at('//link[@rel="canonical"]/@href')
-          if canonical_link && "#{URI(canonical_link).host}#{URI(canonical_link).path}" != "#{URI(url).host}#{URI(url).path}"
-            response = (Onebox::Helpers.fetch_response(canonical_link, nil, nil, headers) rescue nil)
-            doc = Nokogiri::HTML(response) if response
+          unless skip_canonical_link
+            # prefer canonical link
+            canonical_link = doc.at('//link[@rel="canonical"]/@href')
+            if canonical_link && "#{URI(canonical_link).host}#{URI(canonical_link).path}" != "#{URI(url).host}#{URI(url).path}"
+              response = (Onebox::Helpers.fetch_response(canonical_link, nil, nil, headers) rescue nil)
+              doc = Nokogiri::HTML(response) if response
+            end
           end
 
           @html_doc = doc
           @html_doc
         end
@@ -121,8 +123,11 @@
           end
 
           twitter
         end
 
+        def skip_canonical_link
+          WhitelistedGenericOnebox.probable_discourse(URI(url))
+        end
     end
   end
 end