summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-04-27 03:09:18 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-04-27 03:09:18 +0000
commit0e1350d51ca2135e37743dfb7af98eae43c72892 (patch)
tree10a5c3f27cebc539b5b8fe42d4907aec767949b1 /app/services
parent417ef56d244c6c22016fda7c78e69071d14887c3 (diff)
downloadgitlab-ce-0e1350d51ca2135e37743dfb7af98eae43c72892.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
-rw-r--r--app/services/spam/spam_verdict_service.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/services/spam/spam_verdict_service.rb b/app/services/spam/spam_verdict_service.rb
index 387d36cc7d1..1279adf327b 100644
--- a/app/services/spam/spam_verdict_service.rb
+++ b/app/services/spam/spam_verdict_service.rb
@@ -66,7 +66,14 @@ module Spam
return unless Gitlab::CurrentSettings.spam_check_endpoint_enabled
begin
- spamcheck_client.spam?(spammable: target, user: user, context: context, extra_features: extra_features).verdict
+ result = spamcheck_client.spam?(spammable: target, user: user, context: context, extra_features: extra_features)
+
+ if result.evaluated? && Feature.enabled?(:user_spam_scores)
+ Abuse::TrustScore.create!(user: user, score: result.score, source: :spamcheck)
+ end
+
+ result.verdict
+
rescue StandardError => e
Gitlab::ErrorTracking.log_exception(e, error: ERROR_TYPE)
nil