Compare commits

...

5 Commits

6 changed files with 142 additions and 4 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ from sqlalchemy.ext.asyncio import create_async_engine
from app.config import settings
from app.database import Base
from app.models import user, session, world, asset # noqa: F401
from app.models import user, session, world, asset, report, moderation_action, appeal # noqa: F401
# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
+4 -1
View File
@@ -2,5 +2,8 @@ from app.models.user import User
from app.models.session import Session
from app.models.world import World
from app.models.asset import Asset
from app.models.report import Report
from app.models.moderation_action import ModerationAction
from app.models.appeal import Appeal
__all__ = ["User", "Session", "World", "Asset"]
__all__ = ["User", "Session", "World", "Asset", "Report", "ModerationAction", "Appeal"]
+34
View File
@@ -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])
+35
View File
@@ -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")
+60
View File
@@ -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])
+8 -2
View File
@@ -1,7 +1,6 @@
from datetime import date
from typing import Optional
from sqlalchemy import Column, Integer, String, Boolean, DateTime, Date
from sqlalchemy import Boolean, Column, Date, DateTime, Enum, Integer, String
from sqlalchemy.orm import relationship
from sqlalchemy.sql import func
@@ -17,12 +16,19 @@ class User(Base):
hashed_password = Column(String(255), nullable=False)
date_of_birth = Column(Date, nullable=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())
updated_at = Column(DateTime(timezone=True), onupdate=func.now())
sessions = relationship("Session", back_populates="user", cascade="all, delete-orphan")
worlds = relationship("World", back_populates="owner")
assets = relationship("Asset", back_populates="owner")
appeals = relationship("Appeal", back_populates="user")
@property
def is_adult(self) -> bool: