diff options
| author | ThibG <thib@sitedethib.com> | 2021-01-26 23:21:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 23:21:32 +0100 |
| commit | 52ff3ca675ecac0ff32990b6321fb5e349e6dc59 (patch) | |
| tree | eeeeeead25872b19b34b31e3ccbd543d3e2fd9b8 /app/services/fetch_link_card_service.rb | |
| parent | ca6c62068e35537251cc650c8b2d03a1a2163d06 (diff) | |
| parent | 00e55445b9aa5a399a9f8b76e42fde9da2c399fd (diff) | |
Merge pull request #1491 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/fetch_link_card_service.rb')
| -rw-r--r-- | app/services/fetch_link_card_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb index 255490d5c..74fe9a0a5 100644 --- a/app/services/fetch_link_card_service.rb +++ b/app/services/fetch_link_card_service.rb @@ -47,11 +47,11 @@ class FetchLinkCardService < BaseService Request.new(:get, @url).add_headers('Accept' => 'text/html', 'User-Agent' => Mastodon::Version.user_agent + ' Bot').perform do |res| if res.code == 200 && res.mime_type == 'text/html' - @html = res.body_with_limit @html_charset = res.charset + @html = res.body_with_limit else - @html = nil @html_charset = nil + @html = nil end end end |