Triplehx3/contentdb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move likely spammer job to worker

Browse Source
This commit is contained in:
rubenwardy
2025-09-23 19:35:15 +01:00
parent ad41bc01b9
commit a604b3cd09
2 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/blueprints/admin/actions.py
View File

@@ -28,7 +28,7 @@ from app.tasks.emails import send_pending_digests
from app.tasks.forumtasks import import_topic_list, check_all_forum_accounts from app.tasks.forumtasks import import_topic_list, check_all_forum_accounts
from app.tasks.importtasks import import_repo_screenshot, check_zip_release, check_for_updates, update_all_game_support, \ from app.tasks.importtasks import import_repo_screenshot, check_zip_release, check_for_updates, update_all_game_support, \
import_languages, check_all_zip_files import_languages, check_all_zip_files
from app.tasks.usertasks import import_github_user_ids from app.tasks.usertasks import import_github_user_ids, do_delete_likely_spammers
from app.tasks.pkgtasks import notify_about_git_forum_links, clear_removed_packages, check_package_for_broken_links, update_file_size_bytes from app.tasks.pkgtasks import notify_about_git_forum_links, clear_removed_packages, check_package_for_broken_links, update_file_size_bytes
from app.utils import add_notification, get_system_user from app.utils import add_notification, get_system_user
@@ -429,34 +429,6 @@ def check_for_broken_links():
@action("DANGER: Delete likely spammers") @action("DANGER: Delete likely spammers")
def delete_likely_spammers(): def delete_likely_spammers():
query = (User.query.filter( task_id = uuid()
and_( do_delete_likely_spammers.apply_async((), task_id=task_id)
User.rank == UserRank.NEW_MEMBER, return redirect(url_for("tasks.check", id=task_id, r=url_for("admin.admin_page")))
or_(
func.replace(User.website_url, ".", "").regexp_match(func.concat("https?://[^/]*", User.username, ".*")),
),
or_(
User.website_url.ilike("%bet%"),
User.website_url.ilike("%win%"),
User.website_url.ilike("%88%"),
User.website_url.ilike("%luck%"),
User.website_url.ilike("%sport%"),
User.website_url.ilike("%lottery%"),
User.website_url.ilike("%casino%"),
User.website_url.ilike("%vip%"),
User.website_url.ilike("%assignment%"),
),
~User.packages.any(),
~User.replies.any(),
~User.reports.any(),
not_(or_(
User.website_url.ilike("%.github.io%"),
User.website_url.ilike("%.neocities.org%"),
)),
)))
cnt = query.count()
for user in query.all():
db.session.delete(user)
db.session.commit()
flash(f"Deleted {cnt} users", "success")

36
app/tasks/usertasks.py
View File

@@ -20,7 +20,7 @@ import os
import sys import sys
from flask import url_for from flask import url_for
from sqlalchemy import or_, and_ from sqlalchemy import or_, and_, not_, func
from app import app from app import app
from app.models import User, db, UserRank, ThreadReply, Package, NotificationType from app.models import User, db, UserRank, ThreadReply, Package, NotificationType
@@ -149,3 +149,37 @@ def import_github_user_ids():
db.session.commit() db.session.commit()
print(f"Updated {count} users", file=sys.stderr) print(f"Updated {count} users", file=sys.stderr)
@celery.task()
def do_delete_likely_spammers():
query = (User.query.filter(
and_(
User.rank == UserRank.NEW_MEMBER,
or_(
func.replace(User.website_url, ".", "").regexp_match(
func.concat("https?://[^/]*", User.username, ".*")),
),
or_(
User.website_url.ilike("%bet%"),
User.website_url.ilike("%win%"),
User.website_url.ilike("%88%"),
User.website_url.ilike("%luck%"),
User.website_url.ilike("%sport%"),
User.website_url.ilike("%lottery%"),
User.website_url.ilike("%casino%"),
User.website_url.ilike("%vip%"),
User.website_url.ilike("%assignment%"),
),
~User.packages.any(),
~User.replies.any(),
~User.reports.any(),
not_(or_(
User.website_url.ilike("%.github.io%"),
User.website_url.ilike("%.neocities.org%"),
)),
)))
for user in query.all():
db.session.delete(user)
db.session.commit()