fix - late solve edgecase

pwncollege · Jan 8, 2024 · b690769 · b690769
1 parent 9e9a719
commit b690769
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/discord_bot/bot.py b/discord_bot/bot.py
@@ -325,7 +325,6 @@ async def check_belts(rank: Belt):
 
 @client.event
 async def on_reaction_add(reaction, user):
-    print(reaction.emoji)
     if isinstance(reaction.emoji, str):
         return
 

diff --git a/dojo_plugin/pages/course.py b/dojo_plugin/pages/course.py
@@ -141,14 +141,16 @@ def result(user_id):
                 challenge_count_required = int(challenge_count * percent_required)
                 user_date = date + datetime.timedelta(days=extension)
                 late_value = 1 - late_penalty
+                max_late_solves = challenge_count_required - min(due_solves, challenge_count_required)
+                capped_late_solves = min(max_late_solves, late_solves)
 
                 if not late_solves:
                     progress = f"{due_solves} / {challenge_count_required}"
                 else:
                     progress = f"{due_solves} (+{late_solves}) / {challenge_count_required}"
 
                 if override is None:
-                    credit = min((due_solves + late_value * late_solves) / challenge_count_required, 1.0)
+                    credit = min((due_solves + late_value * capped_late_solves) / challenge_count_required, 1.0)
                 else:
                     credit = override
                     progress = f"{progress} *"