mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-06-02 04:41:51 +00:00
Code Issues Projects Releases Wiki Activity

Fixes bugs in model task

Browse source
This commit is contained in:
Mouse Reeve 2022-02-24 17:33:22 -08:00
parent 1aa6b99d1f
commit eb8b9fdaed
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bookwyrm/models/antispam.py
View file

@ -84,19 +84,17 @@ def automod_users(reporter):
user_rules = AutoMod.objects.filter(flag_users=True).values_list(
"string_match", flat=True
)
if not user_rules:
return []
filters = []
for field in ["username", "summary", "name"]:
filters += [{f"{field}__icontains": r} for r in user_rules]
users = (
User.objects.filter(
reduce(operator.or_, (Q(**f) for f in filters)),
is_active=True,
report__isnull=True, # don't flag users that already have reports
)
.distinct()
.values_list("id", flat=True)
)
users = User.objects.filter(
reduce(operator.or_, (Q(**f) for f in filters)),
is_active=True,
report__isnull=True, # don't flag users that already have reports
).distinct()
report_model = apps.get_model("bookwyrm", "Report", require_ready=True)
@ -118,6 +116,9 @@ def automod_statuses(reporter):
"string_match", flat=True
)
if not status_rules:
return []
filters = []
for field in ["content", "content_warning", "quotation__quote", "review__name"]:
filters += [{f"{field}__icontains": r} for r in status_rules]