Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fe37ccdba4 | |||
| 79cdd4a132 | |||
| aa2f79b125 | |||
| 8551d14591 | |||
| ff610c0466 | |||
| acbc518b4a |
@@ -8,7 +8,7 @@ from sqlalchemy.ext.asyncio import create_async_engine
|
|||||||
|
|
||||||
from app.config import settings
|
from app.config import settings
|
||||||
from app.database import Base
|
from app.database import Base
|
||||||
from app.models import user, session, world, asset, moderation # noqa: F401
|
from app.models import user, session, world, asset # noqa: F401
|
||||||
|
|
||||||
# this is the Alembic Config object, which provides
|
# this is the Alembic Config object, which provides
|
||||||
# access to the values within the .ini file in use.
|
# access to the values within the .ini file in use.
|
||||||
|
|||||||
@@ -69,7 +69,8 @@ def upgrade() -> None:
|
|||||||
sa.Column(
|
sa.Column(
|
||||||
"visibility",
|
"visibility",
|
||||||
postgresql.ENUM(
|
postgresql.ENUM(
|
||||||
"public", "private", "friends_only", name="world_visibility"
|
"public", "private", "friends_only", name="world_visibility",
|
||||||
|
create_type=False,
|
||||||
),
|
),
|
||||||
nullable=True,
|
nullable=True,
|
||||||
),
|
),
|
||||||
@@ -89,7 +90,7 @@ def upgrade() -> None:
|
|||||||
"asset_type",
|
"asset_type",
|
||||||
postgresql.ENUM(
|
postgresql.ENUM(
|
||||||
"image", "audio", "video", "document", "model_3d", "other",
|
"image", "audio", "video", "document", "model_3d", "other",
|
||||||
name="asset_type",
|
name="asset_type", create_type=False,
|
||||||
),
|
),
|
||||||
nullable=False,
|
nullable=False,
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,310 +0,0 @@
|
|||||||
"""add moderation schema
|
|
||||||
|
|
||||||
Revision ID: 0003_add_moderation_schema
|
|
||||||
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_add_moderation_schema"
|
|
||||||
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 moderation tables and extend users table."""
|
|
||||||
# ── ENUM types ──────────────────────────────────────────────
|
|
||||||
|
|
||||||
target_type_enum = postgresql.ENUM(
|
|
||||||
"user", "world", "asset", "chat_message",
|
|
||||||
name="target_type",
|
|
||||||
)
|
|
||||||
target_type_enum.create(op.get_bind(), checkfirst=True)
|
|
||||||
|
|
||||||
reason_category_enum = postgresql.ENUM(
|
|
||||||
"harassment", "hate_speech", "sexual_content", "violence",
|
|
||||||
"spam", "self_harm", "other",
|
|
||||||
name="reason_category",
|
|
||||||
)
|
|
||||||
reason_category_enum.create(op.get_bind(), checkfirst=True)
|
|
||||||
|
|
||||||
report_status_enum = postgresql.ENUM(
|
|
||||||
"open", "in_review", "resolved", "dismissed",
|
|
||||||
name="report_status",
|
|
||||||
)
|
|
||||||
report_status_enum.create(op.get_bind(), checkfirst=True)
|
|
||||||
|
|
||||||
resolution_enum = postgresql.ENUM(
|
|
||||||
"upheld", "modified", "dismissed",
|
|
||||||
name="resolution",
|
|
||||||
)
|
|
||||||
resolution_enum.create(op.get_bind(), checkfirst=True)
|
|
||||||
|
|
||||||
moderation_action_type_enum = postgresql.ENUM(
|
|
||||||
"warn", "suspend", "ban", "restrict", "remove", "restore",
|
|
||||||
name="moderation_action_type",
|
|
||||||
)
|
|
||||||
moderation_action_type_enum.create(op.get_bind(), checkfirst=True)
|
|
||||||
|
|
||||||
appeal_status_enum = postgresql.ENUM(
|
|
||||||
"pending", "approved", "rejected",
|
|
||||||
name="appeal_status",
|
|
||||||
)
|
|
||||||
appeal_status_enum.create(op.get_bind(), checkfirst=True)
|
|
||||||
|
|
||||||
user_role_enum = postgresql.ENUM(
|
|
||||||
"user", "moderator", "admin",
|
|
||||||
name="user_role",
|
|
||||||
)
|
|
||||||
user_role_enum.create(op.get_bind(), checkfirst=True)
|
|
||||||
|
|
||||||
# ── users table extensions ──────────────────────────────────
|
|
||||||
|
|
||||||
op.add_column(
|
|
||||||
"users",
|
|
||||||
sa.Column(
|
|
||||||
"role",
|
|
||||||
postgresql.ENUM(
|
|
||||||
"user", "moderator", "admin", name="user_role",
|
|
||||||
create_type=False,
|
|
||||||
),
|
|
||||||
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.Integer(), primary_key=True),
|
|
||||||
sa.Column("reporter_id", sa.Integer(), nullable=False),
|
|
||||||
sa.Column(
|
|
||||||
"target_type",
|
|
||||||
postgresql.ENUM(
|
|
||||||
"user", "world", "asset", "chat_message",
|
|
||||||
name="target_type", create_type=False,
|
|
||||||
),
|
|
||||||
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", create_type=False,
|
|
||||||
),
|
|
||||||
nullable=False,
|
|
||||||
),
|
|
||||||
sa.Column("details", sa.Text(), nullable=True),
|
|
||||||
sa.Column(
|
|
||||||
"status",
|
|
||||||
postgresql.ENUM(
|
|
||||||
"open", "in_review", "resolved", "dismissed",
|
|
||||||
name="report_status", create_type=False,
|
|
||||||
),
|
|
||||||
nullable=False,
|
|
||||||
server_default="open",
|
|
||||||
),
|
|
||||||
sa.Column("resolved_by", sa.Integer(), nullable=True),
|
|
||||||
sa.Column(
|
|
||||||
"resolution",
|
|
||||||
postgresql.ENUM(
|
|
||||||
"upheld", "modified", "dismissed",
|
|
||||||
name="resolution", create_type=False,
|
|
||||||
),
|
|
||||||
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),
|
|
||||||
server_default=sa.func.now(),
|
|
||||||
nullable=False,
|
|
||||||
),
|
|
||||||
sa.Column("resolved_at", sa.DateTime(timezone=True), nullable=True),
|
|
||||||
sa.ForeignKeyConstraint(
|
|
||||||
["reporter_id"], ["users.id"], ondelete="CASCADE",
|
|
||||||
),
|
|
||||||
sa.ForeignKeyConstraint(
|
|
||||||
["resolved_by"], ["users.id"], ondelete="SET NULL",
|
|
||||||
),
|
|
||||||
)
|
|
||||||
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,
|
|
||||||
)
|
|
||||||
op.create_index(
|
|
||||||
op.f("ix_reports_target"), "reports", ["target_type", "target_id"], unique=False,
|
|
||||||
)
|
|
||||||
|
|
||||||
# ── moderation_actions table ────────────────────────────────
|
|
||||||
|
|
||||||
op.create_table(
|
|
||||||
"moderation_actions",
|
|
||||||
sa.Column("id", sa.Integer(), primary_key=True),
|
|
||||||
sa.Column("moderator_id", sa.Integer(), nullable=False),
|
|
||||||
sa.Column("target_user_id", sa.Integer(), nullable=False),
|
|
||||||
sa.Column(
|
|
||||||
"target_type",
|
|
||||||
postgresql.ENUM(
|
|
||||||
"user", "world", "asset", "chat_message",
|
|
||||||
name="target_type", create_type=False,
|
|
||||||
),
|
|
||||||
nullable=False,
|
|
||||||
),
|
|
||||||
sa.Column("target_id", sa.String(length=64), nullable=False),
|
|
||||||
sa.Column(
|
|
||||||
"action",
|
|
||||||
postgresql.ENUM(
|
|
||||||
"warn", "suspend", "ban", "restrict", "remove", "restore",
|
|
||||||
name="moderation_action_type", create_type=False,
|
|
||||||
),
|
|
||||||
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="SET NULL",
|
|
||||||
),
|
|
||||||
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_target"),
|
|
||||||
"moderation_actions", ["target_type", "target_id"], unique=False,
|
|
||||||
)
|
|
||||||
|
|
||||||
# ── appeals table ───────────────────────────────────────────
|
|
||||||
|
|
||||||
op.create_table(
|
|
||||||
"appeals",
|
|
||||||
sa.Column("id", sa.Integer(), primary_key=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", create_type=False,
|
|
||||||
),
|
|
||||||
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:
|
|
||||||
"""Drop moderation 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_target"), 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_target"), table_name="reports")
|
|
||||||
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(op.get_bind(), checkfirst=True)
|
|
||||||
postgresql.ENUM(name="moderation_action_type").drop(op.get_bind(), checkfirst=True)
|
|
||||||
postgresql.ENUM(name="resolution").drop(op.get_bind(), checkfirst=True)
|
|
||||||
postgresql.ENUM(name="report_status").drop(op.get_bind(), checkfirst=True)
|
|
||||||
postgresql.ENUM(name="reason_category").drop(op.get_bind(), checkfirst=True)
|
|
||||||
postgresql.ENUM(name="target_type").drop(op.get_bind(), checkfirst=True)
|
|
||||||
postgresql.ENUM(name="user_role").drop(op.get_bind(), checkfirst=True)
|
|
||||||
@@ -2,30 +2,5 @@ from app.models.user import User
|
|||||||
from app.models.session import Session
|
from app.models.session import Session
|
||||||
from app.models.world import World
|
from app.models.world import World
|
||||||
from app.models.asset import Asset
|
from app.models.asset import Asset
|
||||||
from app.models.moderation import (
|
|
||||||
Report,
|
|
||||||
ModerationAction,
|
|
||||||
Appeal,
|
|
||||||
TargetType,
|
|
||||||
ReasonCategory,
|
|
||||||
ReportStatus,
|
|
||||||
Resolution,
|
|
||||||
ModerationActionType,
|
|
||||||
AppealStatus,
|
|
||||||
)
|
|
||||||
|
|
||||||
__all__ = [
|
__all__ = ["User", "Session", "World", "Asset"]
|
||||||
"User",
|
|
||||||
"Session",
|
|
||||||
"World",
|
|
||||||
"Asset",
|
|
||||||
"Report",
|
|
||||||
"ModerationAction",
|
|
||||||
"Appeal",
|
|
||||||
"TargetType",
|
|
||||||
"ReasonCategory",
|
|
||||||
"ReportStatus",
|
|
||||||
"Resolution",
|
|
||||||
"ModerationActionType",
|
|
||||||
"AppealStatus",
|
|
||||||
]
|
|
||||||
|
|||||||
@@ -1,186 +0,0 @@
|
|||||||
"""Moderation data models for Trust & Safety."""
|
|
||||||
|
|
||||||
import enum
|
|
||||||
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.orm import relationship
|
|
||||||
from sqlalchemy.sql import func
|
|
||||||
|
|
||||||
from app.database import Base
|
|
||||||
|
|
||||||
|
|
||||||
class TargetType(str, enum.Enum):
|
|
||||||
"""Type of entity being reported or moderated."""
|
|
||||||
USER = "user"
|
|
||||||
WORLD = "world"
|
|
||||||
ASSET = "asset"
|
|
||||||
CHAT_MESSAGE = "chat_message"
|
|
||||||
|
|
||||||
|
|
||||||
class ReasonCategory(str, enum.Enum):
|
|
||||||
"""Category of reason for a report."""
|
|
||||||
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):
|
|
||||||
"""Status of a report."""
|
|
||||||
OPEN = "open"
|
|
||||||
IN_REVIEW = "in_review"
|
|
||||||
RESOLVED = "resolved"
|
|
||||||
DISMISSED = "dismissed"
|
|
||||||
|
|
||||||
|
|
||||||
class Resolution(str, enum.Enum):
|
|
||||||
"""Resolution outcome of a report."""
|
|
||||||
UPHELD = "upheld"
|
|
||||||
MODIFIED = "modified"
|
|
||||||
DISMISSED = "dismissed"
|
|
||||||
|
|
||||||
|
|
||||||
class ModerationActionType(str, enum.Enum):
|
|
||||||
"""Type of moderation action taken."""
|
|
||||||
WARN = "warn"
|
|
||||||
SUSPEND = "suspend"
|
|
||||||
BAN = "ban"
|
|
||||||
RESTRICT = "restrict"
|
|
||||||
REMOVE = "remove"
|
|
||||||
RESTORE = "restore"
|
|
||||||
|
|
||||||
|
|
||||||
class AppealStatus(str, enum.Enum):
|
|
||||||
"""Status of an appeal."""
|
|
||||||
PENDING = "pending"
|
|
||||||
APPROVED = "approved"
|
|
||||||
REJECTED = "rejected"
|
|
||||||
|
|
||||||
|
|
||||||
class Report(Base):
|
|
||||||
"""A report filed by a user against a target entity."""
|
|
||||||
__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, name="target_type", create_type=False),
|
|
||||||
nullable=False,
|
|
||||||
)
|
|
||||||
target_id = Column(String(64), nullable=False)
|
|
||||||
reason_category = Column(
|
|
||||||
ENUM(ReasonCategory, name="reason_category", create_type=False),
|
|
||||||
nullable=False,
|
|
||||||
)
|
|
||||||
details = Column(Text, nullable=True)
|
|
||||||
status = Column(
|
|
||||||
ENUM(ReportStatus, name="report_status", create_type=False),
|
|
||||||
default=ReportStatus.OPEN,
|
|
||||||
nullable=False,
|
|
||||||
)
|
|
||||||
resolved_by = Column(
|
|
||||||
Integer, ForeignKey("users.id", ondelete="SET NULL"), nullable=True
|
|
||||||
)
|
|
||||||
resolution = Column(
|
|
||||||
ENUM(Resolution, name="resolution", create_type=False),
|
|
||||||
nullable=True,
|
|
||||||
)
|
|
||||||
created_at = Column(
|
|
||||||
DateTime(timezone=True), server_default=func.now(), nullable=False
|
|
||||||
)
|
|
||||||
updated_at = Column(
|
|
||||||
DateTime(timezone=True),
|
|
||||||
server_default=func.now(),
|
|
||||||
onupdate=func.now(),
|
|
||||||
nullable=False,
|
|
||||||
)
|
|
||||||
resolved_at = Column(DateTime(timezone=True), 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"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class ModerationAction(Base):
|
|
||||||
"""A moderation action taken by a moderator against a user or entity."""
|
|
||||||
__tablename__ = "moderation_actions"
|
|
||||||
|
|
||||||
id = Column(Integer, primary_key=True, index=True)
|
|
||||||
moderator_id = Column(
|
|
||||||
Integer, ForeignKey("users.id", ondelete="SET NULL"), nullable=False
|
|
||||||
)
|
|
||||||
target_user_id = Column(
|
|
||||||
Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False
|
|
||||||
)
|
|
||||||
target_type = Column(
|
|
||||||
ENUM(TargetType, name="target_type", create_type=False),
|
|
||||||
nullable=False,
|
|
||||||
)
|
|
||||||
target_id = Column(String(64), nullable=False)
|
|
||||||
action = Column(
|
|
||||||
ENUM(ModerationActionType, name="moderation_action_type", 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(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
|
|
||||||
)
|
|
||||||
|
|
||||||
# Relationships
|
|
||||||
moderator = relationship("User", foreign_keys=[moderator_id])
|
|
||||||
target_user = relationship("User", foreign_keys=[target_user_id])
|
|
||||||
report = relationship("Report", back_populates="moderation_actions")
|
|
||||||
appeals = relationship(
|
|
||||||
"Appeal", back_populates="moderation_action", cascade="all, delete-orphan"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class Appeal(Base):
|
|
||||||
"""An appeal filed by a user against a moderation action."""
|
|
||||||
__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(AppealStatus, name="appeal_status", create_type=False),
|
|
||||||
default=AppealStatus.PENDING,
|
|
||||||
nullable=False,
|
|
||||||
)
|
|
||||||
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")
|
|
||||||
user = relationship("User", foreign_keys=[user_id])
|
|
||||||
reviewer = relationship("User", foreign_keys=[reviewed_by])
|
|
||||||
@@ -1,21 +1,13 @@
|
|||||||
from datetime import date
|
from datetime import date
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
from sqlalchemy import Column, Integer, String, Boolean, DateTime, Date, func
|
from sqlalchemy import Column, Integer, String, Boolean, DateTime, Date
|
||||||
from sqlalchemy.dialects.postgresql import ENUM
|
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
import enum
|
from sqlalchemy.sql import func
|
||||||
|
|
||||||
from app.database import Base
|
from app.database import Base
|
||||||
|
|
||||||
|
|
||||||
class UserRole(str, enum.Enum):
|
|
||||||
"""User role for moderation and access control."""
|
|
||||||
USER = "user"
|
|
||||||
MODERATOR = "moderator"
|
|
||||||
ADMIN = "admin"
|
|
||||||
|
|
||||||
|
|
||||||
class User(Base):
|
class User(Base):
|
||||||
__tablename__ = "users"
|
__tablename__ = "users"
|
||||||
|
|
||||||
@@ -25,13 +17,6 @@ class User(Base):
|
|||||||
hashed_password = Column(String(255), nullable=False)
|
hashed_password = Column(String(255), nullable=False)
|
||||||
date_of_birth = Column(Date, nullable=True)
|
date_of_birth = Column(Date, nullable=True)
|
||||||
is_active = Column(Boolean, default=True)
|
is_active = Column(Boolean, default=True)
|
||||||
role = Column(
|
|
||||||
ENUM(UserRole, name="user_role", create_type=False),
|
|
||||||
default=UserRole.USER,
|
|
||||||
nullable=False,
|
|
||||||
)
|
|
||||||
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())
|
created_at = Column(DateTime(timezone=True), server_default=func.now())
|
||||||
updated_at = Column(DateTime(timezone=True), onupdate=func.now())
|
updated_at = Column(DateTime(timezone=True), onupdate=func.now())
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
"""Asset management router."""
|
"""Asset management router."""
|
||||||
|
|
||||||
|
import json
|
||||||
import os
|
import os
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
@@ -37,6 +38,7 @@ class AssetResponse(BaseModel):
|
|||||||
file_path: str
|
file_path: str
|
||||||
file_size: Optional[int]
|
file_size: Optional[int]
|
||||||
mime_type: Optional[str]
|
mime_type: Optional[str]
|
||||||
|
metadata_json: Optional[dict]
|
||||||
world_id: Optional[int]
|
world_id: Optional[int]
|
||||||
owner_id: int
|
owner_id: int
|
||||||
is_public: bool
|
is_public: bool
|
||||||
@@ -45,6 +47,18 @@ class AssetResponse(BaseModel):
|
|||||||
|
|
||||||
model_config = {"from_attributes": True}
|
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):
|
class AssetUpdate(BaseModel):
|
||||||
"""Schema for updating an asset."""
|
"""Schema for updating an asset."""
|
||||||
@@ -64,6 +78,144 @@ def _sanitize_filename(filename: str) -> str:
|
|||||||
return safe or "file"
|
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 ---
|
# --- Endpoints ---
|
||||||
|
|
||||||
@router.post("/", response_model=AssetResponse, status_code=201)
|
@router.post("/", response_model=AssetResponse, status_code=201)
|
||||||
@@ -204,6 +356,13 @@ async def upload_asset_file(
|
|||||||
asset.mime_type = file.content_type
|
asset.mime_type = file.content_type
|
||||||
asset.file_size = file_size
|
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.commit()
|
||||||
await db.refresh(asset)
|
await db.refresh(asset)
|
||||||
return asset
|
return asset
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ services:
|
|||||||
POSTGRES_PASSWORD: agp_password
|
POSTGRES_PASSWORD: agp_password
|
||||||
POSTGRES_DB: agp_db
|
POSTGRES_DB: agp_db
|
||||||
ports:
|
ports:
|
||||||
- "5432:5432"
|
- "${POSTGRES_HOST_PORT:-5432}:5432"
|
||||||
volumes:
|
volumes:
|
||||||
- postgres_data:/var/lib/postgresql/data
|
- postgres_data:/var/lib/postgresql/data
|
||||||
healthcheck:
|
healthcheck:
|
||||||
@@ -20,7 +20,7 @@ services:
|
|||||||
redis:
|
redis:
|
||||||
image: redis:7-alpine
|
image: redis:7-alpine
|
||||||
ports:
|
ports:
|
||||||
- "6379:6379"
|
- "${REDIS_HOST_PORT:-6379}:6379"
|
||||||
volumes:
|
volumes:
|
||||||
- redis_data:/data
|
- redis_data:/data
|
||||||
healthcheck:
|
healthcheck:
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
# 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.
|
||||||
Reference in New Issue
Block a user