WIP checkpoint: Trust & Safety: 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/0003_trust_safety.py

@@ -1,329 +0,0 @@
-"""trust & safety: reports, moderation_actions, appeals + user role/ban/suspend
-
-Revision ID: 0003_trust_safety
-Revises: 0002_add_date_of_birth_to_users
-Create Date: 2025-01-01 00:00:00.000000
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision: str = "0003_trust_safety"
-down_revision: Union[str, None] = "0002_add_date_of_birth_to_users"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Create trust & safety tables and extend users table."""
-    bind = op.get_bind()
-
-    # ── ENUM types ──────────────────────────────────────────────────────
-
-    # user_role
-    user_role = postgresql.ENUM("user", "moderator", "admin", name="user_role")
-    user_role.create(bind, checkfirst=True)
-
-    # report_target_type
-    report_target_type = postgresql.ENUM(
-        "user", "world", "asset", "chat_message", name="report_target_type"
-    )
-    report_target_type.create(bind, checkfirst=True)
-
-    # reason_category
-    reason_category = postgresql.ENUM(
-        "harassment",
-        "hate_speech",
-        "sexual_content",
-        "violence",
-        "spam",
-        "self_harm",
-        "other",
-        name="reason_category",
-    )
-    reason_category.create(bind, checkfirst=True)
-
-    # report_status
-    report_status = postgresql.ENUM(
-        "open", "in_review", "resolved", "dismissed", name="report_status"
-    )
-    report_status.create(bind, checkfirst=True)
-
-    # resolution
-    resolution_enum = postgresql.ENUM(
-        "action_taken", "no_action", "false_positive", name="resolution"
-    )
-    resolution_enum.create(bind, checkfirst=True)
-
-    # moderation_action_type
-    moderation_action_type = postgresql.ENUM(
-        "warn", "suspend", "ban", "restrict", "remove", "restore",
-        name="moderation_action_type",
-    )
-    moderation_action_type.create(bind, checkfirst=True)
-
-    # moderation_target_type
-    moderation_target_type = postgresql.ENUM(
-        "user", "world", "asset", "chat_message", name="moderation_target_type"
-    )
-    moderation_target_type.create(bind, checkfirst=True)
-
-    # appeal_status
-    appeal_status = postgresql.ENUM(
-        "pending", "approved", "rejected", name="appeal_status"
-    )
-    appeal_status.create(bind, checkfirst=True)
-
-    # ── Extend users table ──────────────────────────────────────────────
-
-    op.add_column(
-        "users",
-        sa.Column(
-            "role",
-            postgresql.ENUM("user", "moderator", "admin", name="user_role"),
-            nullable=False,
-            server_default="user",
-        ),
-    )
-    op.add_column(
-        "users",
-        sa.Column("banned_until", sa.DateTime(timezone=True), nullable=True),
-    )
-    op.add_column(
-        "users",
-        sa.Column("suspended_until", sa.DateTime(timezone=True), nullable=True),
-    )
-
-    # ── reports table ───────────────────────────────────────────────────
-
-    op.create_table(
-        "reports",
-        sa.Column("id", sa.BigInteger(), primary_key=True, autoincrement=True),
-        sa.Column("reporter_id", sa.Integer(), nullable=False),
-        sa.Column(
-            "target_type",
-            postgresql.ENUM(
-                "user", "world", "asset", "chat_message", name="report_target_type"
-            ),
-            nullable=False,
-        ),
-        sa.Column("target_id", sa.String(length=64), nullable=False),
-        sa.Column(
-            "reason_category",
-            postgresql.ENUM(
-                "harassment",
-                "hate_speech",
-                "sexual_content",
-                "violence",
-                "spam",
-                "self_harm",
-                "other",
-                name="reason_category",
-            ),
-            nullable=False,
-        ),
-        sa.Column(
-            "details", sa.Text(), nullable=True,
-        ),
-        sa.Column(
-            "status",
-            postgresql.ENUM(
-                "open", "in_review", "resolved", "dismissed", name="report_status"
-            ),
-            nullable=False,
-            server_default="open",
-        ),
-        sa.Column("resolved_by", sa.Integer(), nullable=True),
-        sa.Column(
-            "resolution",
-            postgresql.ENUM(
-                "action_taken", "no_action", "false_positive", name="resolution"
-            ),
-            nullable=True,
-        ),
-        sa.Column("resolved_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column(
-            "created_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.func.now(),
-            nullable=False,
-        ),
-        sa.Column(
-            "updated_at",
-            sa.DateTime(timezone=True),
-            onupdate=sa.func.now(),
-            nullable=True,
-        ),
-        sa.ForeignKeyConstraint(["reporter_id"], ["users.id"], ondelete="CASCADE"),
-        sa.ForeignKeyConstraint(["resolved_by"], ["users.id"], ondelete="SET NULL"),
-        sa.UniqueConstraint(
-            "reporter_id", "target_type", "target_id",
-            name="uq_reporter_target",
-        ),
-    )
-    op.create_index(op.f("ix_reports_id"), "reports", ["id"], unique=False)
-    op.create_index(
-        op.f("ix_reports_reporter_id"), "reports", ["reporter_id"], unique=False
-    )
-    op.create_index(
-        op.f("ix_reports_status"), "reports", ["status"], unique=False
-    )
-
-    # ── moderation_actions table ────────────────────────────────────────
-
-    op.create_table(
-        "moderation_actions",
-        sa.Column("id", sa.BigInteger(), primary_key=True, autoincrement=True),
-        sa.Column("moderator_id", sa.Integer(), nullable=False),
-        sa.Column("target_user_id", sa.Integer(), nullable=True),
-        sa.Column(
-            "target_type",
-            postgresql.ENUM(
-                "user", "world", "asset", "chat_message",
-                name="moderation_target_type",
-            ),
-            nullable=False,
-        ),
-        sa.Column("target_id", sa.String(length=64), nullable=True),
-        sa.Column(
-            "action",
-            postgresql.ENUM(
-                "warn", "suspend", "ban", "restrict", "remove", "restore",
-                name="moderation_action_type",
-            ),
-            nullable=False,
-        ),
-        sa.Column("reason", sa.Text(), nullable=True),
-        sa.Column("report_id", sa.Integer(), nullable=True),
-        sa.Column("expires_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column("revoked_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column(
-            "created_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.func.now(),
-            nullable=False,
-        ),
-        sa.ForeignKeyConstraint(["moderator_id"], ["users.id"], ondelete="CASCADE"),
-        sa.ForeignKeyConstraint(
-            ["target_user_id"], ["users.id"], ondelete="CASCADE"
-        ),
-        sa.ForeignKeyConstraint(["report_id"], ["reports.id"], ondelete="SET NULL"),
-    )
-    op.create_index(
-        op.f("ix_moderation_actions_id"),
-        "moderation_actions",
-        ["id"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_moderation_actions_moderator_id"),
-        "moderation_actions",
-        ["moderator_id"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_moderation_actions_target_user_id"),
-        "moderation_actions",
-        ["target_user_id"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_moderation_actions_report_id"),
-        "moderation_actions",
-        ["report_id"],
-        unique=False,
-    )
-
-    # ── appeals table ───────────────────────────────────────────────────
-
-    op.create_table(
-        "appeals",
-        sa.Column("id", sa.BigInteger(), primary_key=True, autoincrement=True),
-        sa.Column(
-            "moderation_action_id", sa.Integer(), nullable=False
-        ),
-        sa.Column("user_id", sa.Integer(), nullable=False),
-        sa.Column("reason", sa.Text(), nullable=False),
-        sa.Column(
-            "status",
-            postgresql.ENUM(
-                "pending", "approved", "rejected", name="appeal_status"
-            ),
-            nullable=False,
-            server_default="pending",
-        ),
-        sa.Column("reviewed_by", sa.Integer(), nullable=True),
-        sa.Column("reviewed_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column(
-            "created_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.func.now(),
-            nullable=False,
-        ),
-        sa.ForeignKeyConstraint(
-            ["moderation_action_id"],
-            ["moderation_actions.id"],
-            ondelete="CASCADE",
-        ),
-        sa.ForeignKeyConstraint(["user_id"], ["users.id"], ondelete="CASCADE"),
-        sa.ForeignKeyConstraint(
-            ["reviewed_by"], ["users.id"], ondelete="SET NULL"
-        ),
-    )
-    op.create_index(op.f("ix_appeals_id"), "appeals", ["id"], unique=False)
-    op.create_index(
-        op.f("ix_appeals_moderation_action_id"),
-        "appeals",
-        ["moderation_action_id"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_appeals_user_id"),
-        "appeals",
-        ["user_id"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_appeals_status"),
-        "appeals",
-        ["status"],
-        unique=False,
-    )
-
-
-def downgrade() -> None:
-    """Remove trust & safety tables and revert users table."""
-    op.drop_index(op.f("ix_appeals_status"), table_name="appeals")
-    op.drop_index(op.f("ix_appeals_user_id"), table_name="appeals")
-    op.drop_index(op.f("ix_appeals_moderation_action_id"), table_name="appeals")
-    op.drop_index(op.f("ix_appeals_id"), table_name="appeals")
-    op.drop_table("appeals")
-
-    op.drop_index(op.f("ix_moderation_actions_report_id"), table_name="moderation_actions")
-    op.drop_index(op.f("ix_moderation_actions_target_user_id"), table_name="moderation_actions")
-    op.drop_index(op.f("ix_moderation_actions_moderator_id"), table_name="moderation_actions")
-    op.drop_index(op.f("ix_moderation_actions_id"), table_name="moderation_actions")
-    op.drop_table("moderation_actions")
-
-    op.drop_index(op.f("ix_reports_status"), table_name="reports")
-    op.drop_index(op.f("ix_reports_reporter_id"), table_name="reports")
-    op.drop_index(op.f("ix_reports_id"), table_name="reports")
-    op.drop_table("reports")
-
-    op.drop_column("users", "suspended_until")
-    op.drop_column("users", "banned_until")
-    op.drop_column("users", "role")
-
-    # Drop ENUM types
-    postgresql.ENUM(name="appeal_status").drop(bind, checkfirst=True)
-    postgresql.ENUM(name="moderation_target_type").drop(bind, checkfirst=True)
-    postgresql.ENUM(name="moderation_action_type").drop(bind, checkfirst=True)
-    postgresql.ENUM(name="resolution").drop(bind, checkfirst=True)
-    postgresql.ENUM(name="report_status").drop(bind, checkfirst=True)
-    postgresql.ENUM(name="reason_category").drop(bind, checkfirst=True)
-    postgresql.ENUM(name="report_target_type").drop(bind, checkfirst=True)
-    postgresql.ENUM(name="user_role").drop(bind, checkfirst=True)

backend/app/models/appeal.py

@@ -1,47 +1,34 @@
-"""Appeal model for Trust & Safety."""
+"""Appeal model for moderation actions."""
 
-from datetime import datetime
-from typing import Optional
-
-from sqlalchemy import (
-    Column,
-    Integer,
-    Text,
-    DateTime,
-    ForeignKey,
-)
-from sqlalchemy.dialects.postgresql import ENUM
+from sqlalchemy import Column, Integer, String, Text, DateTime, ForeignKey, Enum
 from sqlalchemy.orm import relationship
 from sqlalchemy.sql import func
-import enum
 
 from app.database import Base
 
 
-class AppealStatus(str, enum.Enum):
-    PENDING = "pending"
-    APPROVED = "approved"
-    REJECTED = "rejected"
-
-
 class Appeal(Base):
     __tablename__ = "appeals"
 
-    id = Column(Integer, primary_key=True, autoincrement=True)
+    id = Column(Integer, primary_key=True)
     moderation_action_id = Column(
-        Integer, ForeignKey("moderation_actions.id", ondelete="CASCADE"), nullable=False
+        Integer, ForeignKey("moderation_actions.id"), nullable=False
     )
-    user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
+    user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
     reason = Column(Text, nullable=False)
     status = Column(
-        ENUM(AppelStatus, name="appeal_status", create_type=False),
-        default=AppealStatus.PENDING,
+        Enum(
+            "pending", "approved", "rejected",
+            name="appeal_status_enum",
+        ),
+        default="pending",
+        nullable=False,
     )
-    reviewed_by = Column(Integer, ForeignKey("users.id", ondelete="SET NULL"), nullable=True)
+    reviewed_by = Column(Integer, ForeignKey("users.id"), nullable=True)
     reviewed_at = Column(DateTime(timezone=True), nullable=True)
-    created_at = Column(DateTime(timezone=True), server_default=func.now(), nullable=False)
+    created_at = Column(DateTime(timezone=True), server_default=func.now())
 
     # Relationships
     moderation_action = relationship("ModerationAction", back_populates="appeals")
-    user = relationship("User", foreign_keys=[user_id])
+    user = relationship("User", back_populates="appeals")
     reviewer = relationship("User", foreign_keys=[reviewed_by])

backend/app/models/moderation_action.py

@@ -1,63 +1,35 @@
-"""ModerationAction model for Trust & Safety."""
-
 from datetime import datetime
 from typing import Optional
 
-from sqlalchemy import (
-    Column,
-    Integer,
-    String,
-    Text,
-    DateTime,
-    ForeignKey,
-)
-from sqlalchemy.dialects.postgresql import ENUM
+from sqlalchemy import Column, Enum, ForeignKey, Integer, String, Text, DateTime
 from sqlalchemy.orm import relationship
 from sqlalchemy.sql import func
-import enum
 
 from app.database import Base
 
 
-class ModerationActionType(str, enum.Enum):
-    WARN = "warn"
-    SUSPEND = "suspend"
-    BAN = "ban"
-    RESTRICT = "restrict"
-    REMOVE = "remove"
-    RESTORE = "restore"
-
-
-class ModerationTargetType(str, enum.Enum):
-    USER = "user"
-    WORLD = "world"
-    ASSET = "asset"
-    CHAT_MESSAGE = "chat_message"
-
-
 class ModerationAction(Base):
     __tablename__ = "moderation_actions"
 
-    id = Column(Integer, primary_key=True, autoincrement=True)
-    moderator_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
-    target_user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=True)
+    id = Column(Integer, primary_key=True)
+    moderator_id = Column(Integer, ForeignKey("users.id"), nullable=False)
+    target_user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
     target_type = Column(
-        ENUM(ModerationTargetType, name="moderation_target_type", create_type=False),
+        Enum("user", "world", "asset", "chat_message", name="target_type_enum"),
         nullable=False,
     )
-    target_id = Column(String(64), nullable=True)
+    target_id = Column(String(64), nullable=False)
     action = Column(
-        ENUM(ModerationActionType, name="moderation_action_type", create_type=False),
+        Enum("warn", "suspend", "ban", "restrict", "remove", "restore", name="action_enum"),
         nullable=False,
     )
     reason = Column(Text, nullable=True)
-    report_id = Column(Integer, ForeignKey("reports.id", ondelete="SET NULL"), nullable=True)
+    report_id = Column(Integer, ForeignKey("reports.id"), nullable=True)
     expires_at = Column(DateTime(timezone=True), nullable=True)
     revoked_at = Column(DateTime(timezone=True), nullable=True)
-    created_at = Column(DateTime(timezone=True), server_default=func.now(), nullable=False)
+    created_at = Column(DateTime(timezone=True), server_default=func.now())
 
     # Relationships
     moderator = relationship("User", foreign_keys=[moderator_id])
     target_user = relationship("User", foreign_keys=[target_user_id])
-    report = relationship("Report", foreign_keys=[report_id])
-    appeals = relationship("Appeal", back_populates="moderation_action", cascade="all, delete-orphan")
+    report = relationship("Report", back_populates="moderation_actions")

backend/app/models/report.py

@@ -1,8 +1,5 @@
 """Report model for Trust & Safety."""
 
-from datetime import datetime
-from typing import Optional
-
 from sqlalchemy import (
     Column,
     Integer,
@@ -10,79 +7,54 @@ from sqlalchemy import (
     Text,
     DateTime,
     ForeignKey,
-    UniqueConstraint,
+    Enum as SAEnum,
 )
-from sqlalchemy.dialects.postgresql import ENUM
 from sqlalchemy.orm import relationship
 from sqlalchemy.sql import func
-import enum
 
 from app.database import Base
 
 
-class ReportTargetType(str, enum.Enum):
-    USER = "user"
-    WORLD = "world"
-    ASSET = "asset"
-    CHAT_MESSAGE = "chat_message"
-
-
-class ReasonCategory(str, enum.Enum):
-    HARASSMENT = "harassment"
-    HATE_SPEECH = "hate_speech"
-    SEXUAL_CONTENT = "sexual_content"
-    VIOLENCE = "violence"
-    SPAM = "spam"
-    SELF_HARM = "self_harm"
-    OTHER = "other"
-
-
-class ReportStatus(str, enum.Enum):
-    OPEN = "open"
-    IN_REVIEW = "in_review"
-    RESOLVED = "resolved"
-    DISMISSED = "dismissed"
-
-
-class Resolution(str, enum.Enum):
-    ACTION_TAKEN = "action_taken"
-    NO_ACTION = "no_action"
-    FALSE_POSITIVE = "false_positive"
-
-
 class Report(Base):
     __tablename__ = "reports"
 
-    id = Column(Integer, primary_key=True, autoincrement=True)
+    id = Column(Integer, primary_key=True)
     reporter_id = Column(Integer, ForeignKey("users.id"), nullable=False)
-    target_type = Column(
-        ENUM(ReportTargetType, name="report_target_type", create_type=False),
-        nullable=False,
-    )
+    target_type = SAEnum("user", "world", "asset", "chat_message", name="target_type_enum", nullable=False)
     target_id = Column(String(64), nullable=False)
-    reason_category = Column(
-        ENUM(ReasonCategory, name="reason_category", create_type=False),
+    reason_category = SAEnum(
+        "harassment",
+        "hate_speech",
+        "sexual_content",
+        "violence",
+        "spam",
+        "self_harm",
+        "other",
+        name="reason_category_enum",
         nullable=False,
     )
     details = Column(Text, nullable=True)
-    status = Column(
-        ENUM(ReportStatus, name="report_status", create_type=False),
-        default=ReportStatus.OPEN,
+    status = SAEnum(
+        "open",
+        "in_review",
+        "resolved",
+        "dismissed",
+        name="report_status_enum",
+        default="open",
+        nullable=False,
     )
     resolved_by = Column(Integer, ForeignKey("users.id"), nullable=True)
-    resolution = Column(
-        ENUM(Resolution, name="resolution", create_type=False),
+    resolution = SAEnum(
+        "action_taken",
+        "action_not_needed",
+        "duplicate",
+        name="resolution_enum",
         nullable=True,
     )
-    resolved_at = 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())
+    resolved_at = Column(DateTime(timezone=True), nullable=True)
 
     # Relationships
     reporter = relationship("User", foreign_keys=[reporter_id])
     resolved_by_user = relationship("User", foreign_keys=[resolved_by])
-
-    __table_args__ = (
-        UniqueConstraint("reporter_id", "target_type", "target_id",
-                         name="uq_reporter_target"),
-    )

backend/app/models/user.py

@@ -1,20 +1,12 @@
 from datetime import date
-from typing import Optional
 
-from sqlalchemy import Column, Integer, String, Boolean, DateTime, Date, Enum
+from sqlalchemy import Boolean, Column, Date, DateTime, Enum, Integer, String
 from sqlalchemy.orm import relationship
 from sqlalchemy.sql import func
-import enum
 
 from app.database import Base
 
 
-class UserRole(str, enum.Enum):
-    USER = "user"
-    MODERATOR = "moderator"
-    ADMIN = "admin"
-
-
 class User(Base):
     __tablename__ = "users"
 
@@ -25,9 +17,8 @@ class User(Base):
     date_of_birth = Column(Date, nullable=True)
     is_active = Column(Boolean, default=True)
     role = Column(
-        Enum(UserRole, name="user_role"),
-        nullable=False,
-        server_default="user",
+        Enum("user", "moderator", "admin", name="user_role", default="user"),
+        default="user",
     )
     banned_until = Column(DateTime(timezone=True), nullable=True)
     suspended_until = Column(DateTime(timezone=True), nullable=True)
@@ -37,11 +28,7 @@ class User(Base):
     sessions = relationship("Session", back_populates="user", cascade="all, delete-orphan")
     worlds = relationship("World", back_populates="owner")
     assets = relationship("Asset", back_populates="owner")
-    reports_made = relationship("Report", foreign_keys="Report.reporter_id", back_populates="reporter")
-    reports_resolved = relationship("Report", foreign_keys="Report.resolved_by", back_populates="resolved_by_user")
-    moderation_actions_as_moderator = relationship("ModerationAction", foreign_keys="ModerationAction.moderator_id", back_populates="moderator")
-    moderation_actions_as_target = relationship("ModerationAction", foreign_keys="ModerationAction.target_user_id", back_populates="target_user")
-    appeals = relationship("Appeal", foreign_keys="Appeal.user_id", back_populates="user")
+    appeals = relationship("Appeal", back_populates="user")
 
     @property
     def is_adult(self) -> bool: