@atproto/bsky 0.0.37 → 0.0.39

package/src/lexicon/types/com/atproto/label/defs.ts

@@ -8,6 +8,8 @@ import { CID } from 'multiformats/cid'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
+  /** The AT Protocol version of the label object. */
+  ver?: number
   /** DID of the actor who created this label. */
   src: string
   /** AT URI of the record, repository (account), or other resource that this label applies to. */
@@ -20,6 +22,10 @@ export interface Label {
   neg?: boolean
   /** Timestamp when this label was created. */
   cts: string
+  /** Timestamp at which this label expires (no longer applies). */
+  exp?: string
+  /** Signature of dag-cbor encoded label. */
+  sig?: Uint8Array
   [k: string]: unknown
 }
 
@@ -71,3 +77,75 @@ export function isSelfLabel(v: unknown): v is SelfLabel {
 export function validateSelfLabel(v: unknown): ValidationResult {
   return lexicons.validate('com.atproto.label.defs#selfLabel', v)
 }
+
+/** Declares a label value and its expected interpertations and behaviors. */
+export interface LabelValueDefinition {
+  /** The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+). */
+  identifier: string
+  /** How should a client visually convey this label? 'inform' means neutral and informational; 'alert' means negative and warning; 'none' means show nothing. */
+  severity: 'inform' | 'alert' | 'none' | (string & {})
+  /** What should this label hide in the UI, if applied? 'content' hides all of the target; 'media' hides the images/video/audio; 'none' hides nothing. */
+  blurs: 'content' | 'media' | 'none' | (string & {})
+  /** The default setting for this label. */
+  defaultSetting: 'ignore' | 'warn' | 'hide' | (string & {})
+  /** Does the user need to have adult content enabled in order to configure this label? */
+  adultOnly?: boolean
+  locales: LabelValueDefinitionStrings[]
+  [k: string]: unknown
+}
+
+export function isLabelValueDefinition(v: unknown): v is LabelValueDefinition {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.label.defs#labelValueDefinition'
+  )
+}
+
+export function validateLabelValueDefinition(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.label.defs#labelValueDefinition', v)
+}
+
+/** Strings which describe the label in the UI, localized into a specific language. */
+export interface LabelValueDefinitionStrings {
+  /** The code of the language these strings are written in. */
+  lang: string
+  /** A short human-readable name for the label. */
+  name: string
+  /** A longer description of what the label means and why it might be applied. */
+  description: string
+  [k: string]: unknown
+}
+
+export function isLabelValueDefinitionStrings(
+  v: unknown,
+): v is LabelValueDefinitionStrings {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.label.defs#labelValueDefinitionStrings'
+  )
+}
+
+export function validateLabelValueDefinitionStrings(
+  v: unknown,
+): ValidationResult {
+  return lexicons.validate(
+    'com.atproto.label.defs#labelValueDefinitionStrings',
+    v,
+  )
+}
+
+export type LabelValue =
+  | '!hide'
+  | '!no-promote'
+  | '!warn'
+  | '!no-unauthenticated'
+  | 'dmca-violation'
+  | 'doxxing'
+  | 'porn'
+  | 'sexual'
+  | 'nudity'
+  | 'nsfl'
+  | 'gore'
+  | (string & {})

package/src/lexicon/types/com/atproto/server/describeServer.ts

@@ -20,6 +20,7 @@ export interface OutputSchema {
   /** List of domain suffixes that can be used in account handles. */
   availableUserDomains: string[]
   links?: Links
+  contact?: Contact
   did: string
   [k: string]: unknown
 }
@@ -66,3 +67,20 @@ export function isLinks(v: unknown): v is Links {
 export function validateLinks(v: unknown): ValidationResult {
   return lexicons.validate('com.atproto.server.describeServer#links', v)
 }
+
+export interface Contact {
+  email?: string
+  [k: string]: unknown
+}
+
+export function isContact(v: unknown): v is Contact {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.server.describeServer#contact'
+  )
+}
+
+export function validateContact(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+}

package/src/proto/bsky_connect.ts

@@ -74,6 +74,8 @@ import {
   GetIdentityByHandleResponse,
   GetInteractionCountsRequest,
   GetInteractionCountsResponse,
+  GetLabelerRecordsRequest,
+  GetLabelerRecordsResponse,
   GetLabelsRequest,
   GetLabelsResponse,
   GetLatestRevRequest,
@@ -272,6 +274,15 @@ export const Service = {
       O: GetThreadGateRecordsResponse,
       kind: MethodKind.Unary,
     },
+    /**
+     * @generated from rpc bsky.Service.GetLabelerRecords
+     */
+    getLabelerRecords: {
+      name: 'GetLabelerRecords',
+      I: GetLabelerRecordsRequest,
+      O: GetLabelerRecordsResponse,
+      kind: MethodKind.Unary,
+    },
     /**
      * Follows
      *

package/src/proto/bsky_pb.ts

@@ -1474,6 +1474,122 @@ export class GetThreadGateRecordsResponse extends Message<GetThreadGateRecordsRe
   }
 }
 
+/**
+ * @generated from message bsky.GetLabelerRecordsRequest
+ */
+export class GetLabelerRecordsRequest extends Message<GetLabelerRecordsRequest> {
+  /**
+   * @generated from field: repeated string uris = 1;
+   */
+  uris: string[] = []
+
+  constructor(data?: PartialMessage<GetLabelerRecordsRequest>) {
+    super()
+    proto3.util.initPartial(data, this)
+  }
+
+  static readonly runtime: typeof proto3 = proto3
+  static readonly typeName = 'bsky.GetLabelerRecordsRequest'
+  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+    {
+      no: 1,
+      name: 'uris',
+      kind: 'scalar',
+      T: 9 /* ScalarType.STRING */,
+      repeated: true,
+    },
+  ])
+
+  static fromBinary(
+    bytes: Uint8Array,
+    options?: Partial<BinaryReadOptions>,
+  ): GetLabelerRecordsRequest {
+    return new GetLabelerRecordsRequest().fromBinary(bytes, options)
+  }
+
+  static fromJson(
+    jsonValue: JsonValue,
+    options?: Partial<JsonReadOptions>,
+  ): GetLabelerRecordsRequest {
+    return new GetLabelerRecordsRequest().fromJson(jsonValue, options)
+  }
+
+  static fromJsonString(
+    jsonString: string,
+    options?: Partial<JsonReadOptions>,
+  ): GetLabelerRecordsRequest {
+    return new GetLabelerRecordsRequest().fromJsonString(jsonString, options)
+  }
+
+  static equals(
+    a:
+      | GetLabelerRecordsRequest
+      | PlainMessage<GetLabelerRecordsRequest>
+      | undefined,
+    b:
+      | GetLabelerRecordsRequest
+      | PlainMessage<GetLabelerRecordsRequest>
+      | undefined,
+  ): boolean {
+    return proto3.util.equals(GetLabelerRecordsRequest, a, b)
+  }
+}
+
+/**
+ * @generated from message bsky.GetLabelerRecordsResponse
+ */
+export class GetLabelerRecordsResponse extends Message<GetLabelerRecordsResponse> {
+  /**
+   * @generated from field: repeated bsky.Record records = 1;
+   */
+  records: Record[] = []
+
+  constructor(data?: PartialMessage<GetLabelerRecordsResponse>) {
+    super()
+    proto3.util.initPartial(data, this)
+  }
+
+  static readonly runtime: typeof proto3 = proto3
+  static readonly typeName = 'bsky.GetLabelerRecordsResponse'
+  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+    { no: 1, name: 'records', kind: 'message', T: Record, repeated: true },
+  ])
+
+  static fromBinary(
+    bytes: Uint8Array,
+    options?: Partial<BinaryReadOptions>,
+  ): GetLabelerRecordsResponse {
+    return new GetLabelerRecordsResponse().fromBinary(bytes, options)
+  }
+
+  static fromJson(
+    jsonValue: JsonValue,
+    options?: Partial<JsonReadOptions>,
+  ): GetLabelerRecordsResponse {
+    return new GetLabelerRecordsResponse().fromJson(jsonValue, options)
+  }
+
+  static fromJsonString(
+    jsonString: string,
+    options?: Partial<JsonReadOptions>,
+  ): GetLabelerRecordsResponse {
+    return new GetLabelerRecordsResponse().fromJsonString(jsonString, options)
+  }
+
+  static equals(
+    a:
+      | GetLabelerRecordsResponse
+      | PlainMessage<GetLabelerRecordsResponse>
+      | undefined,
+    b:
+      | GetLabelerRecordsResponse
+      | PlainMessage<GetLabelerRecordsResponse>
+      | undefined,
+  ): boolean {
+    return proto3.util.equals(GetLabelerRecordsResponse, a, b)
+  }
+}
+
 /**
  * - Return follow uris where user A follows users B, C, D, …
  *     - E.g. for viewer state on `getProfiles`
@@ -2595,6 +2711,16 @@ export class GetCountsForUsersResponse extends Message<GetCountsForUsersResponse
    */
   followers: number[] = []
 
+  /**
+   * @generated from field: repeated int32 lists = 5;
+   */
+  lists: number[] = []
+
+  /**
+   * @generated from field: repeated int32 feeds = 6;
+   */
+  feeds: number[] = []
+
   constructor(data?: PartialMessage<GetCountsForUsersResponse>) {
     super()
     proto3.util.initPartial(data, this)
@@ -2631,6 +2757,20 @@ export class GetCountsForUsersResponse extends Message<GetCountsForUsersResponse
       T: 5 /* ScalarType.INT32 */,
       repeated: true,
     },
+    {
+      no: 5,
+      name: 'lists',
+      kind: 'scalar',
+      T: 5 /* ScalarType.INT32 */,
+      repeated: true,
+    },
+    {
+      no: 6,
+      name: 'feeds',
+      kind: 'scalar',
+      T: 5 /* ScalarType.INT32 */,
+      repeated: true,
+    },
   ])
 
   static fromBinary(
@@ -3227,6 +3367,11 @@ export class ActorInfo extends Message<ActorInfo> {
    */
   tombstonedAt?: Timestamp
 
+  /**
+   * @generated from field: bool labeler = 7;
+   */
+  labeler = false
+
   constructor(data?: PartialMessage<ActorInfo>) {
     super()
     proto3.util.initPartial(data, this)
@@ -3246,6 +3391,7 @@ export class ActorInfo extends Message<ActorInfo> {
       T: 9 /* ScalarType.STRING */,
     },
     { no: 6, name: 'tombstoned_at', kind: 'message', T: Timestamp },
+    { no: 7, name: 'labeler', kind: 'scalar', T: 8 /* ScalarType.BOOL */ },
   ])
 
   static fromBinary(

package/src/util.ts

@@ -0,0 +1,44 @@
+import { parseList } from 'structured-headers'
+
+export type ParsedLabelers = {
+  dids: string[]
+  redact: Set<string>
+}
+
+export const parseLabelerHeader = (
+  header: string | undefined,
+): ParsedLabelers | null => {
+  if (!header) return null
+  const labelerDids = new Set<string>()
+  const redactDids = new Set<string>()
+  const parsed = parseList(header)
+  for (const item of parsed) {
+    const did = item[0].toString()
+    if (!did) {
+      return null
+    }
+    labelerDids.add(did)
+    const redact = item[1].get('redact')?.valueOf()
+    if (redact === true) {
+      redactDids.add(did)
+    }
+  }
+  return {
+    dids: [...labelerDids],
+    redact: redactDids,
+  }
+}
+
+export const defaultLabelerHeader = (dids: string[]): ParsedLabelers => {
+  return {
+    dids,
+    redact: new Set(dids),
+  }
+}
+
+export const formatLabelerHeader = (parsed: ParsedLabelers): string => {
+  const parts = parsed.dids.map((did) =>
+    parsed.redact.has(did) ? `${did};redact` : did,
+  )
+  return parts.join(',')
+}

package/src/views/index.ts

@@ -48,6 +48,10 @@ import {
 import { Label } from '../hydration/label'
 import { FeedItem, Post, Repost } from '../hydration/feed'
 import { RecordInfo } from '../hydration/util'
+import {
+  LabelerView,
+  LabelerViewDetailed,
+} from '../lexicon/types/app/bsky/labeler/defs'
 import { Notification } from '../proto/bsky_pb'
 
 export class Views {
@@ -57,7 +61,9 @@ export class Views {
   // ------------
 
   actorIsTakendown(did: string, state: HydrationState): boolean {
-    return !!state.actors?.get(did)?.takedownRef
+    if (state.actors?.get(did)?.takedownRef) return true
+    if (state.labels?.get(did)?.isTakendown) return true
+    return false
   }
 
   viewerBlockExists(did: string, state: HydrationState): boolean {
@@ -98,6 +104,11 @@ export class Views {
       followersCount: profileAggs?.followers,
       followsCount: profileAggs?.follows,
       postsCount: profileAggs?.posts,
+      associated: {
+        lists: profileAggs?.lists,
+        feedgens: profileAggs?.feeds,
+        labeler: actor?.isLabeler,
+      },
     }
   }
 
@@ -125,8 +136,8 @@ export class Views {
       'self',
     ).toString()
     const labels = [
-      ...(state.labels?.get(did) ?? []),
-      ...(state.labels?.get(profileUri) ?? []),
+      ...(state.labels?.get(did)?.labels ?? []),
+      ...(state.labels?.get(profileUri)?.labels ?? []),
       ...this.selfLabels({
         uri: profileUri,
         cid: actor.profileCid?.toString(),
@@ -214,6 +225,7 @@ export class Views {
       return undefined
     }
     const listViewer = state.listViewers?.get(uri)
+    const labels = state.labels?.get(uri)?.labels ?? []
     const creator = new AtUri(uri).hostname
     return {
       uri,
@@ -228,6 +240,7 @@ export class Views {
           )
         : undefined,
       indexedAt: list.sortedAt.toISOString(),
+      labels,
       viewer: listViewer
         ? {
             muted: !!listViewer.viewerMuted,
@@ -254,10 +267,58 @@ export class Views {
         ? normalizeDatetimeAlways(record.createdAt)
         : new Date(0).toISOString()
     return record.labels.values.map(({ val }) => {
-      return { src, uri, cid, val, cts, neg: false }
+      return { src, uri, cid, val, cts }
     })
   }
 
+  labeler(did: string, state: HydrationState): LabelerView | undefined {
+    const labeler = state.labelers?.get(did)
+    if (!labeler) return
+    const creator = this.profile(did, state)
+    if (!creator) return
+    const viewer = state.labelerViewers?.get(did)
+    const aggs = state.labelerAggs?.get(did)
+
+    const uri = AtUri.make(did, ids.AppBskyLabelerService, 'self').toString()
+    const labels = [
+      ...(state.labels?.get(uri)?.labels ?? []),
+      ...this.selfLabels({
+        uri,
+        cid: labeler.cid.toString(),
+        record: labeler.record,
+      }),
+    ]
+
+    return {
+      uri,
+      cid: labeler.cid.toString(),
+      creator,
+      likeCount: aggs?.likes,
+      viewer: viewer
+        ? {
+            like: viewer.like,
+          }
+        : undefined,
+      indexedAt: labeler.sortedAt.toISOString(),
+      labels,
+    }
+  }
+
+  labelerDetailed(
+    did: string,
+    state: HydrationState,
+  ): LabelerViewDetailed | undefined {
+    const baseView = this.labeler(did, state)
+    if (!baseView) return
+    const record = state.labelers?.get(did)
+    if (!record) return
+
+    return {
+      ...baseView,
+      policies: record.record.policies,
+    }
+  }
+
   // Feed
   // ------------
 
@@ -290,6 +351,7 @@ export class Views {
     if (!creator) return
     const viewer = state.feedgenViewers?.get(uri)
     const aggs = state.feedgenAggs?.get(uri)
+    const labels = state.labels?.get(uri)?.labels ?? []
 
     return {
       uri,
@@ -307,6 +369,7 @@ export class Views {
           )
         : undefined,
       likeCount: aggs?.likes,
+      labels,
       viewer: viewer
         ? {
             like: viewer.like,
@@ -345,7 +408,7 @@ export class Views {
       parsedUri.rkey,
     ).toString()
     const labels = [
-      ...(state.labels?.get(uri) ?? []),
+      ...(state.labels?.get(uri)?.labels ?? []),
       ...this.selfLabels({
         uri,
         cid: post.cid,
@@ -728,6 +791,11 @@ export class Views {
       if (!view) return this.embedNotFound(uri)
       view.$type = 'app.bsky.graph.defs#listView'
       return this.recordEmbedWrapper(view, withTypeTag)
+    } else if (parsedUri.collection === ids.AppBskyLabelerService) {
+      const view = this.labeler(parsedUri.hostname, state)
+      if (!view) return this.embedNotFound(uri)
+      view.$type = 'app.bsky.labeler.defs#labelerView'
+      return this.recordEmbedWrapper(view, withTypeTag)
     }
     return this.embedNotFound(uri)
   }
@@ -771,7 +839,8 @@ export class Views {
     }
     const rootUriStr: string = post?.record.reply?.root.uri ?? uri
     const gate = state.threadgates?.get(postToGateUri(rootUriStr))?.record
-    if (!gate || !state.viewer) {
+    const viewer = state.ctx?.viewer
+    if (!gate || !viewer) {
       return undefined
     }
     const rootPost = state.posts?.get(rootUriStr)?.record
@@ -780,7 +849,7 @@ export class Views {
       canReply,
       allowFollowing,
       allowListUris = [],
-    } = parseThreadGate(state.viewer, ownerDid, rootPost ?? null, gate)
+    } = parseThreadGate(viewer, ownerDid, rootPost ?? null, gate)
     if (canReply) {
       return false
     }
@@ -817,7 +886,7 @@ export class Views {
       recordInfo = state.follows?.get(notif.uri)
     }
     if (!recordInfo) return
-    const labels = state.labels?.get(notif.uri) ?? []
+    const labels = state.labels?.get(notif.uri)?.labels ?? []
     const selfLabels = this.selfLabels({
       uri: notif.uri,
       cid: recordInfo.cid,

package/src/views/types.ts

@@ -9,8 +9,6 @@ import {
 import {
   Main as RecordEmbed,
   View as RecordEmbedView,
-  ViewBlocked as EmbedBlocked,
-  ViewNotFound as EmbedNotFound,
   ViewRecord as PostEmbedView,
 } from '../lexicon/types/app/bsky/embed/record'
 import {
@@ -24,6 +22,7 @@ import {
   PostView,
 } from '../lexicon/types/app/bsky/feed/defs'
 import { ListView } from '../lexicon/types/app/bsky/graph/defs'
+import { LabelerView } from '../lexicon/types/app/bsky/labeler/defs'
 
 export type {
   Main as ImagesEmbed,
@@ -69,4 +68,8 @@ export type EmbedView =
 
 export type MaybePostView = PostView | NotFoundPost | BlockedPost
 
-export type RecordEmbedViewInternal = PostEmbedView | GeneratorView | ListView
+export type RecordEmbedViewInternal =
+  | PostEmbedView
+  | GeneratorView
+  | ListView
+  | LabelerView