From 8174db65e11da64fb07f4154c9ae3e838242a639 Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Sat, 19 Dec 2015 22:48:08 -0800
Subject: [PATCH] Use site_files instead of file_list when all file list is
 needed

---
 app/index.rb      | 4 ----
 app/settings.rb   | 8 ++++----
 app/site_files.rb | 3 +++
 models/site.rb    | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/index.rb b/app/index.rb
index 1f5c46d0..b5753f34 100644
--- a/app/index.rb
+++ b/app/index.rb
@@ -79,10 +79,6 @@ get '/permanent-web' do
   erb :'permanent_web'
 end
 
-get '/hotlinking/?' do
-  erb :'hotlinking'
-end
-
 get '/thankyou' do
   erb :'thankyou'
 end
diff --git a/app/settings.rb b/app/settings.rb
index 796ca220..8b18ae3b 100644
--- a/app/settings.rb
+++ b/app/settings.rb
@@ -185,7 +185,7 @@ post '/settings/:username/change_name' do
   end
 
   old_host = @site.host
-  old_file_paths = @site.file_list.collect {|f| f[:path]}
+  old_site_file_paths = @site.site_files.collect {|site_file| site_file.path}
 
   @site.username = params[:name]
 
@@ -195,11 +195,11 @@ post '/settings/:username/change_name' do
       @site.move_files_from old_username
     }
 
-    old_file_paths.each do |file_path|
-      @site.delete_cache file_path
+    old_site_file_paths.each do |site_file_path|
+      @site.delete_cache site_file_path
     end
 
-    flash[:success] = "Site/user name has been changed. You will need to use this name to login, <b>don't forget it</b>."
+    flash[:success] = "Site/user name has been changed. You will need to use this name to login, <b>don't forget it!</b>"
     redirect "/settings/#{@site.username}#username"
   else
     flash[:error] = @site.errors.first.last.first
diff --git a/app/site_files.rb b/app/site_files.rb
index 340a7760..8fd9789e 100644
--- a/app/site_files.rb
+++ b/app/site_files.rb
@@ -207,6 +207,9 @@ get '/site_files/allowed_types' do
   erb :'site_files/allowed_types'
 end
 
+get '/site_files/hotlinking' do
+  erb :'site_files/hotlinking'
+end
 
 get '/site_files/mount_info' do
   erb :'site_files/mount_info'
diff --git a/models/site.rb b/models/site.rb
index d9cee147..7dcbb4b8 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -459,8 +459,8 @@ class Site < Sequel::Model
       FileUtils.mv files_path, File.join(BANNED_SITES_ROOT, username)
     }
 
-    file_list.each do |path|
-      delete_cache path
+    site_files.each do |site_file|
+      delete_cache site_file.path
     end
   end