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 # 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.
|
||||||
|
|||||||
@@ -2,5 +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.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"]
|
||||||
|
|||||||
@@ -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])
|
||||||
@@ -3,10 +3,6 @@ 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
|
||||||
import enum
|
import enum
|
||||||
import json
|
|
||||||
from typing import Optional, List
|
|
||||||
|
|
||||||
from pydantic import BaseModel as PydanticBaseModel
|
|
||||||
|
|
||||||
from app.database import Base
|
from app.database import Base
|
||||||
|
|
||||||
@@ -42,31 +38,3 @@ class Asset(Base):
|
|||||||
|
|
||||||
owner = relationship("User", back_populates="assets")
|
owner = relationship("User", back_populates="assets")
|
||||||
world = relationship("World", back_populates="assets")
|
world = relationship("World", back_populates="assets")
|
||||||
|
|
||||||
|
|
||||||
class GLTFMetadata(PydanticBaseModel):
|
|
||||||
"""Pydantic schema for glTF asset metadata."""
|
|
||||||
mesh_count: Optional[int] = None
|
|
||||||
vertex_count: Optional[int] = None
|
|
||||||
has_animation: bool = False
|
|
||||||
texture_refs: Optional[List[str]] = None
|
|
||||||
tags: Optional[List[str]] = None
|
|
||||||
|
|
||||||
model_config = {"from_attributes": True}
|
|
||||||
|
|
||||||
|
|
||||||
def parse_metadata_json(metadata_text: Optional[str]) -> dict:
|
|
||||||
"""Parse the metadata_json text field into a dict, handling None gracefully."""
|
|
||||||
if not metadata_text:
|
|
||||||
return {}
|
|
||||||
try:
|
|
||||||
return json.loads(metadata_text)
|
|
||||||
except (json.JSONDecodeError, TypeError):
|
|
||||||
return {}
|
|
||||||
|
|
||||||
|
|
||||||
def serialize_metadata(metadata: dict) -> Optional[str]:
|
|
||||||
"""Serialize metadata dict to JSON string for storage."""
|
|
||||||
if not metadata:
|
|
||||||
return None
|
|
||||||
return json.dumps(metadata)
|
|
||||||
|
|||||||
@@ -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,7 +1,6 @@
|
|||||||
from datetime import date
|
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.orm import relationship
|
||||||
from sqlalchemy.sql import func
|
from sqlalchemy.sql import func
|
||||||
|
|
||||||
@@ -17,12 +16,19 @@ 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:
|
||||||
|
|||||||
Reference in New Issue
Block a user