@atproto/api 0.11.0-next → 0.11.0

package/tests/moderation.test.ts

@@ -29,7 +29,7 @@ describe('Moderation', () => {
           labels: {
             porn: 'hide',
           },
-          mods: [],
+          labelers: [],
         },
       },
     )
@@ -61,7 +61,7 @@ describe('Moderation', () => {
           labels: {
             porn: 'ignore',
           },
-          mods: [],
+          labelers: [],
         },
       },
     )
@@ -95,7 +95,7 @@ describe('Moderation', () => {
           labels: {
             porn: 'hide',
           },
-          mods: [],
+          labelers: [],
         },
       },
     )
@@ -137,7 +137,7 @@ describe('Moderation', () => {
           labels: {
             porn: 'ignore',
           },
-          mods: [
+          labelers: [
             {
               did: 'did:web:labeler.test',
               labels: { porn: 'ignore' },
@@ -182,7 +182,7 @@ describe('Moderation', () => {
         prefs: {
           adultContentEnabled: true,
           labels: {},
-          mods: [
+          labelers: [
             {
               did: 'did:web:labeler.test',
               labels: {},
@@ -232,7 +232,7 @@ describe('Moderation', () => {
           labels: {
             porn: 'hide',
           },
-          mods: [
+          labelers: [
             {
               did: 'did:web:labeler.test',
               labels: {},
@@ -253,7 +253,7 @@ describe('Moderation', () => {
       prefs: {
         adultContentEnabled: true,
         labels: { porn: 'warn' },
-        mods: [
+        labelers: [
           {
             did: 'did:web:labeler.test',
             labels: { porn: 'warn' },
@@ -262,13 +262,15 @@ describe('Moderation', () => {
       },
       labelDefs: {
         'did:web:labeler.test': [
-          interpretLabelValueDefinition({
-            identifier: 'porn',
-            blurs: 'none',
-            severity: 'inform',
-            defaultSetting: 'warn',
-            locales: [],
-          }),
+          interpretLabelValueDefinition(
+            {
+              identifier: 'porn',
+              blurs: 'none',
+              severity: 'inform',
+              locales: [],
+            },
+            'did:web:labeler.test',
+          ),
         ],
       },
     }
@@ -309,7 +311,7 @@ describe('Moderation', () => {
       prefs: {
         adultContentEnabled: true,
         labels: {},
-        mods: [
+        labelers: [
           {
             did: 'did:web:labeler.test',
             labels: {},
@@ -318,13 +320,15 @@ describe('Moderation', () => {
       },
       labelDefs: {
         'did:web:labeler.test': [
-          interpretLabelValueDefinition({
-            identifier: '!hide',
-            blurs: 'none',
-            severity: 'inform',
-            defaultSetting: 'warn',
-            locales: [],
-          }),
+          interpretLabelValueDefinition(
+            {
+              identifier: '!hide',
+              blurs: 'none',
+              severity: 'inform',
+              locales: [],
+            },
+            'did:web:labeler.test',
+          ),
         ],
       },
     }
@@ -350,7 +354,7 @@ describe('Moderation', () => {
       modOpts,
     )
 
-    expect(res.ui('profileList')).toBeModerationResult(['filter'])
+    expect(res.ui('profileList')).toBeModerationResult([])
     expect(res.ui('profileView')).toBeModerationResult([])
     expect(res.ui('avatar')).toBeModerationResult([])
     expect(res.ui('banner')).toBeModerationResult([])
@@ -370,7 +374,7 @@ describe('Moderation', () => {
       prefs: {
         adultContentEnabled: true,
         labels: {},
-        mods: [
+        labelers: [
           {
             did: 'did:web:labeler.test',
             labels: { BadLabel: 'hide', 'bad/label': 'hide' },
@@ -379,20 +383,24 @@ describe('Moderation', () => {
       },
       labelDefs: {
         'did:web:labeler.test': [
-          interpretLabelValueDefinition({
-            identifier: 'BadLabel',
-            blurs: 'content',
-            severity: 'inform',
-            defaultSetting: 'warn',
-            locales: [],
-          }),
-          interpretLabelValueDefinition({
-            identifier: 'bad/label',
-            blurs: 'content',
-            severity: 'inform',
-            defaultSetting: 'warn',
-            locales: [],
-          }),
+          interpretLabelValueDefinition(
+            {
+              identifier: 'BadLabel',
+              blurs: 'content',
+              severity: 'inform',
+              locales: [],
+            },
+            'did:web:labeler.test',
+          ),
+          interpretLabelValueDefinition(
+            {
+              identifier: 'bad/label',
+              blurs: 'content',
+              severity: 'inform',
+              locales: [],
+            },
+            'did:web:labeler.test',
+          ),
         ],
       },
     }
@@ -433,4 +441,260 @@ describe('Moderation', () => {
     expect(res.ui('contentView')).toBeModerationResult([])
     expect(res.ui('contentMedia')).toBeModerationResult([])
   })
+
+  it('Custom labels can set the default setting', () => {
+    const modOpts = {
+      userDid: 'did:web:alice.test',
+      prefs: {
+        adultContentEnabled: true,
+        labels: {},
+        labelers: [
+          {
+            did: 'did:web:labeler.test',
+            labels: {},
+          },
+        ],
+      },
+      labelDefs: {
+        'did:web:labeler.test': [
+          interpretLabelValueDefinition(
+            {
+              identifier: 'default-hide',
+              blurs: 'content',
+              severity: 'inform',
+              defaultSetting: 'hide',
+              locales: [],
+            },
+            'did:web:labeler.test',
+          ),
+          interpretLabelValueDefinition(
+            {
+              identifier: 'default-warn',
+              blurs: 'content',
+              severity: 'inform',
+              defaultSetting: 'warn',
+              locales: [],
+            },
+            'did:web:labeler.test',
+          ),
+          interpretLabelValueDefinition(
+            {
+              identifier: 'default-ignore',
+              blurs: 'content',
+              severity: 'inform',
+              defaultSetting: 'ignore',
+              locales: [],
+            },
+            'did:web:labeler.test',
+          ),
+        ],
+      },
+    }
+    const res1 = moderatePost(
+      mock.postView({
+        record: {
+          text: 'Hello',
+          createdAt: new Date().toISOString(),
+        },
+        author: mock.profileViewBasic({
+          handle: 'bob.test',
+          displayName: 'Bob',
+        }),
+        labels: [
+          {
+            src: 'did:web:labeler.test',
+            uri: 'at://did:web:bob.test/app.bsky.post/fake',
+            val: 'default-hide',
+            cts: new Date().toISOString(),
+          },
+        ],
+      }),
+      modOpts,
+    )
+
+    expect(res1.ui('profileList')).toBeModerationResult([])
+    expect(res1.ui('profileView')).toBeModerationResult([])
+    expect(res1.ui('avatar')).toBeModerationResult([])
+    expect(res1.ui('banner')).toBeModerationResult([])
+    expect(res1.ui('displayName')).toBeModerationResult([])
+    expect(res1.ui('contentList')).toBeModerationResult(['filter', 'blur'])
+    expect(res1.ui('contentView')).toBeModerationResult(['inform'])
+    expect(res1.ui('contentMedia')).toBeModerationResult([])
+
+    const res2 = moderatePost(
+      mock.postView({
+        record: {
+          text: 'Hello',
+          createdAt: new Date().toISOString(),
+        },
+        author: mock.profileViewBasic({
+          handle: 'bob.test',
+          displayName: 'Bob',
+        }),
+        labels: [
+          {
+            src: 'did:web:labeler.test',
+            uri: 'at://did:web:bob.test/app.bsky.post/fake',
+            val: 'default-warn',
+            cts: new Date().toISOString(),
+          },
+        ],
+      }),
+      modOpts,
+    )
+
+    expect(res2.ui('profileList')).toBeModerationResult([])
+    expect(res2.ui('profileView')).toBeModerationResult([])
+    expect(res2.ui('avatar')).toBeModerationResult([])
+    expect(res2.ui('banner')).toBeModerationResult([])
+    expect(res2.ui('displayName')).toBeModerationResult([])
+    expect(res2.ui('contentList')).toBeModerationResult(['blur'])
+    expect(res2.ui('contentView')).toBeModerationResult(['inform'])
+    expect(res2.ui('contentMedia')).toBeModerationResult([])
+
+    const res3 = moderatePost(
+      mock.postView({
+        record: {
+          text: 'Hello',
+          createdAt: new Date().toISOString(),
+        },
+        author: mock.profileViewBasic({
+          handle: 'bob.test',
+          displayName: 'Bob',
+        }),
+        labels: [
+          {
+            src: 'did:web:labeler.test',
+            uri: 'at://did:web:bob.test/app.bsky.post/fake',
+            val: 'default-ignore',
+            cts: new Date().toISOString(),
+          },
+        ],
+      }),
+      modOpts,
+    )
+
+    expect(res3.ui('profileList')).toBeModerationResult([])
+    expect(res3.ui('profileView')).toBeModerationResult([])
+    expect(res3.ui('avatar')).toBeModerationResult([])
+    expect(res3.ui('banner')).toBeModerationResult([])
+    expect(res3.ui('displayName')).toBeModerationResult([])
+    expect(res3.ui('contentList')).toBeModerationResult([])
+    expect(res3.ui('contentView')).toBeModerationResult([])
+    expect(res3.ui('contentMedia')).toBeModerationResult([])
+  })
+
+  it('Custom labels can require adult content to be enabled', () => {
+    const modOpts = {
+      userDid: 'did:web:alice.test',
+      prefs: {
+        adultContentEnabled: false,
+        labels: { adult: 'ignore' },
+        labelers: [
+          {
+            did: 'did:web:labeler.test',
+            labels: {
+              adult: 'ignore',
+            },
+          },
+        ],
+      },
+      labelDefs: {
+        'did:web:labeler.test': [
+          interpretLabelValueDefinition(
+            {
+              identifier: 'adult',
+              blurs: 'content',
+              severity: 'inform',
+              defaultSetting: 'hide',
+              adultOnly: true,
+              locales: [],
+            },
+            'did:web:labeler.test',
+          ),
+        ],
+      },
+    }
+    const res = moderatePost(
+      mock.postView({
+        record: {
+          text: 'Hello',
+          createdAt: new Date().toISOString(),
+        },
+        author: mock.profileViewBasic({
+          handle: 'bob.test',
+          displayName: 'Bob',
+        }),
+        labels: [
+          {
+            src: 'did:web:labeler.test',
+            uri: 'at://did:web:bob.test/app.bsky.post/fake',
+            val: 'adult',
+            cts: new Date().toISOString(),
+          },
+        ],
+      }),
+      modOpts,
+    )
+
+    expect(res.ui('profileList')).toBeModerationResult([])
+    expect(res.ui('profileView')).toBeModerationResult([])
+    expect(res.ui('avatar')).toBeModerationResult([])
+    expect(res.ui('banner')).toBeModerationResult([])
+    expect(res.ui('displayName')).toBeModerationResult([])
+    expect(res.ui('contentList')).toBeModerationResult([
+      'filter',
+      'blur',
+      'noOverride',
+    ])
+    expect(res.ui('contentView')).toBeModerationResult(['blur', 'noOverride'])
+    expect(res.ui('contentMedia')).toBeModerationResult([])
+  })
+
+  it('Adult content disabled forces the preference to hide', () => {
+    const modOpts = {
+      userDid: 'did:web:alice.test',
+      prefs: {
+        adultContentEnabled: false,
+        labels: { porn: 'ignore' },
+        labelers: [
+          {
+            did: 'did:web:labeler.test',
+            labels: {},
+          },
+        ],
+      },
+      labelDefs: {},
+    }
+    const res = moderatePost(
+      mock.postView({
+        record: {
+          text: 'Hello',
+          createdAt: new Date().toISOString(),
+        },
+        author: mock.profileViewBasic({
+          handle: 'bob.test',
+          displayName: 'Bob',
+        }),
+        labels: [
+          {
+            src: 'did:web:labeler.test',
+            uri: 'at://did:web:bob.test/app.bsky.post/fake',
+            val: 'porn',
+            cts: new Date().toISOString(),
+          },
+        ],
+      }),
+      modOpts,
+    )
+
+    expect(res.ui('profileList')).toBeModerationResult([])
+    expect(res.ui('profileView')).toBeModerationResult([])
+    expect(res.ui('avatar')).toBeModerationResult([])
+    expect(res.ui('banner')).toBeModerationResult([])
+    expect(res.ui('displayName')).toBeModerationResult([])
+    expect(res.ui('contentList')).toBeModerationResult(['filter'])
+    expect(res.ui('contentView')).toBeModerationResult([])
+    expect(res.ui('contentMedia')).toBeModerationResult(['blur', 'noOverride'])
+  })
 })

package/tests/util/moderation-behavior.ts

@@ -254,12 +254,14 @@ export class ModerationBehaviorSuiteRunner {
           this.configurations[scenario.cfg]?.adultContentEnabled,
         ),
         labels: this.configurations[scenario.cfg].settings || {},
-        mods: [
+        labelers: [
           {
             did: 'did:plc:fake-labeler',
             labels: {},
           },
         ],
+        mutedWords: [],
+        hiddenPosts: [],
       },
     }
   }

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

@@ -1,32 +0,0 @@
-import { Headers, XRPCError } from '@atproto/xrpc';
-import * as AppBskySystemDeclRef from '../system/declRef';
-export interface QueryParams {
-}
-export interface InputSchema {
-    handle: string;
-    recoveryKey?: string;
-    [k: string]: unknown;
-}
-export interface OutputSchema {
-    handle: string;
-    did: string;
-    declaration: AppBskySystemDeclRef.Main;
-    [k: string]: unknown;
-}
-export interface CallOptions {
-    headers?: Headers;
-    qp?: QueryParams;
-    encoding: 'application/json';
-}
-export interface Response {
-    success: boolean;
-    headers: Headers;
-    data: OutputSchema;
-}
-export declare class InvalidHandleError extends XRPCError {
-    constructor(src: XRPCError);
-}
-export declare class HandleNotAvailableError extends XRPCError {
-    constructor(src: XRPCError);
-}
-export declare function toKnownErr(e: any): any;

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

@@ -1,28 +0,0 @@
-import { ValidationResult } from '@atproto/lexicon';
-import * as AppBskySystemDeclRef from '../system/declRef';
-export interface Main {
-    did: string;
-    declarationCid: string;
-    [k: string]: unknown;
-}
-export declare function isMain(v: unknown): v is Main;
-export declare function validateMain(v: unknown): ValidationResult;
-export interface WithInfo {
-    did: string;
-    declaration: AppBskySystemDeclRef.Main;
-    handle: string;
-    displayName?: string;
-    avatar?: string;
-    viewer?: ViewerState;
-    [k: string]: unknown;
-}
-export declare function isWithInfo(v: unknown): v is WithInfo;
-export declare function validateWithInfo(v: unknown): ValidationResult;
-export interface ViewerState {
-    muted?: boolean;
-    following?: string;
-    followedBy?: string;
-    [k: string]: unknown;
-}
-export declare function isViewerState(v: unknown): v is ViewerState;
-export declare function validateViewerState(v: unknown): ValidationResult;

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

@@ -1,22 +0,0 @@
-import { Headers } from '@atproto/xrpc';
-import * as AppBskyActorProfile from './profile';
-export interface QueryParams {
-    term?: string;
-    limit?: number;
-    before?: string;
-}
-export declare type InputSchema = undefined;
-export interface OutputSchema {
-    cursor?: string;
-    users: AppBskyActorProfile.ViewBasic[];
-    [k: string]: unknown;
-}
-export interface CallOptions {
-    headers?: Headers;
-}
-export interface Response {
-    success: boolean;
-    headers: Headers;
-    data: OutputSchema;
-}
-export declare function toKnownErr(e: any): any;

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

@@ -1,22 +0,0 @@
-import { Headers } from '@atproto/xrpc';
-import * as AppBskyActorDefs from './defs';
-export interface QueryParams {
-    term?: string;
-    limit?: number;
-    cursor?: string;
-}
-export declare type InputSchema = undefined;
-export interface OutputSchema {
-    cursor?: string;
-    actors: AppBskyActorDefs.ProfileViewBasic[];
-    [k: string]: unknown;
-}
-export interface CallOptions {
-    headers?: Headers;
-}
-export interface Response {
-    success: boolean;
-    headers: Headers;
-    data: OutputSchema;
-}
-export declare function toKnownErr(e: any): any;

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

@@ -1,20 +0,0 @@
-import { Headers } from '@atproto/xrpc';
-import * as AppBskyActorDefs from './defs';
-export interface QueryParams {
-    term?: string;
-    limit?: number;
-}
-export declare type InputSchema = undefined;
-export interface OutputSchema {
-    actors: AppBskyActorDefs.WithInfo[];
-    [k: string]: unknown;
-}
-export interface CallOptions {
-    headers?: Headers;
-}
-export interface Response {
-    success: boolean;
-    headers: Headers;
-    data: OutputSchema;
-}
-export declare function toKnownErr(e: any): any;

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

@@ -1,20 +0,0 @@
-import { Headers } from '@atproto/xrpc';
-import * as AppBskyActorRef from './ref';
-export interface QueryParams {
-    term?: string;
-    limit?: number;
-}
-export declare type InputSchema = undefined;
-export interface OutputSchema {
-    users: AppBskyActorRef.WithInfo[];
-    [k: string]: unknown;
-}
-export interface CallOptions {
-    headers?: Headers;
-}
-export interface Response {
-    success: boolean;
-    headers: Headers;
-    data: OutputSchema;
-}
-export declare function toKnownErr(e: any): any;

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

@@ -1,47 +0,0 @@
-import { Headers, XRPCError } from '@atproto/xrpc';
-export interface QueryParams {
-}
-export interface InputSchema {
-    displayName?: string;
-    description?: string | null;
-    avatar?: {
-        cid: string;
-        mimeType: string;
-        [k: string]: unknown;
-    } | null;
-    banner?: {
-        cid: string;
-        mimeType: string;
-        [k: string]: unknown;
-    } | null;
-    [k: string]: unknown;
-}
-export interface OutputSchema {
-    uri: string;
-    cid: string;
-    record: {};
-    [k: string]: unknown;
-}
-export interface CallOptions {
-    headers?: Headers;
-    qp?: QueryParams;
-    encoding: 'application/json';
-}
-export interface Response {
-    success: boolean;
-    headers: Headers;
-    data: OutputSchema;
-}
-export declare class InvalidBlobError extends XRPCError {
-    constructor(src: XRPCError);
-}
-export declare class BlobTooLargeError extends XRPCError {
-    constructor(src: XRPCError);
-}
-export declare class InvalidMimeTypeError extends XRPCError {
-    constructor(src: XRPCError);
-}
-export declare class InvalidImageDimensionsError extends XRPCError {
-    constructor(src: XRPCError);
-}
-export declare function toKnownErr(e: any): any;

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

@@ -1,17 +0,0 @@
-import { Headers } from '@atproto/xrpc';
-export interface QueryParams {
-}
-export interface InputSchema {
-    feed: string;
-    [k: string]: unknown;
-}
-export interface CallOptions {
-    headers?: Headers;
-    qp?: QueryParams;
-    encoding: 'application/json';
-}
-export interface Response {
-    success: boolean;
-    headers: Headers;
-}
-export declare function toKnownErr(e: any): any;

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

@@ -1,28 +0,0 @@
-import { ValidationResult } from '@atproto/lexicon';
-import * as AppBskyFeedPost from './post';
-import * as AppBskyActorRef from '../actor/ref';
-export interface Main {
-    post: AppBskyFeedPost.View;
-    reply?: ReplyRef;
-    reason?: ReasonRepost | {
-        $type: string;
-        [k: string]: unknown;
-    };
-    [k: string]: unknown;
-}
-export declare function isMain(v: unknown): v is Main;
-export declare function validateMain(v: unknown): ValidationResult;
-export interface ReplyRef {
-    root: AppBskyFeedPost.View;
-    parent: AppBskyFeedPost.View;
-    [k: string]: unknown;
-}
-export declare function isReplyRef(v: unknown): v is ReplyRef;
-export declare function validateReplyRef(v: unknown): ValidationResult;
-export interface ReasonRepost {
-    by: AppBskyActorRef.WithInfo;
-    indexedAt: string;
-    [k: string]: unknown;
-}
-export declare function isReasonRepost(v: unknown): v is ReasonRepost;
-export declare function validateReasonRepost(v: unknown): ValidationResult;