src/accounts/views/connection.py

@@ -87,6 +87,7 @@ def connect_discord(request):
 @login_required
 def authorize_discord(request):
 	if request.user.userprofileinfo.discord_id:
+		print("Already")
 		return bad_request(request, "Already connected")
 	try:
 		token = oauth.discord.authorize_access_token(request)

src/ctfs/migrations/0009_ctf_flags_bonus.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.11 on 2023-09-17 17:57
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('ctfs', '0008_auto_20220215_1713'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='ctf_flags',
-            name='bonus',
-            field=models.PositiveSmallIntegerField(default=0),
-        ),
-    ]

src/ctfs/models.py

@@ -45,7 +45,6 @@ class CTF_flags(models.Model):
     user        =   models.ForeignKey(User, unique=False, on_delete=models.CASCADE) 
     ctf         =   models.ForeignKey(CTF, unique=False, on_delete=models.CASCADE)
     flag_date   =   models.DateTimeField('Flag date')
-    bonus       =   models.PositiveSmallIntegerField(default=0)
     
     class Meta:
         ordering = ['-flag_date']

src/events/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from .models import Event, EventPlayer, Team, Bonus
+from .models import Event, EventPlayer, Team
 
 @admin.register(Event)
 class event(admin.ModelAdmin):
@@ -27,8 +27,3 @@ class team(admin.ModelAdmin):
     list_filter = ('event',)
     # search list
     search_fields = ['name']
-
-@admin.register(Bonus)
-class bonus(admin.ModelAdmin):
-    #list display
-    list_display = ['points', 'absolute']

src/events/migrations/0011_bonus_points.py

@@ -1,28 +0,0 @@
-# Generated by Django 3.2.11 on 2023-09-17 17:00
-
-import django.core.validators
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('events', '0010_event_campus'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Bonus',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('absolute', models.BooleanField(default=True)),
-                ('points', models.CharField(max_length=100, validators=[django.core.validators.int_list_validator])),
-            ],
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='bonus',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='events.bonus'),
-        ),
-    ]

src/events/migrations/0012_auto_20230917_2038.py

@@ -1,24 +0,0 @@
-# Generated by Django 3.2.11 on 2023-09-17 18:38
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('events', '0011_bonus_points'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='event',
-            name='bonus',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='events.bonus'),
-        ),
-        migrations.AlterField(
-            model_name='eventplayer',
-            name='team',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='events.team'),
-        ),
-    ]

src/events/models.py

@@ -1,17 +1,10 @@
 from django.db import models
 from django.contrib.auth.models import User
 from django.contrib.auth.models import timezone
-from django.core.validators import int_list_validator
 import uuid
 from accounts.models import Campus
 
 # Create your models here.
-class Bonus(models.Model):
-    absolute    =   models.BooleanField(default=True)
-    points      =   models.CharField(validators=[int_list_validator], max_length=100)
-    def __str__(self):
-        return self.points
-
 class Event(models.Model):
     id          =   models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     name        =   models.CharField(max_length=200)
@@ -26,7 +19,6 @@ class Event(models.Model):
     auto_match  =   models.BooleanField(default=False)
     dynamic     =   models.BooleanField(default=False)
     campus      =   models.ManyToManyField(Campus, blank=True)
-    bonus       =   models.ForeignKey(Bonus, null=True, on_delete=models.SET_NULL, blank=True)
     def __str__(self):
         return self.name
 
@@ -45,6 +37,8 @@ class EventPlayer(models.Model):
     event                   =   models.ForeignKey(Event, on_delete=models.CASCADE)
     score                   =   models.PositiveIntegerField(default=0, db_index=True)
     last_submission_date    =   models.DateTimeField('Last Submission Date', default=timezone.now)
-    team                    =  models.ForeignKey(Team, on_delete=models.CASCADE, null=True, blank=True)
+    team                    =  models.ForeignKey(Team, on_delete=models.CASCADE, null=True)
     class Meta:
         ordering = ['-score', 'last_submission_date', 'user__username']
+
+

src/events/templates/events/ctf_info.html

@@ -22,9 +22,6 @@
         {% if request.user.is_authenticated %}
           {% if congrat == True %}
           <p>{% trans "Congratulation !" %}</p>
-            {% if bonus|add:"0" > 0 %}
-              <p>{% trans "Bonus points awarded" %} : {{ bonus }}</p>
-            {% endif %}
           {% elif alreadyflag == True %}
           <p>{% trans "Already flagged" %}</p>
           {% elif eventisover == True %}
@@ -99,9 +96,6 @@
     <ul class="list-group">
       <li class="list-group-item">{% trans "Author" %} :  <a style="position:absolute;right: 15px;" class="profile_link {{is_member}}" href="{% url 'accounts:profile' user_name=ctf.author.username %}">{{ ctf.author.username }}</a></li>
       <li class="list-group-item">{% trans "Point reward" %} : <span style="position:absolute;right: 15px;">{{ ctf.points }}</span></li>
-      {% if ctf.event.bonus %}
-      <li class="list-group-item">{% trans "Speed Bonuses" %} : <span style="position:absolute;right: 15px;">{{ bonus_points }}</span></li>
-      {% endif %}
       
     </ul>
   </div>

src/events/templates/events/profile.html

@@ -22,7 +22,6 @@
 			  <th scope="col">{% trans "Challenge Name" %}</th>
 			  <th scope="col">{% trans "Category" %}</th>
 			  <th scope="col">{% trans "Points" %}</th>
-			  <th scope="col">{% trans "Bonus" %}</th>
 			  <th scope="col">{% trans "Date" %}</th>
           </tr>
         </thead>
@@ -32,7 +31,6 @@
 						<th scope="row"><a href="{% url 'events:event_chall_info' event_slug=event.slug chall_slug=s.ctf.slug %}">{{ s.ctf.name }}</a></th>
 							<td>{{ s.ctf.category.name}}</td>
 							<td>{{ s.ctf.points }}</td>
-							<td>{{ s.bonus }}</td>
 							<td>{{ s.flag_date|date:"Y-m-d H:i:s" }}</td>
           </tr>
 					{% endfor %}

src/events/views/events.py

@@ -41,31 +41,6 @@ def actualize_points(ctf):
 				player.team.score -= diff
 				player.team.save()
 
-def compute_bonus_points(ctf):
-	if not ctf.event.bonus:
-		return 0
-
-	solves	=  CTF_flags.objects.filter(ctf=ctf)
-	bonuses	= ctf.event.bonus.points.split(',')
-	
-	if len(solves) >= len(bonuses):
-		return 0
-	else:
-		if ctf.event.bonus.absolute == True:
-			return int(bonuses[len(solves)])
-		else:
-			return int(bonuses[len(solves)]) * ctf.points // 100
-
-def format_bonus_points(ctf):
-	if not ctf.event.bonus:
-		return None
-	
-	bonuses	= ctf.event.bonus.points.split(',')
-	if ctf.event.bonus.absolute == True:
-		return ''.join([b + ', ' for b in bonuses])[:-2]
-	return ''.join([str(ctf.points * int(b) // 100) + ', ' for b in bonuses])[:-2]
-
-
 # Create your views here.
 def events(request):
 	list_events        =   Event.objects.filter().order_by('-end_date', 'start_date')
@@ -85,7 +60,6 @@ def chall_event_info(request, event_slug, chall_slug):
 	notsub      = False
 	noteam		= False
 	player		= None
-	bonus		= 0
 	if request.user.is_authenticated and not request.user.is_staff:
 		player = EventPlayer.objects.filter(event=event_info, user=request.user)
 		if not player:
@@ -106,8 +80,6 @@ def chall_event_info(request, event_slug, chall_slug):
 		notsub      = True
 	if request.GET.get('NoTeam'):
 		noteam      = True
-	bonus = request.GET.get('Bonus')
-	bonus_points = format_bonus_points(ctf_info)
 	solved_challs = CTF_flags.objects.filter(ctf=ctf_info).order_by('flag_date')
 	solved_list = []
 	for s in solved_challs:
@@ -117,7 +89,7 @@ def chall_event_info(request, event_slug, chall_slug):
 			solved_list.append([s.user, s.flag_date])
 	description = get_description_by_lang(ctf_info)
 	return render(request, 'events/ctf_info.html', { 'ctf' : ctf_info, 'event':event_info, 'solved_list': solved_list, 'description': description, 'eventisover': eventisover, 'alreadyflag': alreadyflag,
-		'congrat': congrat, 'wrongflag': wrongflag, 'errorform': errorform, 'notsub': notsub, 'noteam':noteam, 'bonus':bonus, 'bonus_points':bonus_points})
+		'congrat': congrat, 'wrongflag': wrongflag, 'errorform': errorform, 'notsub': notsub, 'noteam':noteam})
 
 def event(request, event_slug):
 	event_info 			= get_object_or_404(Event, slug=event_slug)
@@ -211,21 +183,20 @@ def submit_event_flag(request, event_slug, chall_slug):
 
 			if form.is_valid():
 				if ctf_info.flag == request.POST.get('flag'):
-					bonus	= 	compute_bonus_points(ctf_info)
+					new =   CTF_flags(user = request.user, ctf = ctf_info, flag_date = timezone.now())
-					new		=   CTF_flags(user = request.user, ctf = ctf_info, flag_date = timezone.now(), bonus = bonus)
 					new.save()
 					if ctf_info.points > 0:
 						player.last_submission_date = timezone.now()
-					player.score += (ctf_info.points + bonus)
+					player.score += ctf_info.points
 					player.save()
 					if player.team:
 						if ctf_info.points > 0:
 							player.team.last_submission_date = timezone.now()
-						player.team.score += (ctf_info.points + bonus)
+						player.team.score += ctf_info.points
 						player.team.save()
 					if ev.dynamic:
 						actualize_points(ctf_info)
-					response['Location'] += '?Congrat=1&Bonus=' + str(bonus)
+					response['Location'] += '?Congrat=1'
 					return response
 				else:
 					response['Location'] += '?WrongFlag=1'
@@ -307,7 +278,7 @@ def profile(request, user_name, event_slug):
 		percent = (solved_count / max_count) * 100
 		catsDatas.append([cat.name, solved_count, max_count, '{:.0f}'.format(percent)])
 		for flag in solved:
-			somme += (flag.ctf.points + flag.bonus)
+			somme += flag.ctf.points
 			pointDatas[cat.name].append([flag.flag_date.timestamp() * 1000, somme])
 
 	solves = CTF_flags.objects.filter(user=user_obj, ctf__event=event_info).order_by('-flag_date')
@@ -315,10 +286,10 @@ def profile(request, user_name, event_slug):
 	somme = 0
 	solved.append([event_info.start_date.timestamp() * 1000, 0])
 	for s in solves.reverse():
-		somme += (s.ctf.points + s.bonus)
+		somme += s.ctf.points
 		solved.append([s.flag_date.timestamp() * 1000,somme])
 
 	return render(request,'events/profile.html', {'user':user_obj, 'solves':solves,'solved':solved,'catsDatas': catsDatas, 'pointDatas': pointDatas,
-		'rank': rank, 'score' : player.score, 'cats':cats, 'event': event_info})
+		'rank': rank, 'score' : somme, 'cats':cats, 'event': event_info})
 
 

src/home/views.py

@@ -35,6 +35,7 @@ def home(request):
         lang_code = request.session[LANGUAGE_SESSION_KEY]
     url_translated = translate_url(request.path, lang_code)
     if request.path != url_translated:
+        print("%s\n%s" % (request.path, url_translated))
         response = HttpResponseRedirect(url_translated)
         return response
     news        =   new.objects.order_by('-pub_date')[:5]