Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6fa65d4820 | |||
| f7f9f06aed | |||
| c3f94cee70 | |||
| 4cef9415ac |
@@ -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, report, moderation_action, appeal # noqa: F401
|
from app.models import user, session, world, asset, world_visit # 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.
|
||||||
|
|||||||
@@ -0,0 +1,104 @@
|
|||||||
|
"""add discovery metadata to worlds and create world_visits
|
||||||
|
|
||||||
|
Revision ID: 0003_add_discovery_metadata
|
||||||
|
Revises: 0002_add_date_of_birth_to_users
|
||||||
|
Create Date: 2025-01-02 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_discovery_metadata"
|
||||||
|
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:
|
||||||
|
"""Add discovery metadata columns to worlds and create world_visits."""
|
||||||
|
# Add discovery metadata columns to worlds.
|
||||||
|
op.add_column(
|
||||||
|
"worlds",
|
||||||
|
sa.Column("category", sa.String(length=100), nullable=True),
|
||||||
|
)
|
||||||
|
op.add_column(
|
||||||
|
"worlds",
|
||||||
|
sa.Column(
|
||||||
|
"tags",
|
||||||
|
postgresql.ARRAY(sa.String()),
|
||||||
|
nullable=True,
|
||||||
|
server_default="{}",
|
||||||
|
),
|
||||||
|
)
|
||||||
|
op.add_column(
|
||||||
|
"worlds",
|
||||||
|
sa.Column("play_count", sa.Integer(), nullable=False, server_default="0"),
|
||||||
|
)
|
||||||
|
op.add_column(
|
||||||
|
"worlds",
|
||||||
|
sa.Column("last_played_at", sa.DateTime(timezone=True), nullable=True),
|
||||||
|
)
|
||||||
|
|
||||||
|
# B-tree index on category, GIN index on tags.
|
||||||
|
op.create_index(
|
||||||
|
"ix_worlds_category",
|
||||||
|
"worlds",
|
||||||
|
["category"],
|
||||||
|
unique=False,
|
||||||
|
)
|
||||||
|
op.create_index(
|
||||||
|
"ix_worlds_tags",
|
||||||
|
"worlds",
|
||||||
|
["tags"],
|
||||||
|
unique=False,
|
||||||
|
postgresql_using="gin",
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create world_visits table.
|
||||||
|
op.create_table(
|
||||||
|
"world_visits",
|
||||||
|
sa.Column("id", sa.Integer(), primary_key=True),
|
||||||
|
sa.Column("world_id", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("user_id", sa.Integer(), nullable=True),
|
||||||
|
sa.Column("anonymous_token", sa.String(length=255), nullable=True),
|
||||||
|
sa.Column(
|
||||||
|
"visited_at",
|
||||||
|
sa.DateTime(timezone=True),
|
||||||
|
server_default=sa.func.now(),
|
||||||
|
),
|
||||||
|
sa.ForeignKeyConstraint(
|
||||||
|
["world_id"], ["worlds.id"], ondelete="CASCADE"
|
||||||
|
),
|
||||||
|
sa.ForeignKeyConstraint(
|
||||||
|
["user_id"], ["users.id"], ondelete="CASCADE"
|
||||||
|
),
|
||||||
|
)
|
||||||
|
op.create_index(
|
||||||
|
op.f("ix_world_visits_id"), "world_visits", ["id"], unique=False
|
||||||
|
)
|
||||||
|
op.create_index(
|
||||||
|
"ix_world_visits_world_id_visited_at",
|
||||||
|
"world_visits",
|
||||||
|
["world_id", "visited_at"],
|
||||||
|
unique=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Drop world_visits and discovery metadata columns from worlds."""
|
||||||
|
op.drop_index(
|
||||||
|
"ix_world_visits_world_id_visited_at", table_name="world_visits"
|
||||||
|
)
|
||||||
|
op.drop_index(op.f("ix_world_visits_id"), table_name="world_visits")
|
||||||
|
op.drop_table("world_visits")
|
||||||
|
|
||||||
|
op.drop_index("ix_worlds_tags", table_name="worlds")
|
||||||
|
op.drop_index("ix_worlds_category", table_name="worlds")
|
||||||
|
op.drop_column("worlds", "last_played_at")
|
||||||
|
op.drop_column("worlds", "play_count")
|
||||||
|
op.drop_column("worlds", "tags")
|
||||||
|
op.drop_column("worlds", "category")
|
||||||
@@ -2,8 +2,6 @@ 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.report import Report
|
from app.models.world_visit import WorldVisit
|
||||||
from app.models.moderation_action import ModerationAction
|
|
||||||
from app.models.appeal import Appeal
|
|
||||||
|
|
||||||
__all__ = ["User", "Session", "World", "Asset", "Report", "ModerationAction", "Appeal"]
|
__all__ = ["User", "Session", "World", "Asset", "WorldVisit"]
|
||||||
|
|||||||
@@ -1,34 +0,0 @@
|
|||||||
"""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,35 +0,0 @@
|
|||||||
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")
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
"""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,6 +1,7 @@
|
|||||||
from datetime import date
|
from datetime import date
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
from sqlalchemy import Boolean, Column, Date, DateTime, Enum, Integer, String
|
from sqlalchemy import Column, Integer, String, Boolean, DateTime, Date
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
from sqlalchemy.sql import func
|
from sqlalchemy.sql import func
|
||||||
|
|
||||||
@@ -16,19 +17,12 @@ 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("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)
|
|
||||||
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())
|
||||||
|
|
||||||
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:
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
from sqlalchemy import Column, Integer, String, Text, DateTime, ForeignKey
|
from sqlalchemy import Column, Integer, String, Text, DateTime, ForeignKey, ARRAY, Index
|
||||||
from sqlalchemy.dialects.postgresql import ENUM
|
from sqlalchemy.dialects.postgresql import ENUM
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
from sqlalchemy.sql import func
|
from sqlalchemy.sql import func
|
||||||
@@ -27,5 +27,17 @@ class World(Base):
|
|||||||
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())
|
||||||
|
|
||||||
|
# Discovery metadata
|
||||||
|
category = Column(String(100), nullable=True, index=True)
|
||||||
|
tags = Column(ARRAY(String), nullable=True, server_default="{}")
|
||||||
|
play_count = Column(Integer, nullable=False, server_default="0")
|
||||||
|
last_played_at = Column(DateTime(timezone=True), nullable=True)
|
||||||
|
|
||||||
|
# GIN index on tags for efficient tag-based queries
|
||||||
|
__table_args__ = (
|
||||||
|
Index("ix_worlds_tags", "tags", postgresql_using="gin"),
|
||||||
|
)
|
||||||
|
|
||||||
owner = relationship("User", back_populates="worlds")
|
owner = relationship("User", back_populates="worlds")
|
||||||
assets = relationship("Asset", back_populates="world", cascade="all, delete-orphan")
|
assets = relationship("Asset", back_populates="world", cascade="all, delete-orphan")
|
||||||
|
visits = relationship("WorldVisit", back_populates="world", cascade="all, delete-orphan")
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
from sqlalchemy import Column, DateTime, ForeignKey, Index, Integer, String
|
||||||
|
from sqlalchemy.orm import relationship
|
||||||
|
from sqlalchemy.sql import func
|
||||||
|
|
||||||
|
from app.database import Base
|
||||||
|
|
||||||
|
|
||||||
|
class WorldVisit(Base):
|
||||||
|
__tablename__ = "world_visits"
|
||||||
|
|
||||||
|
id = Column(Integer, primary_key=True, index=True)
|
||||||
|
world_id = Column(
|
||||||
|
Integer, ForeignKey("worlds.id", ondelete="CASCADE"), nullable=False
|
||||||
|
)
|
||||||
|
user_id = Column(
|
||||||
|
Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=True
|
||||||
|
)
|
||||||
|
anonymous_token = Column(String(255), nullable=True)
|
||||||
|
visited_at = Column(DateTime(timezone=True), server_default=func.now())
|
||||||
|
|
||||||
|
__table_args__ = (
|
||||||
|
Index("ix_world_visits_world_id_visited_at", "world_id", "visited_at"),
|
||||||
|
)
|
||||||
|
|
||||||
|
world = relationship("World", back_populates="visits")
|
||||||
|
user = relationship("User")
|
||||||
Reference in New Issue
Block a user