tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract filename obfuscation into module

Browse Source
This commit is contained in:
Alyssa Ross
2016-11-23 23:31:38 +00:00
committed by Andrea Faulds
parent 7161f91313
commit cefef2c571
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/settings/profiles_controller.rb
View File

@ -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