Add "Mastodon" to user agent (#2073)

Remove non-const version string

Freeze option is unnecessary
rebase/4.0.0rc2
ik-fib 2017-04-18 23:04:13 +09:00 committed by Eugen
parent 82bbf57e7a
commit 23ecc681c4
1 changed files with 3 additions and 1 deletions

View File

@ -1,6 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
class FetchLinkCardService < BaseService class FetchLinkCardService < BaseService
USER_AGENT = "#{HTTP::Request::USER_AGENT} (Mastodon; +http://#{Rails.configuration.x.local_domain}/)"
def call(status) def call(status)
# Get first http/https URL that isn't local # Get first http/https URL that isn't local
url = URI.extract(status.text).reject { |uri| (uri =~ /\Ahttps?:\/\//).nil? || TagManager.instance.local_url?(uri) }.first url = URI.extract(status.text).reject { |uri| (uri =~ /\Ahttps?:\/\//).nil? || TagManager.instance.local_url?(uri) }.first
@ -26,7 +28,7 @@ class FetchLinkCardService < BaseService
private private
def http_client def http_client
HTTP.timeout(:per_operation, write: 10, connect: 10, read: 10).follow HTTP.headers(user_agent: USER_AGENT).timeout(:per_operation, write: 10, connect: 10, read: 10).follow
end end
def meta_property(html, property) def meta_property(html, property)