diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-27 14:42:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-27 14:42:22 +0200 |
| commit | 88725d6ce85115ea3b0652007db5d40a1c069be3 (patch) | |
| tree | 7a8965abda1cfc3b6c319ea19ee216755ac2f2df /app/helpers | |
| parent | be0a01145b5f303c5c506858146ccf6c6d5cee72 (diff) | |
OEmbed support for PreviewCard (#2337)
* OEmbed support for PreviewCard * Improve ProviderDiscovery code failure treatment * Do not crawl links if there is a content warning, since those don't display a link card anyway * Reset db schema * Fresh migrate * Fix rubocop style issues Fix #1681 - return existing access token when applicable instead of creating new * Fix test * Extract http client to helper * Improve oembed controller
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/http_helper.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/app/helpers/http_helper.rb b/app/helpers/http_helper.rb new file mode 100644 index 000000000..1e1ac8256 --- /dev/null +++ b/app/helpers/http_helper.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module HttpHelper + USER_AGENT = "#{HTTP::Request::USER_AGENT} (Mastodon/#{Mastodon::VERSION}; +http://#{Rails.configuration.x.local_domain}/)" + + def http_client(options = {}) + timeout = { write: 10, connect: 10, read: 10 }.merge(options) + + HTTP.headers(user_agent: USER_AGENT) + .timeout(:per_operation, timeout) + .follow + end +end |