DEV: Use FileHelper instead for downloading narrative bot avatar

Follow up to

b69450bee2

Using FileHelper here allows us to not have to use another require for
open-uri and gives us all the benefits of FileHelper.
This commit is contained in:
Blake Erickson 2019-11-14 05:23:51 -07:00
parent 0bb6b64747
commit 08b4753843
1 changed files with 6 additions and 3 deletions

View File

@ -6,8 +6,6 @@
# authors: Nick Sahler, Alan Tan # authors: Nick Sahler, Alan Tan
# url: https://github.com/discourse/discourse/tree/master/plugins/discourse-narrative-bot # url: https://github.com/discourse/discourse/tree/master/plugins/discourse-narrative-bot
require 'open-uri'
enabled_site_setting :discourse_narrative_bot_enabled enabled_site_setting :discourse_narrative_bot_enabled
hide_plugin if self.respond_to?(:hide_plugin) hide_plugin if self.respond_to?(:hide_plugin)
@ -111,7 +109,12 @@ after_initialize do
def fetch_avatar_url(user) def fetch_avatar_url(user)
avatar_url = UrlHelper.absolute(Discourse.base_uri + user.avatar_template.gsub('{size}', '250')) avatar_url = UrlHelper.absolute(Discourse.base_uri + user.avatar_template.gsub('{size}', '250'))
open(avatar_url, 'rb').read FileHelper.download(
avatar_url,
max_file_size: SiteSetting.max_image_size_kb.kilobytes,
tmp_file_name: 'narrative-bot-avatar',
follow_redirect: true
)
rescue OpenURI::HTTPError rescue OpenURI::HTTPError
# Ignore if fetching image returns a non 200 response # Ignore if fetching image returns a non 200 response
end end