From 2baea7ce7b8c896bf75e450a0459f36ff90fe356 Mon Sep 17 00:00:00 2001
From: Aine <aine@etke.cc>
Date: Mon, 5 Feb 2024 22:07:45 +0200
Subject: [PATCH] buscarron v1.4.0
---
.../matrix-bot-buscarron/defaults/main.yml | 17 +----------------
.../matrix-bot-buscarron/templates/env.j2 | 4 +++-
2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/roles/custom/matrix-bot-buscarron/defaults/main.yml b/roles/custom/matrix-bot-buscarron/defaults/main.yml
index f06320ed4..116155cef 100644
--- a/roles/custom/matrix-bot-buscarron/defaults/main.yml
+++ b/roles/custom/matrix-bot-buscarron/defaults/main.yml
@@ -6,7 +6,7 @@
matrix_bot_buscarron_enabled: true
# renovate: datasource=docker depName=registry.gitlab.com/etke.cc/buscarron
-matrix_bot_buscarron_version: v1.3.1
+matrix_bot_buscarron_version: v1.4.0
# The hostname at which Buscarron is served.
matrix_bot_buscarron_hostname: ''
@@ -145,9 +145,6 @@ matrix_bot_buscarron_homeserver: ""
# forms configuration
matrix_bot_buscarron_forms: []
-# Disable encryption
-matrix_bot_buscarron_noencryption: false
-
# Sentry DSN
matrix_bot_buscarron_sentry: ''
@@ -157,18 +154,6 @@ matrix_bot_buscarron_loglevel: INFO
# list of spammers with wildcards support, eg: *@spam.com spam@*, spam@spam.com
matrix_bot_buscarron_spamlist: []
-# spam hosts/domains.
-# deprecated, use matrix_bot_buscarron_spamlist
-matrix_bot_buscarron_spam_hosts: []
-
-# spam email addresses
-# deprecated, use matrix_bot_buscarron_spamlist
-matrix_bot_buscarron_spam_emails: []
-
-# spam email localparts
-# deprecated, use matrix_bot_buscarron_spamlist
-matrix_bot_buscarron_spam_localparts: []
-
# Banlist size
matrix_bot_buscarron_ban_size: 10000
diff --git a/roles/custom/matrix-bot-buscarron/templates/env.j2 b/roles/custom/matrix-bot-buscarron/templates/env.j2
index 1f71802a5..ea3f8c21f 100644
--- a/roles/custom/matrix-bot-buscarron/templates/env.j2
+++ b/roles/custom/matrix-bot-buscarron/templates/env.j2
@@ -16,17 +16,19 @@ BUSCARRON_PM_FROM={{ matrix_bot_buscarron_pm_from }}
BUSCARRON_PM_REPLYTO={{ matrix_bot_buscarron_pm_replyto }}
BUSCARRON_SMTP_FROM={{ matrix_bot_buscarron_smtp_from }}
BUSCARRON_SMTP_VALIDATION={{ matrix_bot_buscarron_smtp_validation }}
-BUSCARRON_NOENCRYPTION={{ matrix_bot_buscarron_noencryption }}
BUSCARRON_METRICS_LOGIN={{ matrix_bot_buscarron_metrics_login }}
BUSCARRON_METRICS_PASSWORD={{ matrix_bot_buscarron_metrics_password }}
BUSCARRON_METRICS_IPS={{ matrix_bot_buscarron_metrics_ips|default([])|join(" ") }}
{% set forms = [] %}
{% for form in matrix_bot_buscarron_forms -%}{{- forms.append(form.name) -}}
BUSCARRON_{{ form.name|upper }}_ROOM={{ form.room|default('') }}
+BUSCARRON_{{ form.name|upper }}_TEXT={{ form.text|default('') }}
BUSCARRON_{{ form.name|upper }}_REDIRECT={{ form.redirect|default('') }}
+BUSCARRON_{{ form.name|upper }}_REDIRECT_REJECT={{ form.redirect_reject|default('') }}
BUSCARRON_{{ form.name|upper }}_HASDOMAIN={{ form.hasdomain|default('') }}
BUSCARRON_{{ form.name|upper }}_HASEMAIL={{ form.hasemail|default('') }}
BUSCARRON_{{ form.name|upper }}_RATELIMIT={{ form.ratelimit|default('') }}
+BUSCARRON_{{ form.name|upper }}_RATELIMIT_SHARED={{ form.ratelimit_shared|default(false) }}
BUSCARRON_{{ form.name|upper }}_EXTENSIONS={{ form.extensions|default('')|join(' ') }}
BUSCARRON_{{ form.name|upper }}_CONFIRMATION_SUBJECT={{ form.confirmation_subject|default('') }}
BUSCARRON_{{ form.name|upper }}_CONFIRMATION_BODY={{ form.confirmation_body|default('') }}