- fix docker for real

- make moderabile object
- Fix circular imports with file extensions
- Fix broken 0002 migration due to the object manager not using the correct schema state

Author: alexlambson

docker-compose.debugger.yml

@@ -5,7 +5,7 @@ services:
     container_name: mapdb-postgres-debugger
     image: postgres:18
     volumes:
-      - ${POSTGRES_DATA_DIR}/debugger-db/:/var/lib/postgresql/18/data
+      - ${POSTGRES_DATA_DIR}/debugger-db/:/var/lib/postgresql/18/docker
     environment:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}

docker-compose.prod.yml

@@ -3,7 +3,7 @@ services:
     container_name: mapdb-postgres
     image: postgres:18
     volumes:
-      - ${POSTGRES_DATA_DIR}:/var/lib/postgresql/18/data
+      - ${POSTGRES_DATA_DIR}:/var/lib/postgresql/18/docker
     environment:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}

docker-compose.yml

@@ -3,7 +3,7 @@ services:
     container_name: mapdb-postgres-dev
     image: postgres:18
     volumes:
-      - ${POSTGRES_DATA_DIR}:/var/lib/postgresql/18/data
+      - ${POSTGRES_DATA_DIR}:/var/lib/postgresql/18/docker
     environment:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}

kirovy/migrations/0002_add_games.py

@@ -18,7 +18,15 @@ def _forward(apps: StateApps, schema_editor: DatabaseSchemaEditor):
     CncFileExtension: typing.Type[_Ext] = apps.get_model("kirovy", "CncFileExtension")
     CncUser: typing.Type[_User] = apps.get_model("kirovy", "CncUser")
 
-    migration_user = CncUser.objects.get_or_create_migration_user()
+    # We have to create the migration user manually because the helper method on
+    # ``objects`` will crash due to not using the correct schema.
+    migration_user = CncUser(
+        cncnet_id=constants.MigrationUser.CNCNET_ID,
+        username=constants.MigrationUser.USERNAME,
+        group=constants.MigrationUser.GROUP,
+    )
+    migration_user.save()
+    migration_user.refresh_from_db()
 
     mix = CncFileExtension(
         extension="mix",

kirovy/migrations/0018_cncmap_ban_count_cncmap_ban_date_cncmap_ban_expires_and_more.py

@@ -0,0 +1,92 @@
+# Generated by Django 4.2.23 on 2025-10-04 06:43
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("kirovy", "0017_cncmapimagefile_kirovy_cncm_is_extr_0259c5_idx_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="cncmap",
+            name="ban_count",
+            field=models.IntegerField(default=0, help_text="How many times this user has been banned."),
+        ),
+        migrations.AddField(
+            model_name="cncmap",
+            name="ban_date",
+            field=models.DateTimeField(default=None, help_text="If banned, when the object was banned.", null=True),
+        ),
+        migrations.AddField(
+            model_name="cncmap",
+            name="ban_expires",
+            field=models.DateField(default=None, help_text="If banned, when the ban expires, if temporary.", null=True),
+        ),
+        migrations.AddField(
+            model_name="cncmap",
+            name="ban_reason",
+            field=models.CharField(default=None, help_text="If banned, the reason the object was banned.", null=True),
+        ),
+        migrations.AddField(
+            model_name="cncmap",
+            name="moderated_by",
+            field=models.ForeignKey(
+                help_text="The most recent moderator who most recently modified this object",
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="moderated_%(class)ss_set",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AddField(
+            model_name="cncmap",
+            name="moderator_notes",
+            field=models.TextField(help_text="Notes on moderator actions.", null=True),
+        ),
+        migrations.AddField(
+            model_name="cncuser",
+            name="moderated_by",
+            field=models.ForeignKey(
+                help_text="The most recent moderator who most recently modified this object",
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="moderated_%(class)ss_set",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AddField(
+            model_name="cncuser",
+            name="moderator_notes",
+            field=models.TextField(help_text="Notes on moderator actions.", null=True),
+        ),
+        migrations.AlterField(
+            model_name="cncmap",
+            name="is_banned",
+            field=models.BooleanField(default=False, help_text="If true, object was banned for some reason."),
+        ),
+        migrations.AlterField(
+            model_name="cncuser",
+            name="ban_date",
+            field=models.DateTimeField(default=None, help_text="If banned, when the object was banned.", null=True),
+        ),
+        migrations.AlterField(
+            model_name="cncuser",
+            name="ban_expires",
+            field=models.DateField(default=None, help_text="If banned, when the ban expires, if temporary.", null=True),
+        ),
+        migrations.AlterField(
+            model_name="cncuser",
+            name="ban_reason",
+            field=models.CharField(default=None, help_text="If banned, the reason the object was banned.", null=True),
+        ),
+        migrations.AlterField(
+            model_name="cncuser",
+            name="is_banned",
+            field=models.BooleanField(default=False, help_text="If true, object was banned for some reason."),
+        ),
+    ]

kirovy/models/cnc_game.py

@@ -1,10 +1,7 @@
-import pathlib
 from functools import cached_property
 
 from django.conf import settings
-from django.core.files.uploadedfile import UploadedFile
 from django.db import models
-from structlog.stdlib import BoundLogger
 
 from kirovy import exceptions, typing as t
 
@@ -78,40 +75,6 @@ def extension_for_path(self) -> str:
         """
         return f".{self.extension}"
 
-    @classmethod
-    def get_extension_id_for_upload(
-        cls,
-        uploaded_file: UploadedFile,
-        allowed_types: t.Set[str],
-        *,
-        logger: BoundLogger,
-        error_detail_upload_type: str,
-        extra_log_attrs: t.Dict[str, t.Any] | None = None,
-    ) -> str:
-        # TODO: Get rid of relative import after model import is removed from ui_objects.py
-        from kirovy.constants.api_codes import UploadApiCodes
-        from kirovy.exceptions.view_exceptions import KirovyValidationError
-
-        uploaded_extension = pathlib.Path(uploaded_file.name).suffix.lstrip(".").lower()
-        # iexact is case insensitive
-        kirovy_extension = cls.objects.filter(
-            extension__iexact=uploaded_extension,
-            extension_type__in=allowed_types,
-        ).first()
-
-        if kirovy_extension:
-            return str(kirovy_extension.id)
-
-        logger.warning(
-            "User attempted uploading unknown filetype",
-            uploaded_extension=uploaded_extension,
-            **(extra_log_attrs or {}),  # todo: the userattrs should be a context tag for structlog.
-        )
-        raise KirovyValidationError(
-            detail=f"'{uploaded_extension}' is not a valid {error_detail_upload_type.strip()} file extension.",
-            code=UploadApiCodes.FILE_EXTENSION_NOT_SUPPORTED,
-        )
-
 
 class CncGame(CncNetBaseModel):
     """Represents C&C games and large total-conversion mods like Mental Omega."""

kirovy/models/cnc_map.py

@@ -10,6 +10,7 @@
 from kirovy.models.cnc_base_model import CncNetBaseModel
 from kirovy import typing as t, exceptions
 from kirovy.models.cnc_game import GameScopedUserOwnedModel
+from kirovy.models.moderabile import Moderabile
 
 
 class MapCategory(CncNetBaseModel):
@@ -47,7 +48,7 @@ def save(
         super().save(force_insert, force_update, using, update_fields)
 
 
-class CncMap(GameScopedUserOwnedModel):
+class CncMap(GameScopedUserOwnedModel, Moderabile):
     """The Logical representation of a map for a Command & Conquer game.
 
     We have this as a separate model from the file model because later C&C's allow for various files
@@ -98,12 +99,6 @@ class CncMap(GameScopedUserOwnedModel):
 
     is_reviewed = models.BooleanField(default=False, help_text="If true, this map was reviewed by a staff member.")
 
-    is_banned = models.BooleanField(
-        default=False,
-        help_text="If true, this map will be hidden everywhere. Likely due to breaking a rule.",
-    )
-    """:attr: Keep banned maps around so we can keep track of rule-breakers."""
-
     incomplete_upload = models.BooleanField(
         default=False,
         help_text="If true, then the map file has been uploaded, but the map info has not been set yet.",
@@ -158,11 +153,9 @@ def get_map_directory_path(self, upload_type: str = settings.CNC_MAP_DIRECTORY)
             self.id.hex,
         )
 
-    def set_ban(self, is_banned: bool, banned_by: cnc_user.CncUser) -> None:
+    def check_is_bannable(self) -> None:
         if self.is_legacy:
             raise exceptions.BanException("legacy-maps-cannot-be-banned")
-        self.is_banned = is_banned
-        self.save(update_fields=["is_banned"])
 
 
 class CncMapFileManager(models.Manager["CncMapFile"]):

kirovy/models/cnc_user.py

@@ -5,6 +5,7 @@
 from django.utils.translation import gettext as _
 from kirovy import typing as t, constants
 from kirovy.models.cnc_base_model import CncNetBaseModel
+from kirovy.models.moderabile import Moderabile
 
 from kirovy.objects import CncnetUserInfo
 
@@ -81,7 +82,7 @@ def all_including_legacy_uploader(self):
         return super().get_queryset().exclude(cncnet_id=constants.MigrationUser.CNCNET_ID)
 
 
-class CncUser(AbstractBaseUser):
+class CncUser(AbstractBaseUser, Moderabile):
     CncnetUserGroup = constants.CncnetUserGroup
     """:attr: The user group constants for convenience so you don't need ``import kirovy.constants`` everywhere."""
 
@@ -108,16 +109,6 @@ class CncUser(AbstractBaseUser):
         blank=False,
     )
 
-    is_banned = models.BooleanField(default=False, help_text="If true, user was banned for some reason.")
-    ban_reason = models.CharField(default=None, null=True, help_text="If banned, the reason the user was banned.")
-    ban_date = models.DateTimeField(default=None, null=True, help_text="If banned, when the user was banned.")
-    ban_expires = models.DateTimeField(
-        default=None,
-        null=True,
-        help_text="If banned, when the ban expires, if temporary.",
-    )
-    ban_count = models.IntegerField(default=0, help_text="How many times this user has been banned.")
-
     USERNAME_FIELD = "cncnet_id"
     """:attr:
         This attribute controls which field Django REST Framework uses as the username field. Values must be unique.
@@ -181,11 +172,6 @@ def create_or_update_from_cncnet(user_dto: CncnetUserInfo) -> "CncUser":
 
         return kirovy_user
 
-    def set_ban(self, is_banned: bool, banned_by: "CncUser") -> None:
-        # TODO: bannable objects should probably be an abstract class
-        self.is_banned = is_banned
-        self.save(update_fields=["is_banned"])
-
 
 class CncNetUserOwnedModel(CncNetBaseModel):
     """A mixin model for any models that will be owned by a user."""