@atproto/api 0.5.4 → 0.6.0

package/README.md

@@ -222,14 +222,22 @@ function getOpts() {
     // is adult content allowed?
     adultContentEnabled: true,
 
-    // the user's labeler settings
-    labelerSettings: [
+    // the global label settings (used on self-labels)
+    labels: {
+      porn: 'hide',
+      sexual: 'warn',
+      nudity: 'ignore',
+      // ...
+    },
+
+    // the per-labeler settings
+    labelers: [
       {
         labeler: {
           did: '...',
           displayName: 'My mod service'
         },
-        settings: {
+        labels: {
           porn: 'hide',
           sexual: 'warn',
           nudity: 'ignore',

package/dist/client/lexicons.d.ts

@@ -1315,6 +1315,33 @@ export declare const schemaDict: {
                     };
                 };
             };
+            selfLabels: {
+                type: string;
+                description: string;
+                required: string[];
+                properties: {
+                    values: {
+                        type: string;
+                        items: {
+                            type: string;
+                            ref: string;
+                        };
+                        maxLength: number;
+                    };
+                };
+            };
+            selfLabel: {
+                type: string;
+                description: string;
+                required: string[];
+                properties: {
+                    val: {
+                        type: string;
+                        maxLength: number;
+                        description: string;
+                    };
+                };
+            };
         };
     };
     ComAtprotoLabelQueryLabels: {
@@ -3653,6 +3680,10 @@ export declare const schemaDict: {
                             accept: string[];
                             maxSize: number;
                         };
+                        labels: {
+                            type: string;
+                            refs: string[];
+                        };
                     };
                 };
             };
@@ -4360,6 +4391,10 @@ export declare const schemaDict: {
                             accept: string[];
                             maxSize: number;
                         };
+                        labels: {
+                            type: string;
+                            refs: string[];
+                        };
                         createdAt: {
                             type: string;
                             format: string;
@@ -4441,6 +4476,11 @@ export declare const schemaDict: {
                         cursor: {
                             type: string;
                         };
+                        filter: {
+                            type: string;
+                            knownValues: string[];
+                            default: string;
+                        };
                     };
                 };
                 output: {
@@ -4988,6 +5028,10 @@ export declare const schemaDict: {
                                 format: string;
                             };
                         };
+                        labels: {
+                            type: string;
+                            refs: string[];
+                        };
                         createdAt: {
                             type: string;
                             format: string;
@@ -5605,6 +5649,10 @@ export declare const schemaDict: {
                             accept: string[];
                             maxSize: number;
                         };
+                        labels: {
+                            type: string;
+                            refs: string[];
+                        };
                         createdAt: {
                             type: string;
                             format: string;

package/dist/client/types/app/bsky/actor/profile.d.ts

@@ -1,9 +1,14 @@
 import { ValidationResult, BlobRef } from '@atproto/lexicon';
+import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs';
 export interface Record {
     displayName?: string;
     description?: string;
     avatar?: BlobRef;
     banner?: BlobRef;
+    labels?: ComAtprotoLabelDefs.SelfLabels | {
+        $type: string;
+        [k: string]: unknown;
+    };
     [k: string]: unknown;
 }
 export declare function isRecord(v: unknown): v is Record;

package/dist/client/types/app/bsky/feed/generator.d.ts

@@ -1,11 +1,16 @@
 import { ValidationResult, BlobRef } from '@atproto/lexicon';
 import * as AppBskyRichtextFacet from '../richtext/facet';
+import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs';
 export interface Record {
     did: string;
     displayName: string;
     description?: string;
     descriptionFacets?: AppBskyRichtextFacet.Main[];
     avatar?: BlobRef;
+    labels?: ComAtprotoLabelDefs.SelfLabels | {
+        $type: string;
+        [k: string]: unknown;
+    };
     createdAt: string;
     [k: string]: unknown;
 }

package/dist/client/types/app/bsky/feed/getAuthorFeed.d.ts

@@ -4,6 +4,7 @@ export interface QueryParams {
     actor: string;
     limit?: number;
     cursor?: string;
+    filter?: 'posts_with_replies' | 'posts_no_replies' | 'posts_with_media' | (string & {});
 }
 export declare type InputSchema = undefined;
 export interface OutputSchema {

package/dist/client/types/app/bsky/feed/post.d.ts

@@ -4,6 +4,7 @@ import * as AppBskyEmbedImages from '../embed/images';
 import * as AppBskyEmbedExternal from '../embed/external';
 import * as AppBskyEmbedRecord from '../embed/record';
 import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia';
+import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs';
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef';
 export interface Record {
     text: string;
@@ -15,6 +16,10 @@ export interface Record {
         [k: string]: unknown;
     };
     langs?: string[];
+    labels?: ComAtprotoLabelDefs.SelfLabels | {
+        $type: string;
+        [k: string]: unknown;
+    };
     createdAt: string;
     [k: string]: unknown;
 }

package/dist/client/types/app/bsky/graph/list.d.ts

@@ -1,12 +1,17 @@
 import { ValidationResult, BlobRef } from '@atproto/lexicon';
 import * as AppBskyGraphDefs from './defs';
 import * as AppBskyRichtextFacet from '../richtext/facet';
+import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs';
 export interface Record {
     purpose: AppBskyGraphDefs.ListPurpose;
     name: string;
     description?: string;
     descriptionFacets?: AppBskyRichtextFacet.Main[];
     avatar?: BlobRef;
+    labels?: ComAtprotoLabelDefs.SelfLabels | {
+        $type: string;
+        [k: string]: unknown;
+    };
     createdAt: string;
     [k: string]: unknown;
 }

package/dist/client/types/com/atproto/label/defs.d.ts

@@ -10,3 +10,15 @@ export interface Label {
 }
 export declare function isLabel(v: unknown): v is Label;
 export declare function validateLabel(v: unknown): ValidationResult;
+export interface SelfLabels {
+    values: SelfLabel[];
+    [k: string]: unknown;
+}
+export declare function isSelfLabels(v: unknown): v is SelfLabels;
+export declare function validateSelfLabels(v: unknown): ValidationResult;
+export interface SelfLabel {
+    val: string;
+    [k: string]: unknown;
+}
+export declare function isSelfLabel(v: unknown): v is SelfLabel;
+export declare function validateSelfLabel(v: unknown): ValidationResult;

package/dist/index.js

@@ -17131,6 +17131,33 @@ var schemaDict = {
             description: "timestamp when this label was created"
           }
         }
+      },
+      selfLabels: {
+        type: "object",
+        description: "Metadata tags on an atproto record, published by the author within the record.",
+        required: ["values"],
+        properties: {
+          values: {
+            type: "array",
+            items: {
+              type: "ref",
+              ref: "lex:com.atproto.label.defs#selfLabel"
+            },
+            maxLength: 10
+          }
+        }
+      },
+      selfLabel: {
+        type: "object",
+        description: "Metadata tag on an atproto record, published by the author within the record. Note -- schemas should use #selfLabels, not #selfLabel.",
+        required: ["val"],
+        properties: {
+          val: {
+            type: "string",
+            maxLength: 128,
+            description: "the short string name of the value or type of this label"
+          }
+        }
       }
     }
   },
@@ -19592,6 +19619,10 @@ var schemaDict = {
               type: "blob",
               accept: ["image/png", "image/jpeg"],
               maxSize: 1e6
+            },
+            labels: {
+              type: "union",
+              refs: ["lex:com.atproto.label.defs#selfLabels"]
             }
           }
         }
@@ -20335,6 +20366,10 @@ var schemaDict = {
               accept: ["image/png", "image/jpeg"],
               maxSize: 1e6
             },
+            labels: {
+              type: "union",
+              refs: ["lex:com.atproto.label.defs#selfLabels"]
+            },
             createdAt: {
               type: "string",
               format: "datetime"
@@ -20415,6 +20450,15 @@ var schemaDict = {
             },
             cursor: {
               type: "string"
+            },
+            filter: {
+              type: "string",
+              knownValues: [
+                "posts_with_replies",
+                "posts_no_replies",
+                "posts_with_media"
+              ],
+              default: "posts_with_replies"
             }
           }
         },
@@ -20983,6 +21027,10 @@ var schemaDict = {
                 format: "language"
               }
             },
+            labels: {
+              type: "union",
+              refs: ["lex:com.atproto.label.defs#selfLabels"]
+            },
             createdAt: {
               type: "string",
               format: "datetime"
@@ -21600,6 +21648,10 @@ var schemaDict = {
               accept: ["image/png", "image/jpeg"],
               maxSize: 1e6
             },
+            labels: {
+              type: "union",
+              refs: ["lex:com.atproto.label.defs#selfLabels"]
+            },
             createdAt: {
               type: "string",
               format: "datetime"
@@ -23723,7 +23775,11 @@ function validateVideoDetails(v) {
 var defs_exports2 = {};
 __export(defs_exports2, {
   isLabel: () => isLabel,
-  validateLabel: () => validateLabel
+  isSelfLabel: () => isSelfLabel,
+  isSelfLabels: () => isSelfLabels,
+  validateLabel: () => validateLabel,
+  validateSelfLabel: () => validateSelfLabel,
+  validateSelfLabels: () => validateSelfLabels
 });
 function isLabel(v) {
   return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.label.defs#label";
@@ -23731,6 +23787,18 @@ function isLabel(v) {
 function validateLabel(v) {
   return lexicons.validate("com.atproto.label.defs#label", v);
 }
+function isSelfLabels(v) {
+  return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.label.defs#selfLabels";
+}
+function validateSelfLabels(v) {
+  return lexicons.validate("com.atproto.label.defs#selfLabels", v);
+}
+function isSelfLabel(v) {
+  return isObj2(v) && hasProp2(v, "$type") && v.$type === "com.atproto.label.defs#selfLabel";
+}
+function validateSelfLabel(v) {
+  return lexicons.validate("com.atproto.label.defs#selfLabel", v);
+}
 
 // src/client/types/com/atproto/label/subscribeLabels.ts
 var subscribeLabels_exports = {};
@@ -28136,17 +28204,17 @@ var ModerationCauseAccumulator = class {
     if (!labelDef) {
       return;
     }
-    const labelerSettings = opts.labelerSettings[0];
-    if (!labelerSettings) {
-      return;
-    }
+    const isSelf = label.src === this.did;
+    const labeler = isSelf ? void 0 : opts.labelers.find((s) => s.labeler.did === label.src);
     let labelPref = "ignore";
     if (!labelDef.configurable) {
       labelPref = labelDef.preferences[0];
     } else if (labelDef.flags.includes("adult") && !opts.adultContentEnabled) {
       labelPref = "hide";
-    } else if (labelerSettings.settings[label.val]) {
-      labelPref = labelerSettings.settings[label.val];
+    } else if (labeler?.labels[label.val]) {
+      labelPref = labeler.labels[label.val];
+    } else if (opts.labels[label.val]) {
+      labelPref = opts.labels[label.val];
     }
     if (labelPref === "ignore") {
       return;
@@ -28165,9 +28233,9 @@ var ModerationCauseAccumulator = class {
     }
     this.causes.push({
       type: "label",
+      source: isSelf || !labeler ? { type: "user" } : { type: "labeler", labeler: labeler.labeler },
       label,
       labelDef,
-      labeler: labelerSettings.labeler,
       setting: labelPref,
       priority
     });