Skip to content

Remove Discord lfg tasks #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/deployment/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ The following variables, located in the main settings file[^1], map to various C

Variable | Default | Description
---|---|---
CELERY_BEAT_SCHEDULE | `{'cleanup-lfg-rosters': {'task': 'lfg.tasks.cleanup_lfg_rosters', 'schedule': 600.0,}, 'scrape-discord-members': {'task': 'lfg.tasks.scrape_discord_members', 'schedule': 1800.0,}, 'verify-lfg-profiles': { 'task': 'lfg.tasks.verify_lfg_profiles', 'schedule': 600.0,},}` | [Docs](https://docs.celeryq.dev/en/stable/userguide/configuration.html#std-setting-beat_schedule)
CELERY_BEAT_SCHEDULE | `{}` | [Docs](https://docs.celeryq.dev/en/stable/userguide/configuration.html#std-setting-beat_schedule)

## Flower

Expand Down
15 changes: 1 addition & 14 deletions src/contestsuite/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -270,20 +270,7 @@ def get_secret(key, default=None):
# Celery Beat
# https://celery-safwan.readthedocs.io/en/latest/reference/celery.beat.html

CELERY_BEAT_SCHEDULE = {
'cleanup-lfg-rosters': {
'task': 'lfg.tasks.cleanup_lfg_rosters',
'schedule': 600.0,
},
'scrape-discord-members': {
'task': 'lfg.tasks.scrape_discord_members',
'schedule': 1800.0,
},
'verify-lfg-profiles': {
'task': 'lfg.tasks.verify_lfg_profiles',
'schedule': 600.0,
},
}
CELERY_BEAT_SCHEDULE = {}


# Discord
Expand Down
148 changes: 0 additions & 148 deletions src/lfg/tasks.py

This file was deleted.

19 changes: 2 additions & 17 deletions src/lfg/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.shortcuts import redirect, render
from django.db import transaction

from . import forms, tasks
from . import forms
from .models import LFGProfile
from .utils import profile_activatable, new_lfg_user, lfg_profile_active, current_lfg_user
from contestadmin.models import Contest
Expand Down Expand Up @@ -64,8 +64,6 @@ def activate_profile(request):
request.user.lfgprofile.active = True
request.user.lfgprofile.save()

# Schedule Discord profile role change(s)
tasks.manage_discord_lfg_role.delay(request.user.lfgprofile.get_discord_username(), request.user.lfgprofile.division, 'add')
messages.success(request, 'Profile scheduled for activation.', fail_silently=True)

return redirect('lfg_dashboard')
Expand Down Expand Up @@ -132,8 +130,6 @@ def deactivate_profile(request):
request.user.lfgprofile.active = False
request.user.lfgprofile.save()

# Schedule Discord profile role change(s)
tasks.manage_discord_lfg_role.delay(request.user.lfgprofile.get_discord_username(), request.user.lfgprofile.division, 'remove')
messages.warning(request, 'Profile scheduled for deactivation.', fail_silently=True)

return redirect('lfg_dashboard')
Expand Down Expand Up @@ -170,32 +166,21 @@ def manage_profile(request):
if lfg_profile.active:
lfg_profile.active = False

# Get previous username
username = profile_form['discord_username'].initial+'#'+str(profile_form['discord_discriminator'].initial)

# Remove roles from previous username
if 'division' not in profile_form.changed_data:
tasks.manage_discord_lfg_role.delay(username, lfg_profile.division, 'remove')
else:
tasks.manage_discord_lfg_role.delay(username, profile_form['division'].initial, 'remove')

messages.warning(request, 'Discord username changed. Profile reverification required.', fail_silently=True)
# Discord username unchanged
else:
# Division was updated
if 'division' in profile_form.changed_data:
if lfg_profile.active:
if profile_form.cleaned_data['division'] is not None:
tasks.manage_discord_lfg_role.delay(lfg_profile.get_discord_username(), profile_form['division'].initial, 'swap')
pass
else:
lfg_profile.active = False

tasks.manage_discord_lfg_role.delay(lfg_profile.get_discord_username(), profile_form['division'].initial, 'remove')
messages.warning(request, 'Profile deactivated because it is incomplete. Complete the blank field(s) to reactivate.', fail_silently=True)
# Standing was updated
elif 'standing' in profile_form.changed_data and lfg_profile.active:
if profile_form.cleaned_data['standing'] is None:
tasks.manage_discord_lfg_role.delay(lfg_profile.get_discord_username(), profile_form['division'].initial, 'remove')
messages.warning(request, 'Profile deactivated because it is incomplete. Complete the blank field(s) to reactivate.', fail_silently=True)

lfg_profile.completed = lfg_profile.is_completed()
Expand Down