feat: allow unranked matches

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: amcsz

othello/apps/auth/migrations/0012_user_accept_ranked_matches_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.10 on 2026-02-02 23:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0011_alter_user_rating'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='accept_ranked_matches',
+            field=models.BooleanField(default=True, help_text='Allow any user to request ranked matches against you'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='accept_unranked_matches',
+            field=models.BooleanField(default=True, help_text='Allow any user to request unranked matches against you'),
+        ),
+    ]

othello/apps/auth/models.py

@@ -7,6 +7,12 @@ class User(AbstractUser):
     is_student = models.BooleanField(default=True, null=False)
     is_imported = models.BooleanField(default=False, null=False)
     rating = models.DecimalField(max_digits=6, decimal_places=2, default=1200.00)
+    accept_ranked_matches = models.BooleanField(
+        default=True, help_text="Allow any user to request ranked matches against you"
+    )
+    accept_unranked_matches = models.BooleanField(
+        default=True, help_text="Allow any user to request unranked matches against you"
+    )
 
     @property
     def has_management_permission(self) -> bool:

othello/apps/auth/urls.py

@@ -13,4 +13,5 @@
     path("rating/", views.rating, name="rating"),
     path("profile/<str:username>/", views.profile, name="profile"),
     path("rankings/", views.rankings, name="rankings"),
+    path("update_preferences/", views.update_preferences, name="update_preferences"),
 ]

othello/apps/auth/views.py

@@ -1,11 +1,12 @@
 import json
 import logging
 
+from django.contrib import messages
 from django.contrib.auth import get_user_model
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.http import HttpRequest, HttpResponse
-from django.shortcuts import get_object_or_404, render
+from django.shortcuts import get_object_or_404, redirect, render
 
 from ..games.forms import MatchForm
 from ..games.models import RatingHistory, Submission
@@ -14,6 +15,22 @@
 
 
 def index(request: HttpRequest) -> HttpResponse:
+    if request.user.is_authenticated:
+        user = request.user
+        history = RatingHistory.objects.filter(user=user).order_by("changed_at")
+        ratings = [float(i) for i in history.values_list("rating", flat=True)]
+        dates = [h.changed_at.strftime("%Y-%m-%d %H:%M") for h in history]
+        return render(
+            request,
+            "auth/index.html",
+            {
+                "current_rating": user.rating,
+                "ratings_json": json.dumps(ratings),
+                "dates_json": json.dumps(dates),
+                "accept_ranked_matches": user.accept_ranked_matches,
+                "accept_unranked_matches": user.accept_unranked_matches,
+            },
+        )
     return render(request, "auth/index.html")
 
 
@@ -82,3 +99,15 @@ def rankings(request: HttpRequest) -> HttpResponse:
             "users_with_submissions": users_with_submissions,
         },
     )
+
+
+@login_required
+def update_preferences(request: HttpRequest) -> HttpResponse:
+    if request.method == "POST":
+        accept_ranked = request.POST.get("accept_ranked_matches") == "true"
+        accept_unranked = request.POST.get("accept_unranked_matches") == "true"
+        request.user.accept_ranked_matches = accept_ranked
+        request.user.accept_unranked_matches = accept_unranked
+        request.user.save(update_fields=["accept_ranked_matches", "accept_unranked_matches"])
+        messages.success(request, "Preferences updated successfully.")
+    return redirect("auth:index")

othello/apps/games/consumers.py

@@ -107,6 +107,7 @@ def send_match_update(self, object_id: int) -> None:
                     "status": match.status,
                     "player1": match.player1.get_game_name(),
                     "player2": match.player2.get_game_name(),
+                    "ranked": "Yes" if match.is_ranked else "No",
                     "num_games": match.num_games,
                     "score": score,
                     "created_at": match.created_at.isoformat(),

othello/apps/games/forms.py

@@ -86,6 +86,11 @@ class MatchForm(forms.Form):
         min_value=1,
         max_value=10,
     )
+    is_ranked = forms.BooleanField(
+        label="Ranked Match:",
+        initial=True,
+        required=False,
+    )
 
     def __init__(self, user, *args, initial_opponent_user=None, **kwargs):
         super().__init__(*args, **kwargs)

othello/apps/games/migrations/0034_match_is_ranked.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.10 on 2026-02-02 23:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('games', '0033_match_is_tie_match_loser_match_player1_wins_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='match',
+            name='is_ranked',
+            field=models.BooleanField(default=True),
+        ),
+    ]

othello/apps/games/models.py

@@ -128,6 +128,7 @@ class Match(models.Model):
         Submission, on_delete=models.CASCADE, related_name="matches_as_player2"
     )
     num_games = models.IntegerField(default=5)
+    is_ranked = models.BooleanField(default=True)
     status = models.CharField(max_length=20, choices=STATUS_CHOICES, default="pending")
     created_at = models.DateTimeField(auto_now_add=True)
 
@@ -199,36 +200,37 @@ def calculate_results(self) -> None:
         user1 = self.player1.user
         user2 = self.player2.user
 
-        rating1 = Decimal(str(user1.rating))
-        rating2 = Decimal(str(user2.rating))
+        if self.is_ranked:
+            rating1 = Decimal(str(user1.rating))
+            rating2 = Decimal(str(user2.rating))
 
-        change1, change2 = calculate_match_rating_change(
-            rating1=rating1,
-            rating2=rating2,
-            player1_wins=player1_wins,
-            player2_wins=player2_wins,
-            ties=ties,
-        )
+            change1, change2 = calculate_match_rating_change(
+                rating1=rating1,
+                rating2=rating2,
+                player1_wins=player1_wins,
+                player2_wins=player2_wins,
+                ties=ties,
+            )
 
-        user1.rating = rating1 + change1
-        user2.rating = rating2 + change2
+            user1.rating = rating1 + change1
+            user2.rating = rating2 + change2
 
-        user1.save(update_fields=["rating"])
-        user2.save(update_fields=["rating"])
+            user1.save(update_fields=["rating"])
+            user2.save(update_fields=["rating"])
 
-        RatingHistory.objects.create(
-            user=user1,
-            rating=user1.rating,
-            match=self,
-        )
-        RatingHistory.objects.create(
-            user=user2,
-            rating=user2.rating,
-            match=self,
-        )
+            RatingHistory.objects.create(
+                user=user1,
+                rating=user1.rating,
+                match=self,
+            )
+            RatingHistory.objects.create(
+                user=user2,
+                rating=user2.rating,
+                match=self,
+            )
 
-        task_logger.info(f"User {user1} new rating: {user1.rating}")
-        task_logger.info(f"User {user2} new rating: {user2.rating}")
+            task_logger.info(f"User {user1} new rating: {user1.rating}")
+            task_logger.info(f"User {user2} new rating: {user2.rating}")
 
     def __str__(self) -> str:
         return f"{self.player1.get_game_name()} vs {self.player2.get_game_name()} ({self.num_games} games)"

othello/apps/games/views.py

@@ -143,10 +143,23 @@ def request_match(request: HttpRequest) -> HttpResponse:
             messages.error(request, "Could not request match because you do not have a submission")
             return redirect("games:queue")
 
+        opponent_user = cd["opponent"].user
+        if cd["is_ranked"] and not opponent_user.accept_ranked_matches:
+            messages.error(
+                request, f"{opponent_user.username} does not accept ranked match requests."
+            )
+            return redirect("games:queue")
+        elif not cd["is_ranked"] and not opponent_user.accept_unranked_matches:
+            messages.error(
+                request, f"{opponent_user.username} does not accept unranked match requests."
+            )
+            return redirect("games:queue")
+
         match = Match.objects.create(
             player1=user_submission,
             player2=cd["opponent"],
             num_games=cd["num_games"],
+            is_ranked=cd["is_ranked"],
         )
         run_match.delay(match.id)
         messages.success(request, f"Match requested against {cd['opponent'].get_game_name()}.")

othello/static/js/games/queue.js

@@ -48,14 +48,15 @@ $(document).ready(function() {
 
         if (matchRow.length) {
             matchRow.find('td:nth-child(2)').text(data.score);
-            matchRow.find('td:nth-child(4)').html(statusHtml);
+            matchRow.find('td:nth-child(5)').html(statusHtml);
             applyWinLoseClasses(matchRow);
         } else {
             const newRow = $(`
                 <tr class="match" data-match-id="${data.match_id}">
                     <td>${data.player1}</td>
                     <td>${data.score}</td>
                     <td>${data.player2}</td>
+                    <td>${data.ranked}</td>
                     <td>${statusHtml}</td>
                     <td>${data.created_at}</td>
                 </tr>