sources: fix sources sometimes choosing wrong strategy (fix #3968)

Fix sources choosing the wrong strategy when the referer belongs to a
different site (for example, when uploading a twitter post with a pixiv
referer).

* Fix `match?` to only consider the main url, not the referer.

* Change `match?` to match against a list of domains given by the `domains` method.

* Change `match?` to an instance method.
This commit is contained in:
evazion
2018-11-04 13:00:17 -06:00
parent 4219163042
commit 5cf6a43918
13 changed files with 58 additions and 37 deletions

View File

@@ -16,8 +16,8 @@ module Sources
end
def self.find(url, referer=nil, default: Strategies::Null)
strategy = all.detect { |strategy| strategy.match?(url, referer) } || default
strategy&.new(url, referer)
strategy = all.map { |strategy| strategy.new(url, referer) }.detect(&:match?)
strategy || default.new(url, referer)
end
def self.canonical(url, referer)