]> cat aescling's git repositories - mastodon.git/commitdiff
Fix first return value of FetchLinkCardService.html method (#15630)
authorTakeshi Umeda <noel.yoshiba@gmail.com>
Mon, 25 Jan 2021 08:22:41 +0000 (17:22 +0900)
committerGitHub <noreply@github.com>
Mon, 25 Jan 2021 08:22:41 +0000 (09:22 +0100)
app/services/fetch_link_card_service.rb

index 255490d5cdd98e1e2c4ec74d52e5d3f618dda807..74fe9a0a58192d6cf7662bb26b411f81226cbfd6 100644 (file)
@@ -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