Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8a63b10c73 |
@@ -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, group # 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.
|
||||||
|
|||||||
@@ -19,16 +19,16 @@ depends_on: Union[str, Sequence[str], None] = None
|
|||||||
|
|
||||||
def upgrade() -> None:
|
def upgrade() -> None:
|
||||||
"""Upgrade database schema."""
|
"""Upgrade database schema."""
|
||||||
# Create ENUM types (create once, reuse below)
|
# Create ENUM types
|
||||||
world_visibility_enum = postgresql.ENUM(
|
world_visibility = postgresql.ENUM(
|
||||||
"public", "private", "friends_only", name="world_visibility"
|
"public", "private", "friends_only", name="world_visibility"
|
||||||
)
|
)
|
||||||
world_visibility_enum.create(op.get_bind(), checkfirst=True)
|
world_visibility.create(op.get_bind(), checkfirst=True)
|
||||||
|
|
||||||
asset_type_enum = postgresql.ENUM(
|
asset_type = postgresql.ENUM(
|
||||||
"image", "audio", "video", "document", "model_3d", "other", name="asset_type"
|
"image", "audio", "video", "document", "model_3d", "other", name="asset_type"
|
||||||
)
|
)
|
||||||
asset_type_enum.create(op.get_bind(), checkfirst=True)
|
asset_type.create(op.get_bind(), checkfirst=True)
|
||||||
|
|
||||||
# Create users table
|
# Create users table
|
||||||
op.create_table(
|
op.create_table(
|
||||||
@@ -59,7 +59,7 @@ def upgrade() -> None:
|
|||||||
)
|
)
|
||||||
op.create_index(op.f("ix_sessions_token"), "sessions", ["token"], unique=True)
|
op.create_index(op.f("ix_sessions_token"), "sessions", ["token"], unique=True)
|
||||||
|
|
||||||
# Create worlds table — reuse world_visibility_enum (no second create)
|
# Create worlds table
|
||||||
op.create_table(
|
op.create_table(
|
||||||
"worlds",
|
"worlds",
|
||||||
sa.Column("id", sa.Integer(), primary_key=True),
|
sa.Column("id", sa.Integer(), primary_key=True),
|
||||||
@@ -68,7 +68,9 @@ def upgrade() -> None:
|
|||||||
sa.Column("owner_id", sa.Integer(), nullable=False),
|
sa.Column("owner_id", sa.Integer(), nullable=False),
|
||||||
sa.Column(
|
sa.Column(
|
||||||
"visibility",
|
"visibility",
|
||||||
world_visibility_enum,
|
postgresql.ENUM(
|
||||||
|
"public", "private", "friends_only", name="world_visibility"
|
||||||
|
),
|
||||||
nullable=True,
|
nullable=True,
|
||||||
),
|
),
|
||||||
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
||||||
@@ -77,7 +79,7 @@ def upgrade() -> None:
|
|||||||
)
|
)
|
||||||
op.create_index(op.f("ix_worlds_id"), "worlds", ["id"], unique=False)
|
op.create_index(op.f("ix_worlds_id"), "worlds", ["id"], unique=False)
|
||||||
|
|
||||||
# Create assets table — reuse asset_type_enum (no second create)
|
# Create assets table
|
||||||
op.create_table(
|
op.create_table(
|
||||||
"assets",
|
"assets",
|
||||||
sa.Column("id", sa.Integer(), primary_key=True),
|
sa.Column("id", sa.Integer(), primary_key=True),
|
||||||
@@ -85,7 +87,10 @@ def upgrade() -> None:
|
|||||||
sa.Column("description", sa.Text(), nullable=True),
|
sa.Column("description", sa.Text(), nullable=True),
|
||||||
sa.Column(
|
sa.Column(
|
||||||
"asset_type",
|
"asset_type",
|
||||||
asset_type_enum,
|
postgresql.ENUM(
|
||||||
|
"image", "audio", "video", "document", "model_3d", "other",
|
||||||
|
name="asset_type",
|
||||||
|
),
|
||||||
nullable=False,
|
nullable=False,
|
||||||
),
|
),
|
||||||
sa.Column("file_path", sa.String(length=512), nullable=False),
|
sa.Column("file_path", sa.String(length=512), nullable=False),
|
||||||
|
|||||||
@@ -1,78 +0,0 @@
|
|||||||
"""add groups and group_members tables
|
|
||||||
|
|
||||||
Revision ID: 0003_add_groups_and_members
|
|
||||||
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_groups_and_members"
|
|
||||||
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 groups and group_members tables."""
|
|
||||||
# Create group_member_role ENUM type
|
|
||||||
group_member_role = postgresql.ENUM(
|
|
||||||
"owner", "admin", "member", name="group_member_role"
|
|
||||||
)
|
|
||||||
group_member_role.create(op.get_bind(), checkfirst=True)
|
|
||||||
|
|
||||||
# Create groups table
|
|
||||||
op.create_table(
|
|
||||||
"groups",
|
|
||||||
sa.Column("id", sa.Integer(), primary_key=True, index=True),
|
|
||||||
sa.Column("name", sa.String(length=255), nullable=False),
|
|
||||||
sa.Column("description", sa.Text(), nullable=True),
|
|
||||||
sa.Column(
|
|
||||||
"owner_id",
|
|
||||||
sa.Integer(),
|
|
||||||
sa.ForeignKey("users.id", ondelete="CASCADE"),
|
|
||||||
nullable=False,
|
|
||||||
),
|
|
||||||
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
|
||||||
sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.func.now(), onupdate=sa.func.now()),
|
|
||||||
)
|
|
||||||
|
|
||||||
# Create group_members table
|
|
||||||
op.create_table(
|
|
||||||
"group_members",
|
|
||||||
sa.Column(
|
|
||||||
"group_id",
|
|
||||||
sa.Integer(),
|
|
||||||
sa.ForeignKey("groups.id", ondelete="CASCADE"),
|
|
||||||
primary_key=True,
|
|
||||||
),
|
|
||||||
sa.Column(
|
|
||||||
"user_id",
|
|
||||||
sa.Integer(),
|
|
||||||
sa.ForeignKey("users.id", ondelete="CASCADE"),
|
|
||||||
primary_key=True,
|
|
||||||
),
|
|
||||||
sa.Column(
|
|
||||||
"role",
|
|
||||||
postgresql.ENUM(
|
|
||||||
"owner", "admin", "member", name="group_member_role", create_type=False
|
|
||||||
),
|
|
||||||
nullable=False,
|
|
||||||
default="member",
|
|
||||||
),
|
|
||||||
sa.Column("joined_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Drop group_members and groups tables."""
|
|
||||||
op.drop_table("group_members")
|
|
||||||
op.drop_table("groups")
|
|
||||||
|
|
||||||
# Drop group_member_role ENUM type
|
|
||||||
postgresql.ENUM(name="group_member_role").drop(op.get_bind(), checkfirst=True)
|
|
||||||
@@ -2,6 +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.group import Group, GroupMember, GroupMemberRole
|
|
||||||
|
|
||||||
__all__ = ["User", "Session", "World", "Asset", "Group", "GroupMember", "GroupMemberRole"]
|
__all__ = ["User", "Session", "World", "Asset"]
|
||||||
|
|||||||
@@ -1,56 +0,0 @@
|
|||||||
import enum
|
|
||||||
|
|
||||||
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 GroupMemberRole(str, enum.Enum):
|
|
||||||
OWNER = "owner"
|
|
||||||
ADMIN = "admin"
|
|
||||||
MEMBER = "member"
|
|
||||||
|
|
||||||
|
|
||||||
class Group(Base):
|
|
||||||
__tablename__ = "groups"
|
|
||||||
|
|
||||||
id = Column(Integer, primary_key=True, index=True)
|
|
||||||
name = Column(String(255), nullable=False)
|
|
||||||
description = Column(Text, nullable=True)
|
|
||||||
owner_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
|
|
||||||
created_at = Column(DateTime(timezone=True), server_default=func.now())
|
|
||||||
updated_at = Column(DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
|
|
||||||
|
|
||||||
owner = relationship("User", back_populates="owned_groups")
|
|
||||||
members = relationship(
|
|
||||||
"GroupMember",
|
|
||||||
back_populates="group",
|
|
||||||
cascade="all, delete-orphan",
|
|
||||||
order_by="GroupMember.joined_at",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class GroupMember(Base):
|
|
||||||
__tablename__ = "group_members"
|
|
||||||
|
|
||||||
group_id = Column(
|
|
||||||
Integer,
|
|
||||||
ForeignKey("groups.id", ondelete="CASCADE"),
|
|
||||||
primary_key=True,
|
|
||||||
)
|
|
||||||
user_id = Column(
|
|
||||||
Integer,
|
|
||||||
ForeignKey("users.id", ondelete="CASCADE"),
|
|
||||||
primary_key=True,
|
|
||||||
)
|
|
||||||
role = Column(
|
|
||||||
Enum(GroupMemberRole, name="group_member_role", create_type=False),
|
|
||||||
nullable=False,
|
|
||||||
default=GroupMemberRole.MEMBER,
|
|
||||||
)
|
|
||||||
joined_at = Column(DateTime(timezone=True), server_default=func.now())
|
|
||||||
|
|
||||||
group = relationship("Group", back_populates="members")
|
|
||||||
user = relationship("User", back_populates="group_memberships")
|
|
||||||
@@ -23,8 +23,6 @@ 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")
|
||||||
owned_groups = relationship("Group", back_populates="owner")
|
|
||||||
group_memberships = relationship("GroupMember", back_populates="user")
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def is_adult(self) -> bool:
|
def is_adult(self) -> bool:
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ services:
|
|||||||
POSTGRES_PASSWORD: agp_password
|
POSTGRES_PASSWORD: agp_password
|
||||||
POSTGRES_DB: agp_db
|
POSTGRES_DB: agp_db
|
||||||
ports:
|
ports:
|
||||||
- "${POSTGRES_PORT:-5432}:5432"
|
- "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:
|
||||||
- "${REDIS_PORT:-6379}:6379"
|
- "6379:6379"
|
||||||
volumes:
|
volumes:
|
||||||
- redis_data:/data
|
- redis_data:/data
|
||||||
healthcheck:
|
healthcheck:
|
||||||
|
|||||||
@@ -0,0 +1,160 @@
|
|||||||
|
# Trust & Safety Operations — Plan
|
||||||
|
|
||||||
|
> **Status:** Planned
|
||||||
|
> **Owner:** Platform team
|
||||||
|
> **Feature ID:** `trust_safety`
|
||||||
|
> **Godot version:** 4.6.2 stable
|
||||||
|
> **Backend:** FastAPI + SQLAlchemy (async) + PostgreSQL (+ Redis available, unused)
|
||||||
|
> **Related:** `content_moderation.md` (M5 — content rating/flagging at upload time),
|
||||||
|
> `social.md` (chat + report-message), `app/dependencies.py` (JWT auth)
|
||||||
|
|
||||||
|
## 1. Overview
|
||||||
|
|
||||||
|
This feature is the **enforcement workflow** for content/behavior that is
|
||||||
|
**already live** and has been reported by a real user. M5
|
||||||
|
(`content_moderation.md`) covers rating/flagging at authoring/upload time; this
|
||||||
|
feature covers what happens **after** something is live and someone reports it:
|
||||||
|
|
||||||
|
1. **Reporting** — report a user, an experience (world/asset), or a chat
|
||||||
|
message with a reason and optional detail.
|
||||||
|
2. **Moderation queue** — staff review incoming reports, see report + target
|
||||||
|
context, and resolve them.
|
||||||
|
3. **Ban / suspension** — apply a temporary suspension or permanent ban to a
|
||||||
|
user, with enforcement at the auth boundary.
|
||||||
|
4. **Appeals** — a sanctioned user can appeal; staff can uphold or overturn.
|
||||||
|
|
||||||
|
The userbase being 18+ does **not** shrink the moderation need — harassment,
|
||||||
|
hate speech, spam, griefing, and CSAM/policy violations still require real
|
||||||
|
enforcement. Safety is a **blocking requirement**, not an add-on.
|
||||||
|
|
||||||
|
## 2. Existing constraints (do not re-build)
|
||||||
|
|
||||||
|
- **Auth:** JWT bearer; `get_current_user` / `CurrentUser` in
|
||||||
|
`app/dependencies.py`. Every new endpoint reuses it.
|
||||||
|
- **DB:** async SQLAlchemy + Alembic. Current head is `0002_add_date_of_birth_to_users`.
|
||||||
|
- **Models:** `User`, `World` (owner_id), `Asset` (owner_id, is_public). There
|
||||||
|
is no `role` field yet, and no chat/message table yet (social.md is planned,
|
||||||
|
not built).
|
||||||
|
- **Redis:** configured (`REDIS_URL`) but unused; not required by this feature.
|
||||||
|
- **Client:** Godot 4.6.2, minimal `main_menu.gd`; no report/chat UI yet.
|
||||||
|
|
||||||
|
## 3. Key design decisions
|
||||||
|
|
||||||
|
| Concern | Decision |
|
||||||
|
|---|---|
|
||||||
|
| Report target addressing | Generic `target_type` + `target_id` (string) so user/world/asset/message all flow through one report path; router resolves target existence via a small registry |
|
||||||
|
| Report reasons | Fixed enum `reason_category` (harassment, hate_speech, sexual_content, violence, spam, self_harm, other) + free-text `details` |
|
||||||
|
| Staff roles | Add `role` enum on `User` (`user` / `moderator` / `admin`); `RequireStaff` dependency gates the queue/action/appeal-review endpoints |
|
||||||
|
| Enforcement | Denormalized `banned_until` / `suspended_until` timestamps on `User` (kept in sync by moderation actions); `get_current_user` rejects sanctioned users with `403` so enforcement applies to **all** existing endpoints |
|
||||||
|
| Ban vs. suspension | Suspension = temporary (`expires_at`); ban = permanent (`expires_at IS NULL`). Both are rows in `moderation_actions` for auditability |
|
||||||
|
| Appeals | Appeal references the specific `moderation_action`; approving an appeal revokes the action and clears the user's sanction |
|
||||||
|
| Audit | Every moderation action is an append-only row with `moderator_id`, `reason`, `created_at`, `revoked_at`; reports record `resolved_by` + `resolution` |
|
||||||
|
|
||||||
|
## 4. Data model (target shape)
|
||||||
|
|
||||||
|
```
|
||||||
|
users
|
||||||
|
+ role ENUM(user, moderator, admin) default 'user'
|
||||||
|
+ banned_until TIMESTAMPTZ NULL
|
||||||
|
+ suspended_until TIMESTAMPTZ NULL
|
||||||
|
|
||||||
|
reports
|
||||||
|
id, reporter_id FK users, target_type ENUM(user,world,asset,chat_message),
|
||||||
|
target_id VARCHAR(64), reason_category ENUM(...), details TEXT,
|
||||||
|
status ENUM(open,in_review,resolved,dismissed) default 'open',
|
||||||
|
resolved_by FK users NULL, resolution ENUM(...) NULL,
|
||||||
|
created_at, updated_at, resolved_at
|
||||||
|
|
||||||
|
moderation_actions
|
||||||
|
id, moderator_id FK users, target_user_id FK users,
|
||||||
|
target_type ENUM(user,world,asset,chat_message), target_id VARCHAR(64),
|
||||||
|
action ENUM(warn,suspend,ban,restrict,remove,restore),
|
||||||
|
reason TEXT, report_id FK reports NULL,
|
||||||
|
expires_at TIMESTAMPTZ NULL, revoked_at TIMESTAMPTZ NULL, created_at
|
||||||
|
|
||||||
|
appeals
|
||||||
|
id, moderation_action_id FK moderation_actions,
|
||||||
|
user_id FK users, reason TEXT,
|
||||||
|
status ENUM(pending,approved,rejected) default 'pending',
|
||||||
|
reviewed_by FK users NULL, reviewed_at TIMESTAMPTZ NULL, created_at
|
||||||
|
```
|
||||||
|
|
||||||
|
## 5. User stories
|
||||||
|
|
||||||
|
### US-1 Reporting
|
||||||
|
As a player, I can report a user, an experience (world/asset), or a chat
|
||||||
|
message, choosing a reason and adding optional detail.
|
||||||
|
|
||||||
|
**Acceptance criteria**
|
||||||
|
- Report requires a valid target of the matching type (404 otherwise) and a
|
||||||
|
reason from the fixed category set.
|
||||||
|
- Duplicate reports from the same reporter for the same target are coalesced
|
||||||
|
(409) rather than creating unbounded duplicates.
|
||||||
|
- A report cannot be filed by a banned/suspended user (enforced by existing auth).
|
||||||
|
- Each report stores reporter, target, reason, and created_at; status starts `open`.
|
||||||
|
|
||||||
|
### US-2 Moderation queue & review
|
||||||
|
As a moderator, I can list open reports (filterable by type/status/reason),
|
||||||
|
view a report with its target, and resolve it with an action.
|
||||||
|
|
||||||
|
**Acceptance criteria**
|
||||||
|
- Queue is staff-only (`RequireStaff`); non-staff get 403.
|
||||||
|
- List supports status/type/reason filters + pagination (offset/limit).
|
||||||
|
- Resolving sets `status`, `resolution`, `resolved_by`, `resolved_at` and
|
||||||
|
(where applicable) records a `moderation_actions` row.
|
||||||
|
|
||||||
|
### US-3 Ban / suspension enforcement
|
||||||
|
As a moderator, I can suspend a user temporarily or ban them permanently, and
|
||||||
|
the sanction blocks the user from authenticated endpoints immediately.
|
||||||
|
|
||||||
|
**Acceptance criteria**
|
||||||
|
- Suspension sets `suspended_until`; ban sets `banned_until` (permanent). Warn
|
||||||
|
records an action without blocking.
|
||||||
|
- `get_current_user` returns `403` for any user past a live sanction.
|
||||||
|
- Expired suspensions no longer block (time-based, no cron required).
|
||||||
|
- Removing a ban/suspension is itself a recorded `restore` action.
|
||||||
|
|
||||||
|
### US-4 Appeals
|
||||||
|
As a sanctioned user, I can appeal an active ban/suspension; as a moderator I
|
||||||
|
can approve (overturn) or reject (uphold) it.
|
||||||
|
|
||||||
|
**Acceptance criteria**
|
||||||
|
- A user can submit exactly one open appeal per sanction.
|
||||||
|
- Appeal is tied to the specific `moderation_action`.
|
||||||
|
- Approving revokes the action and clears the user's sanction; rejecting
|
||||||
|
upholds it. Both record reviewer + timestamp.
|
||||||
|
|
||||||
|
## 6. Task breakdown
|
||||||
|
|
||||||
|
Right-sized to ~1–3 files / one coherent piece of functionality. Task IDs are
|
||||||
|
dependency order.
|
||||||
|
|
||||||
|
| # | Task | Story | Depends on |
|
||||||
|
|---|------|-------|-----------|
|
||||||
|
| 1 | Moderation data model + Alembic migration (reports, moderation_actions, appeals, user `role`/`banned_until`/`suspended_until`) | US-1..4 | — |
|
||||||
|
| 2 | Staff authorization + sanction enforcement dependency (`RequireStaff`; extend `get_current_user` to reject sanctioned users) | US-2, US-3 | 1 |
|
||||||
|
| 3 | Report submission endpoints (report user / experience / chat message) | US-1 | 1 |
|
||||||
|
| 4 | Moderation queue + review endpoints (list, detail, resolve→action) | US-2 | 1, 2 |
|
||||||
|
| 5 | Ban/suspend/restore action application + user-sanction sync | US-3 | 2, 4 |
|
||||||
|
| 6 | Appeals endpoints (submit, list, review → uphold/overturn) | US-4 | 1, 5 |
|
||||||
|
| 7 | Integration tests: report → review → ban → appeal → overturn | US-1..4 | 3, 4, 5, 6 |
|
||||||
|
|
||||||
|
## 7. Phasing
|
||||||
|
|
||||||
|
- **Phase 1 (data + enforcement core):** tasks 1–2. Land the schema and make
|
||||||
|
sanctioned users actually unable to act — highest value.
|
||||||
|
- **Phase 2 (report → review → action):** tasks 3–5. The moderation loop.
|
||||||
|
- **Phase 3 (appeals):** task 6.
|
||||||
|
- **Phase 4 (verification):** task 7 integration tests.
|
||||||
|
|
||||||
|
## 8. Out of scope for this feature
|
||||||
|
|
||||||
|
- **Client (Godot) report/appeal UI** — no chat/social UI exists yet; report
|
||||||
|
endpoints are consumed once `social.md` US-6 lands. Client is a follow-up.
|
||||||
|
- Automated content scanning / hash detection (covered by M5 /
|
||||||
|
`content_moderation.md`).
|
||||||
|
- Third-party moderation/CSAM-scanning vendors.
|
||||||
|
- Rate limiting of report submission (Redis is available; add a token-bucket
|
||||||
|
dependency later if abuse is observed).
|
||||||
|
- Voice chat moderation.
|
||||||
|
- Per-jurisdiction legal-takedown workflows (DMCA etc.).
|
||||||
Reference in New Issue
Block a user