Recovered orphaned WIP before switching to a new task
This commit is contained in:
@@ -0,0 +1,63 @@
|
||||
"""ModerationAction model for Trust & Safety."""
|
||||
|
||||
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
|
||||
import enum
|
||||
|
||||
from app.database import Base
|
||||
|
||||
|
||||
class ModerationActionType(str, enum.Enum):
|
||||
WARN = "warn"
|
||||
SUSPEND = "suspend"
|
||||
BAN = "ban"
|
||||
RESTRICT = "restrict"
|
||||
REMOVE = "remove"
|
||||
RESTORE = "restore"
|
||||
|
||||
|
||||
class ModerationTargetType(str, enum.Enum):
|
||||
USER = "user"
|
||||
WORLD = "world"
|
||||
ASSET = "asset"
|
||||
CHAT_MESSAGE = "chat_message"
|
||||
|
||||
|
||||
class ModerationAction(Base):
|
||||
__tablename__ = "moderation_actions"
|
||||
|
||||
id = Column(Integer, primary_key=True, autoincrement=True)
|
||||
moderator_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
|
||||
target_user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=True)
|
||||
target_type = Column(
|
||||
ENUM(ModerationTargetType, name="moderation_target_type", create_type=False),
|
||||
nullable=False,
|
||||
)
|
||||
target_id = Column(String(64), nullable=True)
|
||||
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", foreign_keys=[report_id])
|
||||
appeals = relationship("Appeal", back_populates="moderation_action", cascade="all, delete-orphan")
|
||||
@@ -1,13 +1,20 @@
|
||||
from datetime import date
|
||||
from typing import Optional
|
||||
|
||||
from sqlalchemy import Column, Integer, String, Boolean, DateTime, Date
|
||||
from sqlalchemy import Column, Integer, String, Boolean, DateTime, Date, Enum
|
||||
from sqlalchemy.orm import relationship
|
||||
from sqlalchemy.sql import func
|
||||
import enum
|
||||
|
||||
from app.database import Base
|
||||
|
||||
|
||||
class UserRole(str, enum.Enum):
|
||||
USER = "user"
|
||||
MODERATOR = "moderator"
|
||||
ADMIN = "admin"
|
||||
|
||||
|
||||
class User(Base):
|
||||
__tablename__ = "users"
|
||||
|
||||
@@ -17,12 +24,24 @@ 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(UserRole, name="user_role"),
|
||||
nullable=False,
|
||||
server_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")
|
||||
reports_made = relationship("Report", foreign_keys="Report.reporter_id", back_populates="reporter")
|
||||
reports_resolved = relationship("Report", foreign_keys="Report.resolved_by", back_populates="resolved_by_user")
|
||||
moderation_actions_as_moderator = relationship("ModerationAction", foreign_keys="ModerationAction.moderator_id", back_populates="moderator")
|
||||
moderation_actions_as_target = relationship("ModerationAction", foreign_keys="ModerationAction.target_user_id", back_populates="target_user")
|
||||
appeals = relationship("Appeal", foreign_keys="Appeal.user_id", back_populates="user")
|
||||
|
||||
@property
|
||||
def is_adult(self) -> bool:
|
||||
|
||||
Reference in New Issue
Block a user