Work on admin APIs

Author: aapeliv

app/backend/src/couchers/constants.py

@@ -129,3 +129,5 @@
 
 # How long a container must run uninterrupted before /status reports stable=true
 STABLE_THRESHOLD_SECONDS = 5 * 60
+
+MODERATION_AUTO_APPROVE_FLAG_PRIORITY = 1000

app/backend/src/couchers/i18n/admin_locales/en.json

@@ -1,5 +1,6 @@
 {
   "errors": {
+    "action_must_be_specified": "Action must be specified.",
     "blog_blurb_too_long": "The blog post blurb is too long.",
     "blog_title_too_long": "The blog post title is too long.",
     "cannot_edit_badge": "Admins cannot edit that badge.",
@@ -25,16 +26,21 @@
     "ota_package_not_found": "OTA package not found.",
     "parent_node_not_found": "Parent node not found.",
     "postcard_not_sent": "The postcard has not been sent yet.",
+    "queue_item_id_must_be_specified": "Queue item must be specified.",
+    "queue_item_not_found": "Queue item not found.",
     "reference_not_found": "Reference not found.",
     "tag_already_exists": "That admin tag already exists.",
     "tag_cant_be_empty": "The admin tag cannot be empty.",
     "tag_not_found": "Admin tag not found.",
+    "trigger_must_be_specified": "Trigger must be specified.",
+    "unsupported_action": "Unsupported action.",
     "user_already_has_admin_tag": "The user already has that admin tag.",
     "user_already_has_badge": "The user already has that badge.",
     "user_already_volunteer": "This user is already a volunteer.",
     "user_does_not_have_admin_tag": "The user does not have that admin tag.",
     "user_does_not_have_badge": "The user does not have that badge.",
     "user_not_in_the_moderation_user_list": "User is not in the moderation user list.",
+    "visibility_must_be_specified": "Visibility must be specified.",
     "volunteer_not_found": "Volunteer not found."
   }
 }

app/backend/src/couchers/i18n/locales/en.json

@@ -220,7 +220,6 @@
     "unrecognized_phone_number": "Your mobile phone number is not recognized. Please double-check it and contact support if this error persists.",
     "upload_not_found": "Upload not found.",
     "upload_not_found_or_not_owned": "Upload not found or you don't own it.",
-    "visibility_must_be_specified": "Visibility must be specified.",
     "user_already_admin": "That user is already an admin.",
     "user_already_blocked": "Target user has already been blocked.",
     "user_not_admin": "That user is not an admin.",

app/backend/src/couchers/jobs/handlers.py

@@ -38,6 +38,7 @@
     EVENT_REMINDER_TIMEDELTA,
     HOST_REQUEST_MAX_REMINDERS,
     HOST_REQUEST_REMINDER_INTERVAL,
+    MODERATION_AUTO_APPROVE_FLAG_PRIORITY,
 )
 from couchers.context import make_background_user_context, make_notification_user_context
 from couchers.crypto import (
@@ -1544,8 +1545,10 @@ def check_database_consistency(payload: empty_pb2.Empty) -> None:
 
 def auto_approve_moderation_queue(payload: empty_pb2.Empty) -> None:
     """
-    Dead man's switch: auto-approves unresolved INITIAL_REVIEW items older than the deadline.
-    Items explicitly actioned by moderators are left alone.
+    Dead man's switch: approves unresolved INITIAL_REVIEW content older than the deadline to VISIBLE, then
+    re-flags it as a high-priority MACHINE_FLAG superseding only the INITIAL_REVIEW item. The switch only fires
+    when moderators are behind, so every auto-approved item stays in the queue for a human to check. Other open
+    flags are untouched, and items already actioned by moderators are left alone.
     """
     deadline_seconds = config.MODERATION_AUTO_APPROVE_DEADLINE_SECONDS
     if deadline_seconds <= 0:
@@ -1578,13 +1581,27 @@ def auto_approve_moderation_queue(payload: empty_pb2.Empty) -> None:
             return
 
         logger.info(f"Auto-approving {len(approvable)} moderation queue items")
+        reason = f"Auto-approved: moderation deadline of {deadline_seconds} seconds exceeded."
         for item in approvable:
             Moderation().ModerateContent(
                 request=moderation_pb2.ModerateContentReq(
                     moderation_state_id=item.moderation_state_id,
                     action=moderation_pb2.MODERATION_ACTION_APPROVE,
                     visibility=moderation_pb2.MODERATION_VISIBILITY_VISIBLE,
-                    reason=f"Auto-approved: moderation deadline of {deadline_seconds} seconds exceeded.",
+                    reason=reason,
+                    clear_flags=False,
+                ),
+                context=ctx,
+                session=session,
+            )
+            Moderation().ModerateContent(
+                request=moderation_pb2.ModerateContentReq(
+                    moderation_state_id=item.moderation_state_id,
+                    action=moderation_pb2.MODERATION_ACTION_FLAG,
+                    trigger=moderation_pb2.MODERATION_TRIGGER_MACHINE_FLAG,
+                    priority=MODERATION_AUTO_APPROVE_FLAG_PRIORITY,
+                    reason=reason,
+                    supersede_queue_item_id=item.queue_item_id,
                 ),
                 context=ctx,
                 session=session,

app/backend/src/couchers/migrations/versions/0136_add_macroregion_to_nodetype.py

@@ -16,7 +16,8 @@
 
 
 def upgrade():
-    # ALTER TYPE ... ADD VALUE cannot run inside a transaction in PostgreSQL
+    # This COMMIT is redundant: ADD VALUE works fine inside a transaction; only *using* the new value before
+    # commit is disallowed, which this migration doesn't do. Kept as-is since it has already run.
     op.execute("COMMIT")
     op.execute("ALTER TYPE nodetype ADD VALUE IF NOT EXISTS 'macroregion' AFTER 'world'")
 

app/backend/src/couchers/migrations/versions/0144_add_bulk_set_visibility_to_moderationaction.py

@@ -16,7 +16,8 @@
 
 
 def upgrade() -> None:
-    # ALTER TYPE ... ADD VALUE cannot run inside a transaction in PostgreSQL
+    # This COMMIT is redundant: ADD VALUE works fine inside a transaction; only *using* the new value before
+    # commit is disallowed, which this migration doesn't do. Kept as-is since it has already run.
     op.execute("COMMIT")
     op.execute("ALTER TYPE moderationaction ADD VALUE IF NOT EXISTS 'bulk_set_visibility'")
 

app/backend/src/couchers/migrations/versions/0168_moderation_priority.py

@@ -0,0 +1,43 @@
+"""Add priority to moderation queue items and flag references to the moderation log
+
+Revision ID: 0168
+Revises: 0167
+Create Date: 2026-06-14 00:00:00.000000
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "0168"
+down_revision = "0167"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "moderation_queue",
+        sa.Column("priority", sa.Integer(), server_default="0", nullable=False),
+    )
+    op.add_column("moderation_log", sa.Column("new_priority", sa.Integer(), nullable=True))
+    op.add_column("moderation_log", sa.Column("queue_item_id", sa.BigInteger(), nullable=True))
+    op.create_index(op.f("ix_moderation_log_queue_item_id"), "moderation_log", ["queue_item_id"], unique=False)
+    op.create_foreign_key(
+        op.f("fk_moderation_log_queue_item_id_moderation_queue"),
+        "moderation_log",
+        "moderation_queue",
+        ["queue_item_id"],
+        ["id"],
+    )
+
+    op.execute("ALTER TYPE moderationaction ADD VALUE IF NOT EXISTS 'set_priority'")
+
+
+def downgrade() -> None:
+    op.drop_constraint(op.f("fk_moderation_log_queue_item_id_moderation_queue"), "moderation_log", type_="foreignkey")
+    op.drop_index(op.f("ix_moderation_log_queue_item_id"), table_name="moderation_log")
+    op.drop_column("moderation_log", "queue_item_id")
+    op.drop_column("moderation_log", "new_priority")
+    op.drop_column("moderation_queue", "priority")

app/backend/src/couchers/models/moderation.py

@@ -11,7 +11,7 @@
 from functools import cache
 from typing import TYPE_CHECKING, Protocol
 
-from sqlalchemy import BigInteger, ColumnElement, DateTime, Enum, ForeignKey, Index, String, func
+from sqlalchemy import BigInteger, ColumnElement, DateTime, Enum, ForeignKey, Index, Integer, String, func
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from couchers.models.base import Base, moderation_seq
@@ -57,6 +57,8 @@ class ModerationAction(enum.Enum):
     flag = enum.auto()
     # Remove flag
     unflag = enum.auto()
+    # Change a flag's priority
+    set_priority = enum.auto()
     # Bulk visibility change applied to every item authored by a user
     bulk_set_visibility = enum.auto()
 
@@ -131,6 +133,8 @@ class ModerationQueueItem(Base, kw_only=True):
     trigger: Mapped[ModerationTrigger] = mapped_column(Enum(ModerationTrigger))
     reason: Mapped[str] = mapped_column(String)
 
+    priority: Mapped[int] = mapped_column(Integer, nullable=False, server_default="0", default=0)
+
     # When resolved, this links to the log entry that resolved it
     resolved_by_log_id: Mapped[int | None] = mapped_column(ForeignKey("moderation_log.id"), index=True, default=None)
 
@@ -174,6 +178,10 @@ class ModerationLog(Base, kw_only=True):
 
     # State changes (nullable - only include fields that changed)
     new_visibility: Mapped[ModerationVisibility | None] = mapped_column(Enum(ModerationVisibility), default=None)
+    new_priority: Mapped[int | None] = mapped_column(Integer, default=None)
+
+    # The queue item (flag) this action concerned, for flag-level actions
+    queue_item_id: Mapped[int | None] = mapped_column(ForeignKey("moderation_queue.id"), index=True, default=None)
 
     # Explanation for the action
     reason: Mapped[str] = mapped_column(String)