diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-01-26 14:01:30 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-01-26 14:01:30 +0100 |
commit | b81710c02c9d8f27d417aa11b288a5b4e32bd5d5 (patch) | |
tree | 2f5ba10c2eb3c667dab2dfdb77c3d1724677ce87 /app/services/fetch_link_card_service.rb | |
parent | d1255ab8a5101bc04af4a5214f975edf443a37d9 (diff) | |
parent | 7f1c56954b46b26b4dadfa92047f1ee5d7f9ad0a (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `CONTRIBUTING.md`: Not a real conflict, glitch-soc quotes the upstream file, which has been changed. Update the quote.
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 |