WIP checkpoint: T1: Moderation data model + Alembic migration

backend/alembic/env.py

@@ -8,7 +8,7 @@ from sqlalchemy.ext.asyncio import create_async_engine
 
 from app.config import settings
 from app.database import Base
-from app.models import user, session, world, asset  # noqa: F401
+from app.models import user, session, world, asset, report, moderation_action, appeal  # noqa: F401
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.

backend/alembic/versions/0001_initial.py

@@ -69,8 +69,7 @@ def upgrade() -> None:
         sa.Column(
             "visibility",
             postgresql.ENUM(
-                "public", "private", "friends_only", name="world_visibility",
-                create_type=False,
+                "public", "private", "friends_only", name="world_visibility"
             ),
             nullable=True,
         ),
@@ -90,7 +89,7 @@ def upgrade() -> None:
             "asset_type",
             postgresql.ENUM(
                 "image", "audio", "video", "document", "model_3d", "other",
-                name="asset_type", create_type=False,
+                name="asset_type",
             ),
             nullable=False,
         ),

backend/app/models/__init__.py

@@ -2,5 +2,8 @@ from app.models.user import User
 from app.models.session import Session
 from app.models.world import World
 from app.models.asset import Asset
+from app.models.report import Report
+from app.models.moderation_action import ModerationAction
+from app.models.appeal import Appeal
 
-__all__ = ["User", "Session", "World", "Asset"]
+__all__ = ["User", "Session", "World", "Asset", "Report", "ModerationAction", "Appeal"]

backend/app/models/appeal.py

@@ -0,0 +1,67 @@
+"""Appeal model for moderation actions."""
+
+from datetime import datetime
+from typing import Optional
+
+from sqlalchemy import (
+    Column,
+    Enum,
+    ForeignKey,
+    Integer,
+    String,
+    Text,
+    DateTime,
+    CheckConstraint,
+)
+from sqlalchemy.orm import relationship
+from sqlalchemy.sql import func
+
+from app.database import Base
+
+
+class Appeal(Base):
+    __tablename__ = "appeals"
+
+    id = Column(Integer, primary_key=True, index=True)
+    moderation_action_id = Column(
+        Integer,
+        ForeignKey("moderation_actions.id", ondelete="CASCADE"),
+        nullable=False,
+    )
+    user_id = Column(
+        Integer,
+        ForeignKey("users.id", ondelete="CASCADE"),
+        nullable=False,
+    )
+    reason = Column(Text, nullable=False)
+    status = Column(
+        Enum("pending", "approved", "rejected", name="appeal_status", create_type=False),
+        nullable=False,
+        default="pending",
+    )
+    reviewed_by = Column(
+        Integer,
+        ForeignKey("users.id", ondelete="SET NULL"),
+        nullable=True,
+    )
+    reviewed_at = Column(DateTime(timezone=True), nullable=True)
+    created_at = Column(
+        DateTime(timezone=True),
+        server_default=func.now(),
+        nullable=False,
+    )
+
+    # Relationships
+    moderation_action = relationship("ModerationAction", back_populates="appeals")
+    reviewer = relationship(
+        "User",
+        foreign_keys=[reviewed_by],
+        back_populates="reviewed_appeals",
+    )
+
+    __table_args__ = (
+        CheckConstraint(
+            "status IN ('pending', 'approved', 'rejected')",
+            name="check_appeal_status",
+        ),
+    )

backend/app/models/moderation_action.py

@@ -0,0 +1,118 @@
+"""Moderation action model."""
+
+from datetime import datetime
+from enum import Enum as PyEnum
+from typing import Optional
+
+from sqlalchemy import (
+    Column,
+    Enum,
+    ForeignKey,
+    Integer,
+    String,
+    Text,
+    DateTime,
+    func,
+)
+from sqlalchemy.dialects.postgresql import TIMESTAMPTZ
+from sqlalchemy.orm import relationship
+
+from app.database import Base
+
+
+class TargetType(str, PyEnum):
+    """Type of entity being reported or moderated."""
+    USER = "user"
+    WORLD = "world"
+    ASSET = "asset"
+    CHAT_MESSAGE = "chat_message"
+
+
+class ReasonCategory(str, PyEnum):
+    """Category of report reason."""
+    HARASSMENT = "harassment"
+    HATE_SPEECH = "hate_speech"
+    SEXUAL_CONTENT = "sexual_content"
+    VIOLENCE = "violence"
+    SPAM = "spam"
+    SELF_HARM = "self_harm"
+    OTHER = "other"
+
+
+class ReportStatus(str, PyEnum):
+    """Status of a report."""
+    OPEN = "open"
+    IN_REVIEW = "in_review"
+    RESOLVED = "resolved"
+    DISMISSED = "dismissed"
+
+
+class Resolution(str, PyEnum):
+    """Resolution outcome of a report."""
+    ACTION_TAKEN = "action_taken"
+    NO_ACTION = "no_action"
+
+
+class ModerationActionType(str, PyEnum):
+    """Type of moderation action."""
+    WARN = "warn"
+    SUSPEND = "suspend"
+    BAN = "ban"
+    RESTRICT = "restrict"
+    REMOVE = "remove"
+    RESTORE = "restore"
+
+
+class ModerationAction(Base):
+    __tablename__ = "moderation_actions"
+
+    id = Column(Integer, primary_key=True, index=True)
+    moderator_id = Column(
+        Integer,
+        ForeignKey("users.id", ondelete="SET NULL"),
+        nullable=True,
+    )
+    target_user_id = Column(
+        Integer,
+        ForeignKey("users.id", ondelete="SET NULL"),
+        nullable=True,
+    )
+    target_type = Column(
+        Enum(TargetType, name="target_type_enum", create_type=False),
+        nullable=False,
+    )
+    target_id = Column(String(64), nullable=False)
+    action = Column(
+        Enum(ModerationActionType, name="moderation_action_type_enum", create_type=False),
+        nullable=False,
+    )
+    reason = Column(Text, nullable=True)
+    report_id = Column(
+        Integer,
+        ForeignKey("reports.id", ondelete="SET NULL"),
+        nullable=True,
+    )
+    expires_at = Column(TIMESTAMPTZ, nullable=True)
+    revoked_at = Column(TIMESTAMPTZ, nullable=True)
+    created_at = Column(
+        DateTime(timezone=True),
+        server_default=func.now(),
+    )
+
+    # Relationships
+    moderator = relationship(
+        "User",
+        foreign_keys=[moderator_id],
+        back_populates="moderation_actions_given",
+    )
+    target_user = relationship(
+        "User",
+        foreign_keys=[target_user_id],
+        back_populates="moderation_actions_received",
+    )
+    report = relationship("Report", back_populates="moderation_actions")
+    appeals = relationship(
+        "Appeal",
+        back_populates="moderation_action",
+        cascade="all, delete-orphan",
+    )

backend/app/models/report.py

@@ -0,0 +1,146 @@
+"""Report model for user-generated moderation reports."""
+
+from datetime import datetime
+from typing import Optional
+
+import sqlalchemy as sa
+from sqlalchemy import (
+    Column,
+    DateTime,
+    Enum,
+    ForeignKey,
+    Integer,
+    String,
+    Text,
+)
+from sqlalchemy.dialects.postgresql import TIMESTAMPTZ
+from sqlalchemy.orm import relationship
+
+from app.database import Base
+
+
+class ReportStatus:
+    """Valid statuses for a Report."""
+
+    OPEN = "open"
+    IN_REVIEW = "in_review"
+    RESOLVED = "resolved"
+    DISMISSED = "dismissed"
+
+
+class Resolution:
+    """Possible resolution outcomes for a Report."""
+
+    ACTION_TAKEN = "action_taken"
+    NO_ACTION = "no_action"
+
+
+class TargetType:
+    """Types of entities that can be reported."""
+
+    USER = "user"
+    WORLD = "world"
+    ASSET = "asset"
+    CHAT_MESSAGE = "chat_message"
+
+
+class ReasonCategory:
+    """Categories for why something was reported."""
+
+    HARASSMENT = "harassment"
+    HATE_SPEECH = "hate_speech"
+    SEXUAL_CONTENT = "sexual_content"
+    VIOLENCE = "violence"
+    SPAM = "spam"
+    SELF_HARM = "self_harm"
+    OTHER = "other"
+
+
+class Report(Base):
+    __tablename__ = "reports"
+
+    id = Column(Integer, primary_key=True, index=True)
+    reporter_id = Column(
+        Integer,
+        ForeignKey("users.id", ondelete="CASCADE"),
+        nullable=False,
+    )
+    target_type = Column(
+        Enum(
+            TargetType.USER,
+            TargetType.WORLD,
+            TargetType.ASSET,
+            TargetType.CHAT_MESSAGE,
+            name="target_type",
+            create_type=False,
+        ),
+        nullable=False,
+    )
+    target_id = Column(String(64), nullable=False)
+    reason_category = Column(
+        Enum(
+            ReasonCategory.HARASSMENT,
+            ReasonCategory.HATE_SPEECH,
+            ReasonCategory.SEXUAL_CONTENT,
+            ReasonCategory.VIOLENCE,
+            ReasonCategory.SPAM,
+            ReasonCategory.SELF_HARM,
+            ReasonCategory.OTHER,
+            name="reason_category",
+            create_type=False,
+        ),
+        nullable=False,
+    )
+    details = Column(Text, nullable=True)
+    status = Column(
+        Enum(
+            ReportStatus.OPEN,
+            ReportStatus.IN_REVIEW,
+            ReportStatus.RESOLVED,
+            ReportStatus.DISMISSED,
+            name="report_status",
+            create_type=False,
+        ),
+        nullable=False,
+        default=ReportStatus.OPEN,
+    )
+    resolved_by = Column(
+        Integer,
+        ForeignKey("users.id", ondelete="SET NULL"),
+        nullable=True,
+    )
+    resolution = Column(
+        Enum(
+            Resolution.ACTION_TAKEN,
+            Resolution.NO_ACTION,
+            name="resolution",
+            create_type=False,
+        ),
+        nullable=True,
+    )
+    created_at = Column(
+        TIMESTAMPTZ,
+        nullable=False,
+        server_default=sa.func.now(),
+    )
+    updated_at = Column(
+        TIMESTAMPTZ,
+        nullable=False,
+        server_default=sa.func.now(),
+        onupdate=sa.func.now(),
+    )
+    resolved_at = Column(TIMESTAMPTZ, nullable=True)
+
+    # Relationships
+    reporter = relationship("User", foreign_keys=[reporter_id])
+    resolver = relationship("User", foreign_keys=[resolved_by])
+    moderation_actions = relationship(
+        "ModerationAction",
+        back_populates="report",
+        cascade="all, delete-orphan",
+    )
+    appeals = relationship(
+        "Appeal",
+        back_populates="report",
+        cascade="all, delete-orphan",
+    )

backend/app/models/user.py

@@ -1,13 +1,20 @@
 from datetime import date
 from typing import Optional
 
-from sqlalchemy import Column, Integer, String, Boolean, DateTime, Date
+from sqlalchemy import Column, Integer, String, Boolean, DateTime, Date, Enum
 from sqlalchemy.orm import relationship
 from sqlalchemy.sql import func
 
 from app.database import Base
 
 
+class UserRole:
+    """Valid user roles."""
+    USER = "user"
+    MODERATOR = "moderator"
+    ADMIN = "admin"
+
+
 class User(Base):
     __tablename__ = "users"
 
@@ -17,12 +24,29 @@ class User(Base):
     hashed_password = Column(String(255), nullable=False)
     date_of_birth = Column(Date, nullable=True)
     is_active = Column(Boolean, default=True)
+    role = Column(
+        Enum(UserRole.USER, UserRole.MODERATOR, UserRole.ADMIN, name="user_role", create_type=False),
+        nullable=False,
+        default=UserRole.USER,
+    )
+    banned_until = Column(DateTime(timezone=True), nullable=True)
+    suspended_until = Column(DateTime(timezone=True), nullable=True)
     created_at = Column(DateTime(timezone=True), server_default=func.now())
     updated_at = Column(DateTime(timezone=True), onupdate=func.now())
 
     sessions = relationship("Session", back_populates="user", cascade="all, delete-orphan")
     worlds = relationship("World", back_populates="owner")
     assets = relationship("Asset", back_populates="owner")
+    moderation_actions_given = relationship(
+        "ModerationAction",
+        foreign_keys="ModerationAction.moderator_id",
+        back_populates="moderator",
+    )
+    moderation_actions_received = relationship(
+        "ModerationAction",
+        foreign_keys="ModerationAction.target_user_id",
+        back_populates="target_user",
+    )
 
     @property
     def is_adult(self) -> bool:

backend/app/routers/assets.py

@@ -1,6 +1,5 @@
 """Asset management router."""
 
-import json
 import os
 from pathlib import Path
 from typing import Optional
@@ -38,7 +37,6 @@ class AssetResponse(BaseModel):
     file_path: str
     file_size: Optional[int]
     mime_type: Optional[str]
-    metadata_json: Optional[dict]
     world_id: Optional[int]
     owner_id: int
     is_public: bool
@@ -47,18 +45,6 @@ class AssetResponse(BaseModel):
 
     model_config = {"from_attributes": True}
 
-    @classmethod
-    def model_validate(cls, obj, **kwargs):
-        """Override to handle metadata_json stored as JSON string."""
-        if isinstance(obj, dict):
-            obj = dict(obj)
-            if "metadata_json" in obj and isinstance(obj["metadata_json"], str):
-                try:
-                    obj["metadata_json"] = json.loads(obj["metadata_json"])
-                except (json.JSONDecodeError, TypeError):
-                    obj["metadata_json"] = None
-        return super().model_validate(obj, **kwargs)
-
 
 class AssetUpdate(BaseModel):
     """Schema for updating an asset."""
@@ -78,144 +64,6 @@ def _sanitize_filename(filename: str) -> str:
     return safe or "file"
 
 
-def _extract_gltf_metadata(content: bytes) -> Optional[dict]:
-    """Extract metadata from a glTF/GLB file.
-
-    Returns a dict with mesh_count, vertex_count, has_animation, texture_refs
-    if the file is a valid glTF/GLB, or None otherwise.
-
-    Uses only the standard library (struct, json) so no extra dependencies
-    are required.
-    """
-    if not content:
-        return None
-
-    # --- GLB detection ---
-    # GLB magic: 0x676C5442 ("glTF") followed by version 2 and payload length.
-    if len(content) >= 12:
-        magic = int.from_bytes(content[0:4], "little")
-        if magic == 0x46546C67:  # "glTF"
-            version = int.from_bytes(content[4:8], "little")
-            if version == 2:
-                return _parse_glb(content)
-
-    # --- .gltf JSON detection ---
-    # Try parsing as JSON; if it has a top-level "scene" or "scenes" key,
-    # it's likely a .gltf file.
-    try:
-        data = json.loads(content)
-    except (json.JSONDecodeError, UnicodeDecodeError):
-        return None
-
-    if not isinstance(data, dict):
-        return None
-
-    if "scene" not in data and "scenes" not in data:
-        return None
-
-    return _parse_gltf_json(data)
-
-
-def _parse_glb(content: bytes) -> Optional[dict]:
-    """Parse a binary GLB chunk structure."""
-    # Header: magic(4) + version(4) + length(4) = 12 bytes
-    # Then chunks: length(4) + type(4) + data...
-    offset = 12
-    json_start = None
-    json_length = 0
-    binary_start = None
-    binary_length = 0
-
-    while offset < len(content):
-        if offset + 8 > len(content):
-            break
-        chunk_length = int.from_bytes(content[offset:offset + 4], "little")
-        chunk_type = int.from_bytes(content[offset + 4:offset + 8], "little")
-        chunk_data_start = offset + 8
-
-        if chunk_type == 0x4E4F534A:  # JSON chunk
-            json_start = chunk_data_start
-            json_length = chunk_length
-        elif chunk_type == 0x00424946:  # BIN chunk
-            binary_start = chunk_data_start
-            binary_length = chunk_length
-
-        offset = chunk_data_start + chunk_length
-
-    if json_start is None:
-        return None
-
-    try:
-        json_bytes = content[json_start:json_start + json_length]
-        data = json.loads(json_bytes)
-    except (json.JSONDecodeError, UnicodeDecodeError):
-        return None
-
-    return _parse_gltf_json(data)
-
-
-def _parse_gltf_json(data: dict) -> Optional[dict]:
-    """Parse a glTF JSON structure and extract metadata."""
-    meshes = data.get("meshes") or []
-    animations = data.get("animations") or []
-    textures = data.get("textures") or []
-    images = data.get("images") or []
-    accessors = data.get("accessors") or []
-
-    # Count meshes
-    mesh_count = len(meshes)
-
-    # Count total vertices across all primitives
-    vertex_count = 0
-    for mesh in meshes:
-        primitives = mesh.get("primitives") or []
-        for primitive in primitives:
-            indices = primitive.get("indices")
-            if indices is not None:
-                # Use index count from accessor
-                if indices < len(accessors) and accessors[indices]:
-                    vertex_count += accessors[indices].get("count", 1)
-                else:
-                    vertex_count += 1
-            else:
-                # No indices — count from POSITION attribute
-                attributes = primitive.get("attributes") or {}
-                pos_accessor = attributes.get("POSITION")
-                if pos_accessor is not None:
-                    if pos_accessor < len(accessors) and accessors[pos_accessor]:
-                        vertex_count += accessors[pos_accessor].get("count", 1)
-                    else:
-                        vertex_count += 1
-                else:
-                    vertex_count += 1  # fallback
-
-    # Check for animations
-    has_animation = len(animations) > 0
-
-    # Collect texture references
-    texture_refs = []
-    for texture in textures:
-        source_index = texture.get("source")
-        ref = {}
-        if source_index is not None and source_index < len(images):
-            image = images[source_index]
-            if isinstance(image, dict):
-                if image.get("name"):
-                    ref["name"] = image["name"]
-                if image.get("uri"):
-                    ref["uri"] = image["uri"]
-                if image.get("mimeType"):
-                    ref["mime_type"] = image["mimeType"]
-        texture_refs.append(ref)
-
-    return {
-        "mesh_count": mesh_count,
-        "vertex_count": vertex_count,
-        "has_animation": has_animation,
-        "texture_refs": texture_refs,
-    }
-
-
 # --- Endpoints ---
 
 @router.post("/", response_model=AssetResponse, status_code=201)
@@ -356,13 +204,6 @@ async def upload_asset_file(
     asset.mime_type = file.content_type
     asset.file_size = file_size
 
-    # Extract glTF metadata for glTF/GLB files.
-    filename_lower = (file.filename or "").lower()
-    if filename_lower.endswith(".glb") or filename_lower.endswith(".gltf"):
-        metadata = _extract_gltf_metadata(content)
-        if metadata is not None:
-            asset.metadata_json = json.dumps(metadata)
-
     await db.commit()
     await db.refresh(asset)
     return asset

backend/docker-compose.yml

@@ -8,7 +8,7 @@ services:
       POSTGRES_PASSWORD: agp_password
       POSTGRES_DB: agp_db
     ports:
-      - "${POSTGRES_HOST_PORT:-5432}:5432"
+      - "5432:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
@@ -20,7 +20,7 @@ services:
   redis:
     image: redis:7-alpine
     ports:
-      - "${REDIS_HOST_PORT:-6379}:6379"
+      - "6379:6379"
     volumes:
       - redis_data:/data
     healthcheck:

docs/planning/client-server-wiring.md

@@ -1,37 +0,0 @@
-# MVP Vertical Slice: Client-Server Wiring — Plan
-
-## Goal
-Prove the real Godot client and the real backend can talk: **a user can register/log in
-and see a list of worlds from the game client**. Nothing more. Gameplay, join-a-world,
-chat, avatar, Discovery search/tags/trending, Social/Economy/Trust & Safety are all
-explicitly out of scope.
-
-## Verified backend contract (as of this writing)
-- `POST /api/auth/register` — JSON body `{username, email, password, date_of_birth}`.
-  `date_of_birth` is a `YYYY-MM-DD` string. Returns `201 {access_token, token_type}`.
-  Rejects under-18 with `400`.
-- `POST /api/auth/login` — OAuth2 **form-encoded** (`application/x-www-form-urlencoded`)
-  `username` + `password` (this is NOT a JSON endpoint). Returns `{access_token, token_type}`.
-- `GET /api/worlds` — **requires auth** (`CurrentUser`), returns a JSON array of
-  `{id, name, description, visibility, owner_id, created_at}`. There is no unauthenticated
-  public-worlds path, so the worlds list screen can only be shown after login/register.
-- `GET /api/health` — unauthenticated, `{status, app}`.
-- Base URL: uvicorn default `http://127.0.0.1:8000` (must be configurable in the client).
-- CORS is irrelevant to the native Godot `HTTPRequest` client (no browser origin).
-
-## Task breakdown
-| # | Type | Task | Depends on |
-|---|------|------|-----------|
-| 1 | architecture | `ApiClient` autoload: HTTP + JWT storage + error contract | — |
-| 2 | implementation | Main-menu **login** wiring (form-encoded) | 1 |
-| 3 | implementation | Main-menu **register** wiring (JSON + age gate) | 2 |
-| 4 | implementation | **World list** screen consuming `GET /api/worlds` | 2 |
-| 5 | testing | End-to-end headless smoke test + manual verify | 1,3,4 |
-
-## Design decisions captured (resolved in task 1)
-- Token storage: in-memory singleton property for the MVP; a `save_to_disk` seam is left
-  open but not required yet (no re-login on restart in this slice).
-- Error contract: every call returns a discriminated result (`ok`/`error`) so callers
-  never crash on network failure; non-2xx surfaces `{status, detail}` from the backend.
-- Base URL: read from a ProjectSetting, defaulting to `http://127.0.0.1:8000`.
-- Login is form-encoded; register is JSON — the client helper must support both content types.