md5 the user's diaspora id for wallpaper image filename; clean up photo_form.js a little (thx max)

1 files changed, 7 insertions, 5 deletions

diff --git a/app/uploaders/wallpaper_uploader.rb b/app/uploaders/wallpaper_uploader.rb
index a097fee04..9932b3ef6 100644
--- a/app/uploaders/wallpaper_uploader.rb
+++ b/app/uploaders/wallpaper_uploader.rb
@@ -3,8 +3,6 @@ class WallpaperUploader < CarrierWave::Uploader::Base
 
   storage :file
 
-  process :darken
-
   def store_dir
     "uploads/images"
   end
@@ -13,9 +11,13 @@ class WallpaperUploader < CarrierWave::Uploader::Base
     %w(jpg jpeg png tiff)
   end
 
-  #def filename
-  #  SecureRandom.hex(10) + File.extname(@filename) if @filename
-  #end
+  # Filename is associated with the user's diaspora handle, ensuring uniqueness
+  # and that only one copy is kept in the filesystem.
+  def filename
+    Digest::MD5.hexdigest(model.diaspora_handle) + File.extname(@filename) if @filename
+  end
+
+  process :darken
 
   def darken
     manipulate! do |img|