Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a2cc1dbe18 | |||
| 0ce85fd5f7 | |||
| 57135fc859 | |||
| ae498ce4cb | |||
| 9c6390e73b |
@@ -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, report, moderation_action, appeal # 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.
|
||||||
|
|||||||
@@ -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,8 @@ 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 (
|
from app.models.report import Report
|
||||||
Report,
|
from app.models.moderation_action import ModerationAction
|
||||||
ModerationAction,
|
from app.models.appeal import Appeal
|
||||||
Appeal,
|
|
||||||
TargetType,
|
|
||||||
ReasonCategory,
|
|
||||||
ReportStatus,
|
|
||||||
Resolution,
|
|
||||||
ModerationActionType,
|
|
||||||
AppealStatus,
|
|
||||||
)
|
|
||||||
|
|
||||||
__all__ = [
|
__all__ = ["User", "Session", "World", "Asset", "Report", "ModerationAction", "Appeal"]
|
||||||
"User",
|
|
||||||
"Session",
|
|
||||||
"World",
|
|
||||||
"Asset",
|
|
||||||
"Report",
|
|
||||||
"ModerationAction",
|
|
||||||
"Appeal",
|
|
||||||
"TargetType",
|
|
||||||
"ReasonCategory",
|
|
||||||
"ReportStatus",
|
|
||||||
"Resolution",
|
|
||||||
"ModerationActionType",
|
|
||||||
"AppealStatus",
|
|
||||||
]
|
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
"""Appeal model for moderation actions."""
|
||||||
|
|
||||||
|
from sqlalchemy import Column, Integer, String, Text, DateTime, ForeignKey, Enum
|
||||||
|
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)
|
||||||
|
moderation_action_id = Column(
|
||||||
|
Integer, ForeignKey("moderation_actions.id"), nullable=False
|
||||||
|
)
|
||||||
|
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
||||||
|
reason = Column(Text, nullable=False)
|
||||||
|
status = Column(
|
||||||
|
Enum(
|
||||||
|
"pending", "approved", "rejected",
|
||||||
|
name="appeal_status_enum",
|
||||||
|
),
|
||||||
|
default="pending",
|
||||||
|
nullable=False,
|
||||||
|
)
|
||||||
|
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())
|
||||||
|
|
||||||
|
# Relationships
|
||||||
|
moderation_action = relationship("ModerationAction", back_populates="appeals")
|
||||||
|
user = relationship("User", back_populates="appeals")
|
||||||
|
reviewer = relationship("User", foreign_keys=[reviewed_by])
|
||||||
@@ -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])
|
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
from datetime import datetime
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from sqlalchemy import Column, Enum, ForeignKey, Integer, String, Text, DateTime
|
||||||
|
from sqlalchemy.orm import relationship
|
||||||
|
from sqlalchemy.sql import func
|
||||||
|
|
||||||
|
from app.database import Base
|
||||||
|
|
||||||
|
|
||||||
|
class ModerationAction(Base):
|
||||||
|
__tablename__ = "moderation_actions"
|
||||||
|
|
||||||
|
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("user", "world", "asset", "chat_message", name="target_type_enum"),
|
||||||
|
nullable=False,
|
||||||
|
)
|
||||||
|
target_id = Column(String(64), nullable=False)
|
||||||
|
action = Column(
|
||||||
|
Enum("warn", "suspend", "ban", "restrict", "remove", "restore", name="action_enum"),
|
||||||
|
nullable=False,
|
||||||
|
)
|
||||||
|
reason = Column(Text, 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())
|
||||||
|
|
||||||
|
# Relationships
|
||||||
|
moderator = relationship("User", foreign_keys=[moderator_id])
|
||||||
|
target_user = relationship("User", foreign_keys=[target_user_id])
|
||||||
|
report = relationship("Report", back_populates="moderation_actions")
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
"""Report model for Trust & Safety."""
|
||||||
|
|
||||||
|
from sqlalchemy import (
|
||||||
|
Column,
|
||||||
|
Integer,
|
||||||
|
String,
|
||||||
|
Text,
|
||||||
|
DateTime,
|
||||||
|
ForeignKey,
|
||||||
|
Enum as SAEnum,
|
||||||
|
)
|
||||||
|
from sqlalchemy.orm import relationship
|
||||||
|
from sqlalchemy.sql import func
|
||||||
|
|
||||||
|
from app.database import Base
|
||||||
|
|
||||||
|
|
||||||
|
class Report(Base):
|
||||||
|
__tablename__ = "reports"
|
||||||
|
|
||||||
|
id = Column(Integer, primary_key=True)
|
||||||
|
reporter_id = Column(Integer, ForeignKey("users.id"), 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 = SAEnum(
|
||||||
|
"harassment",
|
||||||
|
"hate_speech",
|
||||||
|
"sexual_content",
|
||||||
|
"violence",
|
||||||
|
"spam",
|
||||||
|
"self_harm",
|
||||||
|
"other",
|
||||||
|
name="reason_category_enum",
|
||||||
|
nullable=False,
|
||||||
|
)
|
||||||
|
details = Column(Text, nullable=True)
|
||||||
|
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 = SAEnum(
|
||||||
|
"action_taken",
|
||||||
|
"action_not_needed",
|
||||||
|
"duplicate",
|
||||||
|
name="resolution_enum",
|
||||||
|
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])
|
||||||
@@ -1,21 +1,12 @@
|
|||||||
from datetime import date
|
from datetime import date
|
||||||
from typing import Optional
|
|
||||||
|
|
||||||
from sqlalchemy import Column, Integer, String, Boolean, DateTime, Date, func
|
from sqlalchemy import Boolean, Column, Date, DateTime, Enum, Integer, String
|
||||||
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"
|
||||||
|
|
||||||
@@ -26,9 +17,8 @@ class User(Base):
|
|||||||
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(
|
role = Column(
|
||||||
ENUM(UserRole, name="user_role", create_type=False),
|
Enum("user", "moderator", "admin", name="user_role", default="user"),
|
||||||
default=UserRole.USER,
|
default="user",
|
||||||
nullable=False,
|
|
||||||
)
|
)
|
||||||
banned_until = Column(DateTime(timezone=True), nullable=True)
|
banned_until = Column(DateTime(timezone=True), nullable=True)
|
||||||
suspended_until = Column(DateTime(timezone=True), nullable=True)
|
suspended_until = Column(DateTime(timezone=True), nullable=True)
|
||||||
@@ -38,6 +28,7 @@ class User(Base):
|
|||||||
sessions = relationship("Session", back_populates="user", cascade="all, delete-orphan")
|
sessions = relationship("Session", back_populates="user", cascade="all, delete-orphan")
|
||||||
worlds = relationship("World", back_populates="owner")
|
worlds = relationship("World", back_populates="owner")
|
||||||
assets = relationship("Asset", back_populates="owner")
|
assets = relationship("Asset", back_populates="owner")
|
||||||
|
appeals = relationship("Appeal", back_populates="user")
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def is_adult(self) -> bool:
|
def is_adult(self) -> bool:
|
||||||
|
|||||||
Reference in New Issue
Block a user