Skip to content

[Promote] NSFW/TOS media moderation: analysis pipeline, protected tags, blur shield, admin review (#308) - #337

Merged
lopugit merged 5 commits into
mainfrom
promote/pr-308-nsfw-tos-media-moderation-58c301--to-main
Aug 21, 2026
Merged

[Promote] NSFW/TOS media moderation: analysis pipeline, protected tags, blur shield, admin review (#308)#337
lopugit merged 5 commits into
mainfrom
promote/pr-308-nsfw-tos-media-moderation-58c301--to-main

Conversation

@lopugit

@lopugit lopugit commented Aug 21, 2026

Copy link
Copy Markdown
Owner

Automated promotion of #308 from develop to main, opened by the Promote features to main workflow for release review.

Source

Source PR #308 — NSFW/TOS media moderation: analysis pipeline, protected tags, blur shield, admin review
Author @lopugit
Merged into develop 2026-08-21T03:12:22Z
Merge commit 14ee574541589797b9a85d93ddd675b5b00cbe05
Head branch claude/nsfw-tos-media-moderation-58c301

How to review

  • This PR re-applies the source PR's exact changes onto main
    (git cherry-pick -x; each commit message references the original SHA).
  • Merge it normally to release the change to main
    the Sync main into develop workflow keeps develop aligned afterwards.
  • Close it (without merging) to keep the change out of main;
    the workflow never recreates a closed promotion (reopen it to change your mind).
  • Prefer shipping everything at once? Merge the standing omnibus
    Promote develop to main PR instead — this PR's diff then becomes
    empty and the workflow closes it automatically.

Automatic conflict-resolution review

  • The exact source patch conflicted with main, so the trusted AI
    promotion resolver produced this branch automatically instead of leaving manual commands.
  • Its write scope was limited to non-Graphify paths already changed by the source PR;
    Graphify output was handled as derived data, and unresolved conflict markers were rejected.
  • A github-actions[bot] comment on source PR NSFW/TOS media moderation: analysis pipeline, protected tags, blur shield, admin review #308 attests the exact
    base, source endpoints, reservation commit, final head, plan hash, and resolver run.
  • Please review the resolved diff before merging; no manual branch repair is required.

🤖 Generated by the promote-features-to-main workflow.

Thingtime-Promotion-Reservation: v1
Thingtime-Promotion-Source-PR: 308
Thingtime-Promotion-Base-Ref: main
Thingtime-Promotion-Base-SHA: 52c2d49
Thingtime-Promotion-Branch: promote/pr-308-nsfw-tos-media-moderation-58c301--to-main
Thingtime-Promotion-Source-Start-SHA: 58f6f2e
Thingtime-Promotion-Source-End-SHA: 14ee574
Thingtime-Promotion-Source-Lineage: verified
Thingtime-Promotion-Plan-Hash: 822b4f3b3c822f1c048e0c7c664d575714804e604eab285072528ab7acf64f7e
Thingtime-Promotion-Source-PR: 308

Thingtime-Promotion-Base-Ref: main

Thingtime-Promotion-Base-SHA: 52c2d49

Thingtime-Promotion-Branch: promote/pr-308-nsfw-tos-media-moderation-58c301--to-main

Thingtime-Promotion-Source-Tip-SHA: 14ee574

Thingtime-Promotion-Source-Start-SHA: 58f6f2e

Thingtime-Promotion-Source-End-SHA: 14ee574

Thingtime-Promotion-Source-Lineage: verified

Thingtime-Promotion-Plan-Hash: 822b4f3b3c822f1c048e0c7c664d575714804e604eab285072528ab7acf64f7e

Thingtime-Promotion-Patch-ID: 9a0cc804af2d8e58825628542553a6eaf6e5747d

Resolved by the promotion worker: https://github.com/lopugit/thingtime/actions/runs/32442768543
graphify extract with semantic claude-cli backend; unchanged content reused the tracked cache

Thingtime-Promotion-Plan-Hash: 822b4f3b3c822f1c048e0c7c664d575714804e604eab285072528ab7acf64f7e

Refreshed by the promotion conflict worker: https://github.com/lopugit/thingtime/actions/runs/32442768543
@vercel

vercel Bot commented Aug 21, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
thingtime Ready Ready Preview Aug 21, 2026 4:09am

Request Review

@github-actions github-actions Bot added promotion Automated develop → main promotion PR ai-conflict-resolved Promotion conflict resolved by the isolated AI worker review-ai-resolution Review the AI-resolved promotion conflict paths labels Aug 21, 2026
@github-actions

Copy link
Copy Markdown
Contributor

🤖 Automatic promotion conflict resolution completed.

Source PR: #308 · plan: 822b4f3b3c822f1c048e0c7c664d575714804e604eab285072528ab7acf64f7e · workflow run

Base: main at 52c2d49938144988828e70ac36701600305ac824 · reservation: 29ac004474901999b401046065e5c993d77467ec · verified head: 76267907ad6817b7671187a277739fd2a53b2184.

Please manually review the paths the isolated AI resolved:

  • remix/CHANGELOG.md
  • remix/app/api/utils/attachments/attachmentCore.ts
  • remix/app/api/utils/attachments/attachmentStore.ts
  • remix/app/api/utils/messenger/messenger.ts
  • remix/app/api/utils/things/things.ts
  • remix/app/components/Attachments/PostAttachments.tsx
  • remix/app/components/Attachments/attachmentTypes.ts
  • remix/app/components/Attachments/attachmentUiCore.ts

Model waterfall: --model claude-opus-5 --fallback-model claude-fable-5,default · Graphify refresh: true (semantic: claude-cli).

@lopugit

lopugit commented Aug 21, 2026

Copy link
Copy Markdown
Owner Author

Manual conflict-resolution review completed for all eight AI-resolved paths.

The resolver workflow's terminal failure was an HTTP 502 from PR creation after the branch had already been safely published; PR #337 and its immutable review metadata exist.

@lopugit

lopugit commented Aug 21, 2026

Copy link
Copy Markdown
Owner Author

Additional exact-tree verification: started the isolated worktree stack on its deterministic 18880/18882 ports, confirmed one stable PM2 entry and listeners, then ran the canonical live API suite: 431/431 passed. The temporary PM2 entry was removed afterward and all three listeners are closed.

github-actions Bot added a commit that referenced this pull request Aug 21, 2026
…peline, protected tags, blur shield, admin review (#308)

# Conflicts:
#	graphify-out/cache/semantic/a0f10b45212c2643c917726af62add4389f99df5abdfa36a7782077bd1fa562c.json
@lopugit
lopugit merged commit 2bdfef6 into main Aug 21, 2026
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ai-conflict-resolved Promotion conflict resolved by the isolated AI worker promotion Automated develop → main promotion PR review-ai-resolution Review the AI-resolved promotion conflict paths

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant