Show public battles on recent-battle view

Author: SupraSummus

templates/warriors/recent_battles.html

@@ -10,11 +10,7 @@
       </ul>
     </nav>
 
-    {% if request.user.is_authenticated %}
-      <h1>Your recent battles</h1>
-    {% else %}
-      <h1>Recent battles</h1>
-    {% endif %}
+    <h1>Recent battles</h1>
     <table>
       <thead>
         <tr>

warriors/tests/test_views.py

@@ -257,3 +257,25 @@ def test_recent_battles_no_duplicates(user, user_client, battle, default_arena):
     response = user_client.get(reverse('recent_battles'))
     assert response.status_code == 200
     assert len(response.context['battles']) == 1
+
+
+@pytest.mark.django_db
+@pytest.mark.parametrize('public_battle_results,expected_visible', [
+    (True, True),
+    (False, False),
+])
+def test_recent_battles_public_battle_results(
+    client, battle, default_arena,
+    public_battle_results, expected_visible,
+):
+    """Test that battles are visible based on warrior's public_battle_results setting."""
+    battle.warrior_1.public_battle_results = public_battle_results
+    battle.warrior_1.save(update_fields=['public_battle_results'])
+
+    response = client.get(reverse('recent_battles'))
+    assert response.status_code == 200
+
+    if expected_visible:
+        assert battle in response.context['battles']
+    else:
+        assert battle not in response.context['battles']

warriors/views.py

@@ -309,19 +309,19 @@ class RecentBattlesView(ArenaViewMixin, ListView):
     context_object_name = 'battles'
 
     def get_queryset(self):
+        # Show battles where results are viewable:
+        # - user owns one of the warriors, OR
+        # - one of the warriors has public_battle_results=True, OR
+        # - user has authorized access via session
+        q = Q(warrior_1__public_battle_results=True) | Q(warrior_2__public_battle_results=True)
+        if self.request.user.is_authenticated:
+            q |= Q(warrior_1__users=self.request.user) | Q(warrior_2__users=self.request.user)
+        authorized_warriors = self.request.session.get('authorized_warriors', [])
+        if authorized_warriors:
+            q |= Q(warrior_1__id__in=authorized_warriors) | Q(warrior_2__id__in=authorized_warriors)
         qs = Battle.objects.filter(
             llm=self.arena.llm,
-        )
-        if self.request.user.is_authenticated:
-            qs = qs.for_user(self.request.user)
-        else:
-            authorized_warriors = self.request.session.get('authorized_warriors', [])
-            qs = qs.filter(Q(
-                warrior_1__id__in=authorized_warriors,
-            ) | Q(
-                warrior_2__id__in=authorized_warriors,
-            )).distinct()
-        qs = qs.order_by('-scheduled_at')
+        ).filter(q).distinct().order_by('-scheduled_at')
         battles = list(qs[:100])
         prefetch_warriors(battles)
         prefetch_warrior_arenas(self.arena, battles)