jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

twitter: get status id from referer url if not in direct url.

Browse Source
This commit is contained in:
evazion
2017-11-16 11:23:12 -06:00
parent f633222ef0
commit eeb41d2ffd
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/downloads/file.rb
View File

@@ -125,7 +125,7 @@ module Downloads
def set_source_to_referer(src, referer)
if Sources::Strategies::Nijie.url_match?(src) ||
Sources::Strategies::Twitter.url_match?(src) ||
Sources::Strategies::Twitter.url_match?(src) || Sources::Strategies::Twitter.url_match?(referer)
Sources::Strategies::Pawoo.url_match?(src) ||
Sources::Strategies::Tumblr.url_match?(src) || Sources::Strategies::Tumblr.url_match?(referer)
Sources::Strategies::ArtStation.url_match?(src) || Sources::Strategies::ArtStation.url_match?(referer)

13
app/logical/sources/strategies/twitter.rb
View File

@@ -3,11 +3,11 @@ module Sources::Strategies
attr_reader :image_urls
def self.url_match?(url)
url =~ %r!https?://(?:mobile\.)?twitter\.com/\w+/status/\d+! || url =~ %r{https?://pbs\.twimg\.com/media/}
self.status_id_from_url(url).present?
end
def referer_url
if @referer_url =~ %r!https?://(?:mobile\.)?twitter\.com/\w+/status/\d+! && @url =~ %r{https?://pbs\.twimg\.com/media/}
if self.class.url_match?(@referer_url)
@referer_url
else
@url
@@ -19,7 +19,6 @@ module Sources::Strategies
end
def api_response
status_id = status_id_from_url(url)
@api_response ||= TwitterService.new.client.status(status_id, tweet_mode: "extended")
end
@@ -62,11 +61,15 @@ module Sources::Strategies
desc.strip
end
def status_id_from_url(url)
def status_id
self.class.status_id_from_url(referer_url)
end
def self.status_id_from_url(url)
if url =~ %r{^https?://(?:mobile\.)?twitter\.com/\w+/status/(\d+)}
$1.to_i
else
raise Sources::Error.new("Couldn't get status ID from URL: #{url}")
nil
end
end
end