@atproto/api 0.5.2 → 0.5.3

package/definitions/post-moderation-behaviors.json

@@ -676,7 +676,7 @@
       "author": "self",
       "labels": {"post": ["!hide"]},
       "behaviors": {
-        "content": {"cause": "label:!hide", "alert": true}
+        "content": {"cause": "label:!hide", "blur": true}
       }
     },
     "Self-post: Imperative label ('!hide') on author profile": {
@@ -700,7 +700,7 @@
       "quoteAuthor": "self",
       "labels": {"quotedPost": ["!hide"]},
       "behaviors": {
-        "embed": {"cause": "label:!hide", "alert": true}
+        "embed": {"cause": "label:!hide", "blur": true}
       }
     },
     "Self-post: Imperative label ('!hide') on quoted author account": {
@@ -712,6 +712,138 @@
       "behaviors": {}
     },
 
+    "Self-post: Imperative label ('!warn') on post": {
+      "cfg": "none",
+      "subject": "post",
+      "author": "self",
+      "labels": {"post": ["!warn"]},
+      "behaviors": {
+        "content": {"cause": "label:!warn", "blur": true}
+      }
+    },
+    "Self-post: Imperative label ('!warn') on author profile": {
+      "cfg": "none",
+      "subject": "post",
+      "author": "self",
+      "labels": {"profile": ["!warn"]},
+      "behaviors": {}
+    },
+    "Self-post: Imperative label ('!warn') on author account": {
+      "cfg": "none",
+      "subject": "post",
+      "author": "self",
+      "labels": {"account": ["!warn"]},
+      "behaviors": {}
+    },
+    "Self-post: Imperative label ('!warn') on quoted post": {
+      "cfg": "none",
+      "subject": "post",
+      "author": "self",
+      "quoteAuthor": "self",
+      "labels": {"quotedPost": ["!warn"]},
+      "behaviors": {
+        "embed": {"cause": "label:!warn", "blur": true}
+      }
+    },
+    "Self-post: Imperative label ('!warn') on quoted author account": {
+      "cfg": "none",
+      "subject": "post",
+      "author": "self",
+      "quoteAuthor": "self",
+      "labels": {"quotedAccount": ["!warn"]},
+      "behaviors": {}
+    },
+
+    "Self-post: Blur-media label ('porn') on post (hide)": {
+      "cfg": "porn-hide",
+      "subject": "post",
+      "author": "self",
+      "labels": {"post": ["porn"]},
+      "behaviors": {
+        "embed": {"cause": "label:porn", "blur": true}
+      }
+    },
+    "Self-post: Blur-media label ('porn') on author profile (hide)": {
+      "cfg": "porn-hide",
+      "subject": "post",
+      "author": "self",
+      "labels": {"profile": ["porn"]},
+      "behaviors": {
+      }
+    },
+    "Self-post: Blur-media label ('porn') on author account (hide)": {
+      "cfg": "porn-hide",
+      "subject": "post",
+      "author": "self",
+      "labels": {"account": ["porn"]},
+      "behaviors": {
+      }
+    },
+    "Self-post: Blur-media label ('porn') on quoted post (hide)": {
+      "cfg": "porn-hide",
+      "subject": "post",
+      "author": "self",
+      "quoteAuthor": "self",
+      "labels": {"quotedPost": ["porn"]},
+      "behaviors": {
+        "embed": {"cause": "label:porn", "blur": true}
+      }
+    },
+    "Self-post: Blur-media label ('porn') on quoted author account (hide)": {
+      "cfg": "porn-hide",
+      "subject": "post",
+      "author": "self",
+      "quoteAuthor": "self",
+      "labels": {"quotedAccount": ["porn"]},
+      "behaviors": {
+      }
+    },
+
+    "Self-post: Blur-media label ('porn') on post (warn)": {
+      "cfg": "porn-warn",
+      "subject": "post",
+      "author": "self",
+      "labels": {"post": ["porn"]},
+      "behaviors": {
+        "embed": {"cause": "label:porn", "blur": true}
+      }
+    },
+    "Self-post: Blur-media label ('porn') on author profile (warn)": {
+      "cfg": "porn-warn",
+      "subject": "post",
+      "author": "self",
+      "labels": {"profile": ["porn"]},
+      "behaviors": {
+      }
+    },
+    "Self-post: Blur-media label ('porn') on author account (warn)": {
+      "cfg": "porn-warn",
+      "subject": "post",
+      "author": "self",
+      "labels": {"account": ["porn"]},
+      "behaviors": {
+      }
+    },
+    "Self-post: Blur-media label ('porn') on quoted post (warn)": {
+      "cfg": "porn-warn",
+      "subject": "post",
+      "author": "self",
+      "quoteAuthor": "self",
+      "labels": {"quotedPost": ["porn"]},
+      "behaviors": {
+        "embed": {"cause": "label:porn", "blur": true}
+      }
+    },
+    "Self-post: Blur-media label ('porn') on quoted author account (warn)": {
+      "cfg": "porn-warn",
+      "subject": "post",
+      "author": "self",
+      "quoteAuthor": "self",
+      "labels": {"quotedAccount": ["porn"]},
+      "behaviors": {
+      }
+    },
+
     "Post with blocked author": {
       "cfg": "none",
       "subject": "post",

package/docs/moderation-behaviors/posts.md

@@ -1463,8 +1463,8 @@ Key:
 
 </td>
 <td>
+✋
 
-🪧
 </td>
 <td>
 
@@ -1537,8 +1537,8 @@ Key:
 
 </td>
 <td>
+✋
 
-🪧
 </td>
 </tr>
 
@@ -1566,6 +1566,336 @@ Key:
 
 
 
+
+<tr>
+<td><strong>Self-post: Imperative label ('!warn') on post</strong></td>
+<td>
+
+</td>
+<td>
+✋
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+</tr>
+
+
+
+
+<tr>
+<td><strong>Self-post: Imperative label ('!warn') on author profile</strong></td>
+<td>
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+</tr>
+
+
+
+
+<tr>
+<td><strong>Self-post: Imperative label ('!warn') on author account</strong></td>
+<td>
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+</tr>
+
+
+
+
+<tr>
+<td><strong>Self-post: Imperative label ('!warn') on quoted post</strong></td>
+<td>
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+<td>
+✋
+
+</td>
+</tr>
+
+
+
+
+<tr>
+<td><strong>Self-post: Imperative label ('!warn') on quoted author account</strong></td>
+<td>
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+</tr>
+
+
+
+
+<tr>
+<td><strong>Self-post: Blur-media label ('porn') on post (hide)</strong></td>
+<td>
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+<td>
+✋
+
+</td>
+</tr>
+
+
+
+
+<tr>
+<td><strong>Self-post: Blur-media label ('porn') on author profile (hide)</strong></td>
+<td>
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+</tr>
+
+
+
+
+<tr>
+<td><strong>Self-post: Blur-media label ('porn') on author account (hide)</strong></td>
+<td>
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+</tr>
+
+
+
+
+<tr>
+<td><strong>Self-post: Blur-media label ('porn') on quoted post (hide)</strong></td>
+<td>
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+<td>
+✋
+
+</td>
+</tr>
+
+
+
+
+<tr>
+<td><strong>Self-post: Blur-media label ('porn') on quoted author account (hide)</strong></td>
+<td>
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+</tr>
+
+
+
+
+<tr>
+<td><strong>Self-post: Blur-media label ('porn') on post (warn)</strong></td>
+<td>
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+<td>
+✋
+
+</td>
+</tr>
+
+
+
+
+<tr>
+<td><strong>Self-post: Blur-media label ('porn') on author profile (warn)</strong></td>
+<td>
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+</tr>
+
+
+
+
+<tr>
+<td><strong>Self-post: Blur-media label ('porn') on author account (warn)</strong></td>
+<td>
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+</tr>
+
+
+
+
+<tr>
+<td><strong>Self-post: Blur-media label ('porn') on quoted post (warn)</strong></td>
+<td>
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+<td>
+✋
+
+</td>
+</tr>
+
+
+
+
+<tr>
+<td><strong>Self-post: Blur-media label ('porn') on quoted author account (warn)</strong></td>
+<td>
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+<td>
+
+
+</td>
+</tr>
+
+
+
 <tr><th>Scenario</th><th>Filter</th><th>Content</th><th>Avatar</th><th>Embed</th></tr>
 <tr>
 <td><strong>Post with blocked author</strong></td>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "main": "dist/index.js",
   "scripts": {
     "codegen": "yarn docgen && node ./scripts/generate-code.mjs && lex gen-api ./src/client ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/*",

package/src/moderation/index.ts

@@ -61,10 +61,10 @@ export function moderateProfile(
 
   // downgrade based on authorship
   if (!isModerationDecisionNoop(account) && account.did === opts.userDid) {
-    downgradeDecision(account, { alert: true })
+    downgradeDecision(account, 'alert')
   }
   if (!isModerationDecisionNoop(profile) && profile.did === opts.userDid) {
-    downgradeDecision(profile, { alert: true })
+    downgradeDecision(profile, 'alert')
   }
 
   // derive avatar blurring from account & profile, but override for mutes because that shouldnt blur
@@ -154,23 +154,23 @@ export function moderatePost(
 
   // downgrade based on authorship
   if (!isModerationDecisionNoop(post) && post.did === opts.userDid) {
-    downgradeDecision(post, { alert: true })
+    downgradeDecision(post, 'blur')
   }
-  if (!isModerationDecisionNoop(account) && account.did === opts.userDid) {
-    downgradeDecision(account, { alert: false })
+  if (account.cause && account.did === opts.userDid) {
+    downgradeDecision(account, 'noop')
   }
-  if (!isModerationDecisionNoop(profile) && profile.did === opts.userDid) {
-    downgradeDecision(profile, { alert: false })
+  if (profile.cause && profile.did === opts.userDid) {
+    downgradeDecision(profile, 'noop')
   }
   if (quote && !isModerationDecisionNoop(quote) && quote.did === opts.userDid) {
-    downgradeDecision(quote, { alert: true })
+    downgradeDecision(quote, 'blur')
   }
   if (
     quotedAccount &&
     !isModerationDecisionNoop(quotedAccount) &&
     quotedAccount.did === opts.userDid
   ) {
-    downgradeDecision(quotedAccount, { alert: false })
+    downgradeDecision(quotedAccount, 'noop')
   }
 
   // derive filtering from feeds from the post, post author's account,

package/src/moderation/util.ts

@@ -34,15 +34,19 @@ export function takeHighestPriorityDecision(
 
 export function downgradeDecision(
   decision: ModerationDecision,
-  { alert }: { alert: boolean },
+  to: 'blur' | 'alert' | 'noop',
 ) {
-  decision.blur = false
-  decision.blurMedia = false
   decision.filter = false
   decision.noOverride = false
-  decision.alert = alert
-  if (!alert) {
+  if (to === 'noop') {
+    decision.blur = false
+    decision.blurMedia = false
+    decision.alert = false
     delete decision.cause
+  } else if (to === 'alert') {
+    decision.blur = false
+    decision.blurMedia = false
+    decision.alert = true
   }
 }