Merge branch 'master' of https://github.com/r888888888/danbooru

app/logical/post_query_builder.rb

@@ -276,8 +276,6 @@ class PostQueryBuilder
 
     if q[:order] == "rank"
       relation = relation.where("posts.score > 0 and posts.created_at >= ?", 2.days.ago)
-    elsif q[:order] == "rank2"
-      relation = relation.where("posts.fav_count > 0 and posts.created_at >= ?", 2.days.ago)
     elsif q[:order] == "landscape" || q[:order] == "portrait"
       relation = relation.where("posts.image_width IS NOT NULL and posts.image_height IS NOT NULL")
     end
@@ -336,9 +334,6 @@ class PostQueryBuilder
     when "rank"
       relation = relation.order("log(3, posts.score) + (extract(epoch from posts.created_at) - extract(epoch from timestamp '2005-05-24')) / 45000 DESC")
 
-    when "rank2"
-      relation = relation.order("log(3, posts.fav_count) + (extract(epoch from posts.created_at) - extract(epoch from timestamp '2005-05-24')) / 45000 DESC")
-
     else
       relation = relation.order("posts.id DESC")
     end

app/logical/session_creator.rb

@@ -1,12 +1,13 @@
 class SessionCreator
-  attr_reader :session, :cookies, :name, :password, :remember
+  attr_reader :session, :cookies, :name, :password, :remember, :secure
 
-  def initialize(session, cookies, name, password, remember)
+  def initialize(session, cookies, name, password, remember = false, secure = false)
     @session = session
     @cookies = cookies
     @name = name
     @password = password
     @remember = remember
+    @secure = secure
   end
 
   def authenticate
@@ -15,8 +16,15 @@ class SessionCreator
       user.update_column(:last_logged_in_at, Time.now)
 
       if remember.present?
-        cookies.permanent.signed[:user_name] = user.name
-        cookies.permanent[:password_hash] = user.bcrypt_cookie_password_hash
+        cookies.permanent.signed[:user_name] = {
+          :value => user.name,
+          :secure => secure
+        }
+        cookies.permanent[:password_hash] = {
+          :value => user.bcrypt_cookie_password_hash,
+          :secure => secure,
+          :httponly => true
+        }
       end
 
       session[:user_id] = user.id

app/logical/user_deletion.rb

@@ -3,10 +3,12 @@ class UserDeletion
 
   attr_reader :user, :password
 
-  def self.remove_favorites_for(user_name, user_id)
+  def self.remove_favorites_for(user_id)
     user = User.find(user_id)
-    Post.raw_tag_match("fav:#{user_id}").find_each do |post|
-      Favorite.remove(post, user)
+    Post.without_timeout do
+      Post.raw_tag_match("fav:#{user_id}").find_each do |post|
+        Favorite.remove(post, user)
+      end
     end
   end
 
@@ -56,7 +58,7 @@ private
   end
 
   def remove_favorites
-    UserDeletion.delay(:queue => "default").remove_favorites_for(user.name, user.id)
+    UserDeletion.delay(:queue => "default").remove_favorites_for(user.id)
   end
 
   def rename