Merge branch 'master' into fix-recaptcha

config/application.rb

@@ -30,11 +30,6 @@ module Danbooru
       config.x.git_hash = nil
     end
 
-    if ENV["DANBOORU_RAKISMET_KEY"]
-      config.rakismet.key = ENV["DANBOORU_RAKISMET_KEY"]
-      config.rakismet.url = ENV["DANBOORU_RAKISMET_URL"]
-    end
-
     config.after_initialize do
       Rails.application.routes.default_url_options = {
         host: Danbooru.config.hostname,

config/danbooru_default_config.rb

@@ -631,6 +631,13 @@ module Danbooru
 
     def recaptcha_secret_key
     end
+    
+    # Akismet API key. Used for Dmail spam detection. http://akismet.com/signup/
+    def rakismet_key
+    end
+
+    def rakismet_url
+    end
   end
 
   class EnvironmentConfiguration

config/initializers/active_record_extensions.rb

@@ -1,46 +0,0 @@
-module Danbooru
-  module Extensions
-    module ActiveRecord
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        def without_timeout
-          connection.execute("SET STATEMENT_TIMEOUT = 0") unless Rails.env == "test"
-          yield
-        ensure
-          connection.execute("SET STATEMENT_TIMEOUT = #{CurrentUser.user.try(:statement_timeout) || 3_000}") unless Rails.env == "test"
-        end
-
-        def with_timeout(n, default_value = nil, new_relic_params = {})
-          connection.execute("SET STATEMENT_TIMEOUT = #{n}") unless Rails.env == "test"
-          yield
-        rescue ::ActiveRecord::StatementInvalid => x
-          if Rails.env.production?
-            NewRelic::Agent.notice_error(x, :custom_params => new_relic_params.merge(:user_id => CurrentUser.id, :user_ip_addr => CurrentUser.ip_addr))
-          end
-          return default_value
-        ensure
-          connection.execute("SET STATEMENT_TIMEOUT = #{CurrentUser.user.try(:statement_timeout) || 3_000}") unless Rails.env == "test"
-        end
-      end
-
-      %w(execute select_value select_values select_all).each do |method_name|
-        define_method("#{method_name}_sql") do |sql, *params|
-          self.class.connection.__send__(method_name, self.class.sanitize_sql_array([sql, *params]))
-        end
-
-        self.class.__send__(:define_method, "#{method_name}_sql") do |sql, *params|
-          connection.__send__(method_name, sanitize_sql_array([sql, *params]))
-        end
-      end
-    end
-  end
-end
-
-class ActiveRecord::Base
-  class << self
-    public :sanitize_sql_array
-  end
-
-  include Danbooru::Extensions::ActiveRecord
-end

config/initializers/postgres_extensions.rb

@@ -1,5 +0,0 @@
-module PostgresExtensions
-  def columns(*params)
-    super.reject {|x| x.sql_type == "tsvector"}
-  end
-end

config/initializers/rakismet.rb

@@ -0,0 +1,2 @@
+Rails.application.config.rakismet.key = Danbooru.config.rakismet_key
+Rails.application.config.rakismet.url = Danbooru.config.rakismet_url