Refactored AkismetHelper into AkismetService and cleaned up `Spammable`

- Refactored SpamCheckService into SpamService

2 files changed, 0 insertions, 83 deletions

diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index c4d3134da6c..077258faee1 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -3,8 +3,6 @@ module API
   class Issues < Grape::API
     before { authenticate! }
 
-    helpers ::Gitlab::AkismetHelper
-
     helpers do
       def filter_issues_state(issues, state)
         case state
diff --git a/lib/gitlab/akismet_helper.rb b/lib/gitlab/akismet_helper.rb
deleted file mode 100644
index bd71a1aaa51..00000000000
--- a/lib/gitlab/akismet_helper.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-module Gitlab
-  module AkismetHelper
-    def akismet_enabled?
-      current_application_settings.akismet_enabled
-    end
-
-    def akismet_client
-      @akismet_client ||= ::Akismet::Client.new(current_application_settings.akismet_api_key,
-        Gitlab.config.gitlab.url)
-    end
-
-    def client_ip(env)
-      env['action_dispatch.remote_ip'].to_s
-    end
-
-    def user_agent(env)
-      env['HTTP_USER_AGENT']
-    end
-
-    def is_spam?(environment, user, text)
-      client = akismet_client
-      ip_address = client_ip(environment)
-      user_agent = user_agent(environment)
-
-      params = {
-        type: 'comment',
-        text: text,
-        created_at: DateTime.now,
-        author: user.name,
-        author_email: user.email,
-        referrer: environment['HTTP_REFERER'],
-      }
-
-      begin
-        is_spam, is_blatant = client.check(ip_address, user_agent, params)
-        is_spam || is_blatant
-      rescue => e
-        Rails.logger.error("Unable to connect to Akismet: #{e}, skipping check")
-        false
-      end
-    end
-
-    def ham!(ip_address, user_agent, text, user)
-      client = akismet_client
-
-      params = {
-        type: 'comment',
-        text: text,
-        author: user.name,
-        author_email: user.email
-      }
-
-      begin
-        client.submit_ham(ip_address, user_agent, params)
-        true
-      rescue => e
-        Rails.logger.error("Unable to connect to Akismet: #{e}, skipping!")
-        false
-      end
-    end
-
-    def spam!(details, text, user)
-      client = akismet_client
-
-      params = {
-        type: 'comment',
-        text: text,
-        author: user.name,
-        author_email: user.email
-      }
-
-      begin
-        client.submit_spam(details.ip_address, details.user_agent, params)
-        true
-      rescue => e
-        Rails.logger.error("Unable to connect to Akismet: #{e}, skipping!")
-        false
-      end
-    end
-  end
-end