- Fix filenames overflowing the default django 100 character length and getting truncated weirdly.

- Fixtures for extensions and games
- Fix tests that were broken by enforcing game uploadability. The games in 0001 are default non-uploadable so tests using `game_yuri` broke. Backwards compatible uploads ignore game visibility.
- Enforce game uploadability
- Fix map uploads for moderators.
- TODO: need tests for game endpoints

Author: alexlambson

kirovy/migrations/0020_alter_cncmapfile_file_alter_cncmapimagefile_file_and_more.py

@@ -0,0 +1,29 @@
+# Generated by Django 4.2.26 on 2025-11-23 00:19
+
+from django.db import migrations, models
+import kirovy.models.file_base
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("kirovy", "0019_alter_cncmapimagefile_file"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="cncmapfile",
+            name="file",
+            field=models.FileField(max_length=2048, upload_to=kirovy.models.file_base.default_generate_upload_to),
+        ),
+        migrations.AlterField(
+            model_name="cncmapimagefile",
+            name="file",
+            field=models.ImageField(max_length=2048, upload_to=kirovy.models.file_base.default_generate_upload_to),
+        ),
+        migrations.AlterField(
+            model_name="mappreview",
+            name="file",
+            field=models.FileField(max_length=2048, upload_to=kirovy.models.file_base.default_generate_upload_to),
+        ),
+    ]

kirovy/models/cnc_map.py

@@ -240,7 +240,7 @@ class CncMapImageFile(file_base.CncNetFileBaseModel):
 
     UPLOAD_TYPE = settings.CNC_MAP_IMAGE_DIRECTORY
 
-    file = models.ImageField(null=False, upload_to=file_base.default_generate_upload_to)
+    file = models.ImageField(null=False, upload_to=file_base.default_generate_upload_to, max_length=2048)
     """The actual file this object represent."""
 
     is_extracted = models.BooleanField(null=False, blank=False, default=False)

kirovy/models/file_base.py

@@ -34,8 +34,8 @@ class Meta:
     name = models.CharField(max_length=255, null=False, blank=False)
     """Filename no extension."""
 
-    file = models.FileField(null=False, upload_to=default_generate_upload_to)
-    """The actual file this object represent."""
+    file = models.FileField(null=False, upload_to=default_generate_upload_to, max_length=2048)
+    """The actual file this object represent. The max length of 2048 is half of the unix max."""
 
     file_extension = models.ForeignKey(
         game_models.CncFileExtension,

kirovy/urls.py

@@ -24,7 +24,15 @@
 import kirovy.views.map_image_views
 from kirovy.models import CncGame
 from kirovy.settings import settings_constants
-from kirovy.views import test, cnc_map_views, permission_views, admin_views, map_upload_views, map_image_views
+from kirovy.views import (
+    test,
+    cnc_map_views,
+    permission_views,
+    admin_views,
+    map_upload_views,
+    map_image_views,
+    game_views,
+)
 from kirovy import typing as t, constants
 
 _DjangoPath = URLPattern | URLResolver
@@ -90,7 +98,7 @@ def _get_url_patterns() -> list[_DjangoPath]:
             path("ui-permissions/", permission_views.ListPermissionForAuthUser.as_view()),
             path("maps/", include(map_patterns)),
             # path("users/<uuid:cnc_user_id>/", ...),  # will show which files a user has uploaded.
-            # path("games/", ...),  # get games.,
+            path("games/", include(game_patterns)),
         ]
         + backwards_compatible_urls
         + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)  # static assets
@@ -123,4 +131,11 @@ def _get_url_patterns() -> list[_DjangoPath]:
 # /admin/
 admin_patterns = [path("ban/", admin_views.BanView.as_view())]
 
+
+# /game
+game_patterns = [
+    path("", game_views.KirovyListCreateView.as_view()),
+    path("<uuid:pk>/", game_views.GameDetailView.as_view()),
+]
+
 urlpatterns = _get_url_patterns()

kirovy/views/cnc_map_views.py

@@ -224,7 +224,7 @@ def get_queryset(self) -> QuerySet[CncMap]:
             # Staff users can see everything.
             return CncMap.objects.filter()
 
-        # Anyone can view legacy maps, temporary maps (for the cncnet client,) and published maps that aren't banned.
+        # Anyone can view legacy maps, temporary maps (cncnet client uploads) and published maps that aren't banned.
         queryset: QuerySet[CncMap] = CncMap.objects.filter(
             Q(Q(is_published=True) | Q(is_legacy=True) | Q(is_temporary=True)) & Q(is_banned=False)
         )

kirovy/views/game_views.py

@@ -0,0 +1,29 @@
+from django.db.models import QuerySet
+
+from kirovy import permissions, typing as t
+from kirovy.models import CncGame
+from kirovy.views.base_views import KirovyListCreateView, KirovyDefaultPagination, KirovyRetrieveUpdateView
+
+
+class GamesListView(KirovyListCreateView):
+
+    permission_classes = [permissions.IsAdmin | permissions.ReadOnly]
+    pagination_class: t.Type[KirovyDefaultPagination] | None = KirovyDefaultPagination
+
+    def get_queryset(self) -> QuerySet[CncGame]:
+        if self.request.user.is_staff:
+            return CncGame.objects.all()
+
+        return CncGame.objects.filter(is_visible=True)
+
+
+class GameDetailView(KirovyRetrieveUpdateView):
+
+    permission_classes = [permissions.IsAdmin | permissions.ReadOnly]
+    pagination_class: t.Type[KirovyDefaultPagination] | None = KirovyDefaultPagination
+
+    def get_queryset(self) -> QuerySet[CncGame]:
+        if self.request.user.is_staff:
+            return CncGame.objects.all()
+
+        return CncGame.objects.filter(is_visible=True)

kirovy/views/map_upload_views.py

@@ -57,7 +57,9 @@ def post(self, request: KirovyRequest, format=None) -> KirovyResponse:
         uploaded_file: UploadedFile = request.data["file"]
 
         game = self.get_game_from_request(request)
-        if not game:
+        game_supports_uploads = game and (request.user.is_staff or (game.is_visible and game.allow_public_uploads))
+        if not game_supports_uploads:
+            # Gaslight the user
             raise KirovyValidationError(detail="Game does not exist", code=UploadApiCodes.GAME_DOES_NOT_EXIST)
         extension_id = self.get_extension_id_for_upload(uploaded_file)
         self.verify_file_size_is_allowed(uploaded_file)
@@ -77,6 +79,7 @@ def post(self, request: KirovyRequest, format=None) -> KirovyResponse:
                 incomplete_upload=True,
                 cnc_user_id=request.user.id,
                 parent_id=parent_map.id if parent_map else None,
+                last_modified_by_id=request.user.id,
             ),
             context={"request": self.request},
         )
@@ -134,6 +137,7 @@ def post(self, request: KirovyRequest, format=None) -> KirovyResponse:
                 hash_sha512=map_hashes_post_processing.sha512,
                 hash_sha1=map_hashes_post_processing.sha1,
                 cnc_user_id=self.request.user.id,
+                last_modified_by_id=self.request.user.id,
             ),
             context={"request": self.request},
         )
@@ -325,7 +329,7 @@ def get_game_from_request(self, request: KirovyRequest) -> CncGame | None:
 
 
 class CncnetClientMapUploadView(_BaseMapFileUploadView):
-    """DO NOT USE THIS FOR NOW. Use"""
+    """DO NOT USE THIS FOR NOW. Use CncNetBackwardsCompatibleUploadView"""
 
     permission_classes = [AllowAny]
     upload_is_temporary = True

tests/fixtures/extension_fixtures.py

@@ -27,3 +27,37 @@ def extension_mix(db) -> k_models.CncFileExtension:
         The extension object for .mix files.
     """
     return k_models.CncFileExtension.objects.get(extension="mix")
+
+
+@pytest.fixture
+def create_cnc_file_extension(db):
+    """Return a function to create a CNC file extension."""
+
+    def _inner(
+        extension: str = "map",
+        about: str = "A Generals map file.",
+        extension_type: k_models.CncFileExtension.ExtensionTypes = k_models.CncFileExtension.ExtensionTypes.MAP,
+    ) -> k_models.CncFileExtension:
+        """Create a CNC file extension.
+
+        :param extension:
+            The actual file extension at the end of a filepath. Don't include the `.` prefix.
+        :param about:
+            A description of the file extension.
+        :param extension_type:
+            The type of file extension.
+        :return:
+            A CNC file extension object.
+        """
+        file_extension = k_models.CncFileExtension(extension=extension, about=about, extension_type=extension_type)
+        file_extension.save()
+        file_extension.refresh_from_db()
+        return file_extension
+
+    return _inner
+
+
+@pytest.fixture
+def cnc_file_extension(create_cnc_file_extension) -> k_models.CncFileExtension:
+    """Convenience wrapper to make a CncFileExtension for a test."""
+    return create_cnc_file_extension()

tests/fixtures/game_fixtures.py

@@ -1,6 +1,6 @@
 import pytest
 from kirovy import typing as t, constants
-from kirovy.models.cnc_game import CncGame
+from kirovy.models.cnc_game import CncGame, CncFileExtension
 
 
 @pytest.fixture
@@ -73,3 +73,66 @@ def game_red_alert(db) -> CncGame:
         The game object for Red Alert.
     """
     return CncGame.objects.get(slug__iexact=constants.GameSlugs.red_alert)
+
+
+@pytest.fixture
+def create_cnc_game(db, extension_map, extension_mix):
+    """Return a function to create a CNC game."""
+
+    def _inner(
+        slug: str = "ra2remaster",
+        full_name: str = "Command & Conquer: Red Alert 2 - Remastered",
+        is_visible: bool = True,
+        allow_public_uploads: bool = True,
+        compatible_with_parent_maps: bool = False,
+        parent_game: CncGame | None = None,
+        is_mod: bool = False,
+        allowed_extensions: t.List[CncFileExtension] | None = None,
+    ) -> CncGame:
+        """Create a CNC game.
+
+        :param slug:
+            The slug for the game.
+        :param full_name:
+            The full name of the game.
+        :param is_visible:
+            If the game is visible on the website.
+        :param allow_public_uploads:
+            If users can upload maps for this game.
+        :param compatible_with_parent_maps:
+            If maps from the parent game work in this game.
+        :param parent_game:
+            The parent game if this is a mod or expansion.
+        :param is_mod:
+            If this is a mod.
+        :return:
+            A CNC game object.
+        """
+        if allowed_extensions is None:
+            allowed_extensions = [extension_mix, extension_map]
+        game = CncGame(
+            slug=slug,
+            full_name=full_name,
+            is_visible=is_visible,
+            allow_public_uploads=allow_public_uploads,
+            compatible_with_parent_maps=compatible_with_parent_maps,
+            parent_game=parent_game,
+            is_mod=is_mod,
+        )
+        game.save()
+        game.allowed_extensions.add(*allowed_extensions)
+        game.refresh_from_db()
+        return game
+
+    return _inner
+
+
+@pytest.fixture
+def cnc_game(create_cnc_game) -> CncGame:
+    """Convenience wrapper to make a CncGame for a test."""
+    return create_cnc_game()
+
+
+@pytest.fixture
+def game_uploadable(create_cnc_game) -> CncGame:
+    return create_cnc_game(is_visible=True, allow_public_uploads=True)

tests/fixtures/map_fixtures.py

@@ -75,13 +75,13 @@ def _inner(
 
 
 @pytest.fixture
-def create_cnc_map(db, cnc_map_category, game_yuri, client_user, create_cnc_map_file):
+def create_cnc_map(db, cnc_map_category, game_uploadable, client_user, create_cnc_map_file):
     """Return a function to create a CncMap object."""
 
     def _inner(
         map_name: str = "Streets Of Gold 2",
         description: str = "A fun map. Capture the center airports for a Hind.",
-        cnc_game: CncGame = game_yuri,
+        cnc_game: CncGame = game_uploadable,
         map_categories: t.List[MapCategory] = None,
         user_id: t.Union[UUIDField, str, None, t.NO_VALUE] = t.NO_VALUE,
         is_legacy: bool = False,