@atproto/api 0.5.1 → 0.5.3

package/dist/mixins/bsky.d.ts

@@ -0,0 +1,23 @@
+import { AtpAgentType } from '../types';
+export declare function addBsky<TBase extends AtpAgentType>(Base: TBase): {
+    new (...args: any[]): {
+        like(uri: string, cid: string): Promise<{
+            uri: string;
+            cid: string;
+        }>;
+        unlike(likeUri: string): Promise<void>;
+        repost(uri: string, cid: string): Promise<{
+            uri: string;
+            cid: string;
+        }>;
+        unrepost(repostUri: string): Promise<void>;
+        follow(subjectDid: string): Promise<{
+            uri: string;
+            cid: string;
+        }>;
+        unfollow(followUri: string): Promise<void>;
+        service: URL;
+        api: import("..").AtpServiceClient;
+        session?: import("../types").AtpSessionData | undefined;
+    };
+} & TBase;

package/dist/rich-text/sanitize.d.ts

@@ -0,0 +1,4 @@
+import { RichText } from './rich-text';
+export declare function sanitizeRichText(richText: RichText, opts: {
+    cleanNewlines?: boolean;
+}): RichText;

package/docs/labels.md

@@ -355,24 +355,24 @@
   <td>porn</td>
   <td>
     <code>general</code><br><strong>Pornography</strong><br>Images of full-frontal nudity (genitalia) in any sexualized context, or explicit sexual activity (meaning contact with genitalia or breasts) even if partially covered. Includes graphic sexual cartoons (often jokes/memes).<br><br>
-    <code>on an account</code><br><strong>Pornography</strong><br>This account contains imagery of full-frontal nudity or explicit sexual activity.<br><br>
-    <code>on content</code><br><strong>Pornography</strong><br>This content contains imagery of full-frontal nudity or explicit sexual activity.<br><br>
+    <code>on an account</code><br><strong>Adult Content</strong><br>This account contains imagery of full-frontal nudity or explicit sexual activity.<br><br>
+    <code>on content</code><br><strong>Adult Content</strong><br>This content contains imagery of full-frontal nudity or explicit sexual activity.<br><br>
   </td>
 </tr>
 <tr>
   <td>sexual</td>
   <td>
     <code>general</code><br><strong>Sexually Suggestive</strong><br>Content that does not meet the level of "pornography", but is still sexual. Some common examples have been selfies and "hornyposting" with underwear on, or partially naked (naked but covered, eg with hands or from side perspective). Sheer/see-through nipples may end up in this category.<br><br>
-    <code>on an account</code><br><strong>Sexually Suggestive</strong><br>This account contains imagery which is sexually suggestive. Common examples include selfies in underwear or in partial undress.<br><br>
-    <code>on content</code><br><strong>Sexually Suggestive</strong><br>This content contains imagery which is sexually suggestive. Common examples include selfies in underwear or in partial undress.<br><br>
+    <code>on an account</code><br><strong>Suggestive Content</strong><br>This account contains imagery which is sexually suggestive. Common examples include selfies in underwear or in partial undress.<br><br>
+    <code>on content</code><br><strong>Suggestive Content</strong><br>This content contains imagery which is sexually suggestive. Common examples include selfies in underwear or in partial undress.<br><br>
   </td>
 </tr>
 <tr>
   <td>nudity</td>
   <td>
     <code>general</code><br><strong>Nudity</strong><br>Nudity which is not sexual, or that is primarily "artistic" in nature. For example: breastfeeding; classic art paintings and sculptures; newspaper images with some nudity; fashion modeling. "Erotic photography" is likely to end up in sexual or porn.<br><br>
-    <code>on an account</code><br><strong>Nudity</strong><br>This account contains imagery which portrays nudity in a non-sexual or artistic setting.<br><br>
-    <code>on content</code><br><strong>Nudity</strong><br>This content contains imagery which portrays nudity in a non-sexual or artistic setting.<br><br>
+    <code>on an account</code><br><strong>Adult Content</strong><br>This account contains imagery which portrays nudity in a non-sexual or artistic setting.<br><br>
+    <code>on content</code><br><strong>Adult Content</strong><br>This content contains imagery which portrays nudity in a non-sexual or artistic setting.<br><br>
   </td>
 </tr>
 <tr>

package/docs/moderation-behaviors/posts.md

@@ -767,7 +767,7 @@ Key:
 
 </td>
 <td>
-
+✋
 
 </td>
 </tr>
@@ -877,7 +877,7 @@ Key:
 
 </td>
 <td>
-
+✋
 
 </td>
 </tr>
@@ -1427,7 +1427,7 @@ Key:
 
 </td>
 <td>
-
+🚫
 
 </td>
 </tr>
@@ -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.1",
+  "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/const/labels.ts

@@ -167,14 +167,14 @@ export const LABELS: LabelDefinitionMap = {
       },
       account: {
         en: {
-          name: 'Pornography',
+          name: 'Adult Content',
           description:
             'This account contains imagery of full-frontal nudity or explicit sexual activity.',
         },
       },
       content: {
         en: {
-          name: 'Pornography',
+          name: 'Adult Content',
           description:
             'This content contains imagery of full-frontal nudity or explicit sexual activity.',
         },
@@ -198,14 +198,14 @@ export const LABELS: LabelDefinitionMap = {
       },
       account: {
         en: {
-          name: 'Sexually Suggestive',
+          name: 'Suggestive Content',
           description:
             'This account contains imagery which is sexually suggestive. Common examples include selfies in underwear or in partial undress.',
         },
       },
       content: {
         en: {
-          name: 'Sexually Suggestive',
+          name: 'Suggestive Content',
           description:
             'This content contains imagery which is sexually suggestive. Common examples include selfies in underwear or in partial undress.',
         },
@@ -229,14 +229,14 @@ export const LABELS: LabelDefinitionMap = {
       },
       account: {
         en: {
-          name: 'Nudity',
+          name: 'Adult Content',
           description:
             'This account contains imagery which portrays nudity in a non-sexual or artistic setting.',
         },
       },
       content: {
         en: {
-          name: 'Nudity',
+          name: 'Adult Content',
           description:
             'This content contains imagery which portrays nudity in a non-sexual or artistic setting.',
         },

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
@@ -148,26 +148,29 @@ export function moderatePost(
     quote = decideQuotedPostWithMedia(subject.embed, opts)
     quotedAccount = decideQuotedPostWithMediaAccount(subject.embed, opts)
   }
+  if (quote?.blurMedia) {
+    quote.blur = true // treat blurMedia of quote as blur of quote
+  }
 
   // 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
   }
 }