From 7a0ef52af9ac358f0e9f5a2ef39264382306b629 Mon Sep 17 00:00:00 2001 From: not-varram Date: Mon, 12 Jan 2026 21:25:41 -0800 Subject: [PATCH 1/3] AO3-1234 Use empty strings for Akismet info in config --- app/models/abuse_report.rb | 1 + app/models/comment.rb | 1 + app/models/feedback.rb | 1 + docker-compose.yml | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb index be54549c63d..1f8aeadcb19 100644 --- a/app/models/abuse_report.rb +++ b/app/models/abuse_report.rb @@ -26,6 +26,7 @@ def truncate_url validate :check_for_spam def check_for_spam + return unless %w(staging production).include?(Rails.env) approved = logged_in_with_matching_email? || !Akismetor.spam?(akismet_attributes) errors.add(:base, ts("This report looks like spam to our system!")) unless approved end diff --git a/app/models/comment.rb b/app/models/comment.rb index 9415aaa55e3..08444035cd7 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -65,6 +65,7 @@ def by_anonymous_creator? validate :check_for_spam, on: :create def check_for_spam + return unless %w(staging production).include?(Rails.env) self.spam = !skip_spamcheck? && spam? self.approved = !self.spam diff --git a/app/models/feedback.rb b/app/models/feedback.rb index 68ea964daa6..f6995ed739f 100644 --- a/app/models/feedback.rb +++ b/app/models/feedback.rb @@ -14,6 +14,7 @@ class Feedback < ApplicationRecord validate :check_for_spam def check_for_spam + return unless %w(staging production).include?(Rails.env) approved = logged_in_with_matching_email? || !Akismetor.spam?(akismet_attributes) errors.add(:base, ts("This report looks like spam to our system!")) unless approved end diff --git a/docker-compose.yml b/docker-compose.yml index 0b1b7a88474..567f366021b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: db: image: mariadb:10.5.4-focal environment: - - MYSQL_ROOT_PASSWORD=change_me + - MYSQL_ROOT_PASSWORD=nA1ebz94KmwhEDDKUr5x ports: - "3306:3306" command: From f328f696254d06ff97e82aba12a7e7557246555d Mon Sep 17 00:00:00 2001 From: not-varram Date: Mon, 12 Jan 2026 21:29:04 -0800 Subject: [PATCH 2/3] Revert docker-compose.yml change from 7a0ef52 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 567f366021b..0b1b7a88474 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: db: image: mariadb:10.5.4-focal environment: - - MYSQL_ROOT_PASSWORD=nA1ebz94KmwhEDDKUr5x + - MYSQL_ROOT_PASSWORD=change_me ports: - "3306:3306" command: From fb2297f2c4bac621660db7c6f4ded5946fe315e3 Mon Sep 17 00:00:00 2001 From: not-varram Date: Mon, 12 Jan 2026 21:31:19 -0800 Subject: [PATCH 3/3] AO3-6198 Use empty strings for Akismet info in config --- config/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.yml b/config/config.yml index 2c04187451e..a76c096d085 100644 --- a/config/config.yml +++ b/config/config.yml @@ -595,8 +595,8 @@ SUPPORTED_CSS_KEYWORDS: ["!important", "url"] SUPPORTED_EXTERNAL_URLS: ["jpg", "jpeg", "png", "gif"] # variables for Askimet http://akismet.com/ -AKISMET_KEY: '6833ee7298cf' -AKISMET_NAME: 'http://transformativeworks.org' +AKISMET_KEY: '' +AKISMET_NAME: '' # Abuse and Support ticket trackers; you may need to change # feedbacks_controller.rb and abuse_reports_controller.rb