@atproto/api 0.14.0-next.1 → 0.14.0-next.3

package/src/client/types/tools/ozone/set/deleteValues.ts

@@ -4,14 +4,10 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.set.deleteValues'
 

package/src/client/types/tools/ozone/set/getValues.ts

@@ -4,15 +4,11 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as ToolsOzoneSetDefs from './defs'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.set.getValues'
 

package/src/client/types/tools/ozone/set/querySets.ts

@@ -4,15 +4,11 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as ToolsOzoneSetDefs from './defs'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.set.querySets'
 

package/src/client/types/tools/ozone/set/upsertSet.ts

@@ -4,15 +4,11 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as ToolsOzoneSetDefs from './defs'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.set.upsertSet'
 

package/src/client/types/tools/ozone/setting/defs.ts

@@ -3,14 +3,10 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.setting.defs'
 
@@ -41,7 +37,3 @@ export function isOption<V>(v: V) {
 export function validateOption<V>(v: V) {
   return validate<Option & V>(v, id, hashOption)
 }
-
-export function isValidOption<V>(v: V) {
-  return isValid<Option>(v, id, hashOption)
-}

package/src/client/types/tools/ozone/setting/listOptions.ts

@@ -4,15 +4,11 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as ToolsOzoneSettingDefs from './defs'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.setting.listOptions'
 

package/src/client/types/tools/ozone/setting/removeOptions.ts

@@ -4,14 +4,10 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.setting.removeOptions'
 

package/src/client/types/tools/ozone/setting/upsertOption.ts

@@ -4,15 +4,11 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as ToolsOzoneSettingDefs from './defs'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.setting.upsertOption'
 

package/src/client/types/tools/ozone/signature/defs.ts

@@ -3,14 +3,10 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.signature.defs'
 
@@ -29,7 +25,3 @@ export function isSigDetail<V>(v: V) {
 export function validateSigDetail<V>(v: V) {
   return validate<SigDetail & V>(v, id, hashSigDetail)
 }
-
-export function isValidSigDetail<V>(v: V) {
-  return isValid<SigDetail>(v, id, hashSigDetail)
-}

package/src/client/types/tools/ozone/signature/findCorrelation.ts

@@ -4,15 +4,11 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as ToolsOzoneSignatureDefs from './defs'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.signature.findCorrelation'
 

package/src/client/types/tools/ozone/signature/findRelatedAccounts.ts

@@ -4,16 +4,12 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import type * as ToolsOzoneSignatureDefs from './defs'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.signature.findRelatedAccounts'
 
@@ -60,7 +56,3 @@ export function isRelatedAccount<V>(v: V) {
 export function validateRelatedAccount<V>(v: V) {
   return validate<RelatedAccount & V>(v, id, hashRelatedAccount)
 }
-
-export function isValidRelatedAccount<V>(v: V) {
-  return isValid<RelatedAccount>(v, id, hashRelatedAccount)
-}

package/src/client/types/tools/ozone/signature/searchAccounts.ts

@@ -4,15 +4,11 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.signature.searchAccounts'
 

package/src/client/types/tools/ozone/team/addMember.ts

@@ -4,15 +4,11 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as ToolsOzoneTeamDefs from './defs'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.team.addMember'
 

package/src/client/types/tools/ozone/team/defs.ts

@@ -3,15 +3,11 @@
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.team.defs'
 
@@ -40,10 +36,6 @@ export function validateMember<V>(v: V) {
   return validate<Member & V>(v, id, hashMember)
 }
 
-export function isValidMember<V>(v: V) {
-  return isValid<Member>(v, id, hashMember)
-}
-
 /** Admin role. Highest level of access, can perform all actions. */
 export const ROLEADMIN = `${id}#roleAdmin`
 /** Moderator role. Can perform most actions. */

package/src/client/types/tools/ozone/team/deleteMember.ts

@@ -4,14 +4,10 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.team.deleteMember'
 

package/src/client/types/tools/ozone/team/listMembers.ts

@@ -4,15 +4,11 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as ToolsOzoneTeamDefs from './defs'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.team.listMembers'
 

package/src/client/types/tools/ozone/team/updateMember.ts

@@ -4,15 +4,11 @@
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import {
-  isValid as _isValid,
-  validate as _validate,
-} from '../../../../lexicons'
+import { validate as _validate } from '../../../../lexicons'
 import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as ToolsOzoneTeamDefs from './defs'
 
 const is$typed = _is$typed,
-  isValid = _isValid,
   validate = _validate
 const id = 'tools.ozone.team.updateMember'
 

package/src/client/util.ts

@@ -1,27 +1,30 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
+import { ValidationResult } from '@atproto/lexicon'
+
 export type OmitKey<T, K extends keyof T> = {
   [K2 in keyof T as K2 extends K ? never : K2]: T[K2]
 }
 
-export type $Typed<V> = V & { $type: string }
+export type $Typed<V, T extends string = string> = V & { $type: T }
+export type Un$Typed<V extends { $type?: string }> = OmitKey<V, '$type'>
 
 export type $Type<Id extends string, Hash extends string> = Hash extends 'main'
-  ? Id | `${Id}#${Hash}`
+  ? Id
   : `${Id}#${Hash}`
 
 function isObject<V>(v: V): v is V & object {
   return v != null && typeof v === 'object'
 }
 
-function check$type<Id extends string, Hash extends string>(
+function compare$type<Id extends string, Hash extends string>(
   $type: unknown,
   id: Id,
   hash: Hash,
 ): $type is $Type<Id, Hash> {
-  return $type === id
-    ? hash === 'main'
+  return hash === 'main'
+    ? $type === id
     : // $type === `${id}#${hash}`
       typeof $type === 'string' &&
         $type.length === id.length + 1 + hash.length &&
@@ -30,13 +33,17 @@ function check$type<Id extends string, Hash extends string>(
         $type.endsWith(hash)
 }
 
-export type Is$Typed<V, Id extends string, Hash extends string> = V extends {
+export type $TypedObject<
+  V,
+  Id extends string,
+  Hash extends string,
+> = V extends {
   $type: $Type<Id, Hash>
 }
   ? V
   : V extends { $type?: string }
-    ? V extends { $type?: $Type<Id, Hash> }
-      ? $Typed<V>
+    ? V extends { $type?: infer T extends $Type<Id, Hash> }
+      ? V & { $type: T }
       : never
     : V & { $type: $Type<Id, Hash> }
 
@@ -44,8 +51,8 @@ export function is$typed<V, Id extends string, Hash extends string>(
   v: V,
   id: Id,
   hash: Hash,
-): v is Is$Typed<V, Id, Hash> {
-  return isObject(v) && '$type' in v && check$type(v.$type, id, hash)
+): v is $TypedObject<V, Id, Hash> {
+  return isObject(v) && '$type' in v && compare$type(v.$type, id, hash)
 }
 
 export function maybe$typed<V, Id extends string, Hash extends string>(
@@ -56,7 +63,19 @@ export function maybe$typed<V, Id extends string, Hash extends string>(
   return (
     isObject(v) &&
     ('$type' in v
-      ? v.$type === undefined || check$type(v.$type, id, hash)
+      ? v.$type === undefined || compare$type(v.$type, id, hash)
       : true)
   )
 }
+
+export type Validator<R = unknown> = (v: unknown) => ValidationResult<R>
+export type ValidatorParam<V extends Validator> =
+  V extends Validator<infer R> ? R : never
+
+/**
+ * Utility function that allows to convert a "validate*" utility function into a
+ * type predicate.
+ */
+export function asPredicate<V extends Validator>(validate: V) {
+  return <T,>(v: T): v is T & ValidatorParam<V> => validate(v).success
+}

package/src/index.ts

@@ -15,6 +15,8 @@ export * from './const'
 export * from './util'
 export * from './client'
 export { schemas } from './client/lexicons'
+export type { $Type, $Typed, Un$Typed } from './client/util'
+export { asPredicate } from './client/util'
 export * from './rich-text/rich-text'
 export * from './rich-text/sanitization'
 export * from './rich-text/unicode'

package/src/mocker.ts

@@ -7,7 +7,7 @@ import {
   AppBskyGraphDefs,
   AppBskyNotificationListNotifications,
 } from './client'
-import { $Typed } from './client/util'
+import { $Typed, Un$Typed } from './client/util'
 
 const FAKE_CID = 'bafyreiclp443lavogvhj3d2ob2cxbfuscni2k5jk7bebjzg7khl3esabwq'
 
@@ -160,7 +160,7 @@ export const mock = {
     labels,
   }: {
     record: AppBskyFeedPost.Record
-    author: Omit<AppBskyActorDefs.ProfileViewBasic, '$type'>
+    author: Un$Typed<AppBskyActorDefs.ProfileViewBasic>
     labels?: ComAtprotoLabelDefs.Label[]
   }): AppBskyNotificationListNotifications.Notification {
     return {
@@ -181,7 +181,7 @@ export const mock = {
     subjectDid,
     labels,
   }: {
-    author: Omit<AppBskyActorDefs.ProfileViewBasic, '$type'>
+    author: Un$Typed<AppBskyActorDefs.ProfileViewBasic>
     subjectDid: string
     labels?: ComAtprotoLabelDefs.Label[]
   }): AppBskyNotificationListNotifications.Notification {

package/src/moderation/const/labels.ts

@@ -9,6 +9,7 @@ export type KnownLabelValue =
   | 'sexual'
   | 'nudity'
   | 'graphic-media'
+  | 'gore'
 
 export const DEFAULT_LABEL_SETTINGS: Record<string, LabelPreference> = {
   porn: 'hide',
@@ -193,4 +194,27 @@ export const LABELS: Record<KnownLabelValue, InterpretedLabelValueDefinition> =
       },
       locales: [],
     },
+    /** @deprecated alias for `graphic-media` */
+    gore: {
+      identifier: 'gore',
+      flags: ['adult'],
+      configurable: true,
+      defaultSetting: 'warn',
+      severity: 'none',
+      blurs: 'media',
+      behaviors: {
+        account: {
+          avatar: 'blur',
+          banner: 'blur',
+        },
+        profile: {
+          avatar: 'blur',
+          banner: 'blur',
+        },
+        content: {
+          contentMedia: 'blur',
+        },
+      },
+      locales: [],
+    },
   }

package/src/moderation/decision.ts

@@ -32,9 +32,7 @@ export class ModerationDecision {
   static merge(
     ...decisions: (ModerationDecision | undefined)[]
   ): ModerationDecision {
-    const decisionsFiltered: ModerationDecision[] = decisions.filter(
-      (v) => !!v,
-    ) as ModerationDecision[]
+    const decisionsFiltered = decisions.filter((v) => v != null)
     const decision = new ModerationDecision()
     if (decisionsFiltered[0]) {
       decision.did = decisionsFiltered[0].did

package/src/moderation/subjects/post.ts

@@ -11,10 +11,23 @@ import { ModerationSubjectPost, ModerationOpts } from '../types'
 import { hasMutedWord } from '../mutewords'
 import { decideAccount } from './account'
 import { decideProfile } from './profile'
+import { $Typed } from '../../client/util'
 
 export function decidePost(
   subject: ModerationSubjectPost,
   opts: ModerationOpts,
+): ModerationDecision {
+  return ModerationDecision.merge(
+    decideSubject(subject, opts),
+    decideEmbed(subject.embed, opts)?.downgrade(),
+    decideAccount(subject.author, opts),
+    decideProfile(subject.author, opts),
+  )
+}
+
+function decideSubject(
+  subject: ModerationSubjectPost,
+  opts: ModerationOpts,
 ): ModerationDecision {
   const acc = new ModerationDecision()
 
@@ -30,43 +43,48 @@ export function decidePost(
     acc.addMutedWord(checkMutedWords(subject, opts.prefs.mutedWords))
   }
 
-  let embedAcc
-  if (subject.embed) {
+  return acc
+}
+
+function decideEmbed(
+  embed:
+    | undefined
+    | $Typed<AppBskyEmbedRecord.View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string },
+  opts: ModerationOpts,
+) {
+  if (embed) {
     if (
-      (AppBskyEmbedRecord.isView(subject.embed) ||
-        AppBskyEmbedRecordWithMedia.isView(subject.embed)) &&
-      AppBskyEmbedRecord.isViewRecord(subject.embed.record)
+      (AppBskyEmbedRecord.isView(embed) ||
+        AppBskyEmbedRecordWithMedia.isView(embed)) &&
+      AppBskyEmbedRecord.isViewRecord(embed.record)
     ) {
       // quote post
-      embedAcc = decideQuotedPost(subject.embed.record, opts)
+      return decideQuotedPost(embed.record, opts)
     } else if (
-      AppBskyEmbedRecordWithMedia.isView(subject.embed) &&
-      AppBskyEmbedRecord.isViewRecord(subject.embed.record.record)
+      AppBskyEmbedRecordWithMedia.isView(embed) &&
+      AppBskyEmbedRecord.isViewRecord(embed.record.record)
     ) {
       // quoted post with media
-      embedAcc = decideQuotedPost(subject.embed.record.record, opts)
+      return decideQuotedPost(embed.record.record, opts)
     } else if (
-      (AppBskyEmbedRecord.isView(subject.embed) ||
-        AppBskyEmbedRecordWithMedia.isView(subject.embed)) &&
-      AppBskyEmbedRecord.isViewBlocked(subject.embed.record)
+      (AppBskyEmbedRecord.isView(embed) ||
+        AppBskyEmbedRecordWithMedia.isView(embed)) &&
+      AppBskyEmbedRecord.isViewBlocked(embed.record)
     ) {
       // blocked quote post
-      embedAcc = decideBlockedQuotedPost(subject.embed.record, opts)
+      return decideBlockedQuotedPost(embed.record, opts)
     } else if (
-      AppBskyEmbedRecordWithMedia.isView(subject.embed) &&
-      AppBskyEmbedRecord.isViewBlocked(subject.embed.record.record)
+      AppBskyEmbedRecordWithMedia.isView(embed) &&
+      AppBskyEmbedRecord.isViewBlocked(embed.record.record)
     ) {
       // blocked quoted post with media
-      embedAcc = decideBlockedQuotedPost(subject.embed.record.record, opts)
+      return decideBlockedQuotedPost(embed.record.record, opts)
     }
   }
 
-  return ModerationDecision.merge(
-    acc,
-    embedAcc?.downgrade(),
-    decideAccount(subject.author, opts),
-    decideProfile(subject.author, opts),
-  )
+  return undefined
 }
 
 function decideQuotedPost(

package/src/moderation/types.ts

@@ -4,6 +4,7 @@ import {
   AppBskyNotificationListNotifications,
   AppBskyGraphDefs,
   ComAtprotoLabelDefs,
+  ChatBskyActorDefs,
 } from '../client/index'
 import { KnownLabelValue } from './const/labels'
 
@@ -87,6 +88,7 @@ export type ModerationSubjectProfile =
   | AppBskyActorDefs.ProfileViewBasic
   | AppBskyActorDefs.ProfileView
   | AppBskyActorDefs.ProfileViewDetailed
+  | ChatBskyActorDefs.ProfileViewBasic
 
 export type ModerationSubjectPost = AppBskyFeedDefs.PostView
 

package/src/moderation/util.ts

@@ -4,6 +4,7 @@ import {
   AppBskyLabelerDefs,
   ComAtprotoLabelDefs,
 } from '../client'
+import { asPredicate } from '../client/util'
 import {
   InterpretedLabelValueDefinition,
   ModerationBehavior,
@@ -103,10 +104,7 @@ export function interpretLabelValueDefinitions(
   labelerView: AppBskyLabelerDefs.LabelerViewDetailed,
 ): InterpretedLabelValueDefinition[] {
   return (labelerView.policies?.labelValueDefinitions || [])
-    .filter(
-      (labelValDef) =>
-        ComAtprotoLabelDefs.validateLabelValueDefinition(labelValDef).success,
-    )
+    .filter(asPredicate(ComAtprotoLabelDefs.validateLabelValueDefinition))
     .map((labelValDef) =>
       interpretLabelValueDefinition(labelValDef, labelerView.creator.did),
     )