From cefef2c57197a06d403b9cbe13e969e08aaf5301 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 23 Nov 2016 23:31:38 +0000 Subject: Extract filename obfuscation into module --- app/controllers/settings/profiles_controller.rb | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'app/controllers/settings') diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb index 9d9c0bb72..21fbba2af 100644 --- a/app/controllers/settings/profiles_controller.rb +++ b/app/controllers/settings/profiles_controller.rb @@ -6,6 +6,10 @@ class Settings::ProfilesController < ApplicationController before_action :authenticate_user! before_action :set_account + include ObfuscateFilename + obfuscate_filename [:account, :avatar] + obfuscate_filename [:account, :header] + def show end @@ -20,18 +24,7 @@ class Settings::ProfilesController < ApplicationController private def account_params - p = params.require(:account).permit(:display_name, :note, :avatar, :header, :silenced) - if p[:avatar] - avatar = p[:avatar] - # Change so Paperclip won't expose the actual filename - avatar.original_filename = "media" + File.extname(avatar.original_filename) - end - if p[:header] - header = p[:header] - # Change so Paperclip won't expose the actual filename - header.original_filename = "media" + File.extname(header.original_filename) - end - p + params.require(:account).permit(:display_name, :note, :avatar, :header, :silenced) end def set_account -- cgit