Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d834ee2c
Commit
d834ee2c
authored
Sep 14, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce duplication in AkismetService
parent
5550bbec
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
27 deletions
+16
-27
app/services/akismet_service.rb
app/services/akismet_service.rb
+16
-27
No files found.
app/services/akismet_service.rb
View file @
d834ee2c
...
...
@@ -29,25 +29,25 @@ class AkismetService
end
def
submit_ham
return
false
unless
akismet_enabled?
submit
(
:ham
)
end
params
=
{
type:
'comment'
,
text:
text
,
author:
owner
.
name
,
author_email:
owner
.
email
}
def
submit_spam
submit
(
:spam
)
end
begin
akismet_client
.
submit_ham
(
options
[
:ip_address
],
options
[
:user_agent
],
params
)
true
rescue
=>
e
Rails
.
logger
.
error
(
"Unable to connect to Akismet:
#{
e
}
, skipping!"
)
false
private
def
akismet_client
@akismet_client
||=
::
Akismet
::
Client
.
new
(
current_application_settings
.
akismet_api_key
,
Gitlab
.
config
.
gitlab
.
url
)
end
def
akismet_enabled?
current_application_settings
.
akismet_enabled
end
def
submit
_spam
def
submit
(
type
)
return
false
unless
akismet_enabled?
params
=
{
...
...
@@ -58,22 +58,11 @@ class AkismetService
}
begin
akismet_client
.
submit_spam
(
options
[
:ip_address
],
options
[
:user_agent
],
params
)
akismet_client
.
public_send
(
type
,
options
[
:ip_address
],
options
[
:user_agent
],
params
)
true
rescue
=>
e
Rails
.
logger
.
error
(
"Unable to connect to Akismet:
#{
e
}
, skipping!"
)
false
end
end
private
def
akismet_client
@akismet_client
||=
::
Akismet
::
Client
.
new
(
current_application_settings
.
akismet_api_key
,
Gitlab
.
config
.
gitlab
.
url
)
end
def
akismet_enabled?
current_application_settings
.
akismet_enabled
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment