@atproto/api 0.12.1 → 0.12.3

package/src/client/types/app/bsky/feed/defs.ts

@@ -69,6 +69,8 @@ export interface FeedViewPost {
   post: PostView
   reply?: ReplyRef
   reason?: ReasonRepost | { $type: string; [k: string]: unknown }
+  /** Context provided by feed generator that may be passed back alongside interactions. */
+  feedContext?: string
   [k: string]: unknown
 }
 
@@ -219,6 +221,7 @@ export interface GeneratorView {
   descriptionFacets?: AppBskyRichtextFacet.Main[]
   avatar?: string
   likeCount?: number
+  acceptsInteractions?: boolean
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: GeneratorViewerState
   indexedAt: string
@@ -257,6 +260,8 @@ export function validateGeneratorViewerState(v: unknown): ValidationResult {
 export interface SkeletonFeedPost {
   post: string
   reason?: SkeletonReasonRepost | { $type: string; [k: string]: unknown }
+  /** Context that will be passed through to client and may be passed to feed generator back alongside interactions. */
+  feedContext?: string
   [k: string]: unknown
 }
 
@@ -308,3 +313,61 @@ export function isThreadgateView(v: unknown): v is ThreadgateView {
 export function validateThreadgateView(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.feed.defs#threadgateView', v)
 }
+
+export interface Interaction {
+  item?: string
+  event?:
+    | 'app.bsky.feed.defs#requestLess'
+    | 'app.bsky.feed.defs#requestMore'
+    | 'app.bsky.feed.defs#clickthroughItem'
+    | 'app.bsky.feed.defs#clickthroughAuthor'
+    | 'app.bsky.feed.defs#clickthroughReposter'
+    | 'app.bsky.feed.defs#clickthroughEmbed'
+    | 'app.bsky.feed.defs#interactionSeen'
+    | 'app.bsky.feed.defs#interactionLike'
+    | 'app.bsky.feed.defs#interactionRepost'
+    | 'app.bsky.feed.defs#interactionReply'
+    | 'app.bsky.feed.defs#interactionQuote'
+    | 'app.bsky.feed.defs#interactionShare'
+    | (string & {})
+  /** Context on a feed item that was orginally supplied by the feed generator on getFeedSkeleton. */
+  feedContext?: string
+  [k: string]: unknown
+}
+
+export function isInteraction(v: unknown): v is Interaction {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.feed.defs#interaction'
+  )
+}
+
+export function validateInteraction(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.feed.defs#interaction', v)
+}
+
+/** Request that less content like the given feed item be shown in the feed */
+export const REQUESTLESS = 'app.bsky.feed.defs#requestLess'
+/** Request that more content like the given feed item be shown in the feed */
+export const REQUESTMORE = 'app.bsky.feed.defs#requestMore'
+/** User clicked through to the feed item */
+export const CLICKTHROUGHITEM = 'app.bsky.feed.defs#clickthroughItem'
+/** User clicked through to the author of the feed item */
+export const CLICKTHROUGHAUTHOR = 'app.bsky.feed.defs#clickthroughAuthor'
+/** User clicked through to the reposter of the feed item */
+export const CLICKTHROUGHREPOSTER = 'app.bsky.feed.defs#clickthroughReposter'
+/** User clicked through to the embedded content of the feed item */
+export const CLICKTHROUGHEMBED = 'app.bsky.feed.defs#clickthroughEmbed'
+/** Feed item was seen by user */
+export const INTERACTIONSEEN = 'app.bsky.feed.defs#interactionSeen'
+/** User liked the feed item */
+export const INTERACTIONLIKE = 'app.bsky.feed.defs#interactionLike'
+/** User reposted the feed item */
+export const INTERACTIONREPOST = 'app.bsky.feed.defs#interactionRepost'
+/** User replied to the feed item */
+export const INTERACTIONREPLY = 'app.bsky.feed.defs#interactionReply'
+/** User quoted the feed item */
+export const INTERACTIONQUOTE = 'app.bsky.feed.defs#interactionQuote'
+/** User shared the feed item */
+export const INTERACTIONSHARE = 'app.bsky.feed.defs#interactionShare'

package/src/client/types/app/bsky/feed/generator.ts

@@ -14,6 +14,8 @@ export interface Record {
   description?: string
   descriptionFacets?: AppBskyRichtextFacet.Main[]
   avatar?: BlobRef
+  /** Declaration that a feed accepts feedback interactions from a client through app.bsky.feed.sendInteractions */
+  acceptsInteractions?: boolean
   labels?:
     | ComAtprotoLabelDefs.SelfLabels
     | { $type: string; [k: string]: unknown }

package/src/client/types/app/bsky/feed/searchPosts.ts

@@ -11,6 +11,24 @@ import * as AppBskyFeedDefs from './defs'
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
+  /** Specifies the ranking order of results. */
+  sort?: 'top' | 'latest' | (string & {})
+  /** Filter results for posts after the indicated datetime (inclusive). Expected to use 'sortAt' timestamp, which may not match 'createdAt'. Can be a datetime, or just an ISO date (YYYY-MM-DD). */
+  since?: string
+  /** Filter results for posts before the indicated datetime (not inclusive). Expected to use 'sortAt' timestamp, which may not match 'createdAt'. Can be a datetime, or just an ISO date (YYY-MM-DD). */
+  until?: string
+  /** Filter to posts which mention the given account. Handles are resolved to DID before query-time. Only matches rich-text facet mentions. */
+  mentions?: string
+  /** Filter to posts by the given account. Handles are resolved to DID before query-time. */
+  author?: string
+  /** Filter to posts in the given language. Expected to be based on post language field, though server may override language detection. */
+  lang?: string
+  /** Filter to posts with URLs (facet links or embeds) linking to the given domain (hostname). Server may apply hostname normalization. */
+  domain?: string
+  /** Filter to posts with links (facet links or embeds) pointing to this URL. Server may apply URL normalization or fuzzy matching. */
+  url?: string
+  /** Filter to posts with the given tag (hashtag), based on rich-text facet or tag field. Do not include the hash (#) prefix. Multiple tags can be specified, with 'AND' matching. */
+  tag?: string[]
   limit?: number
   /** Optional pagination mechanism; may not necessarily allow scrolling through entire result set. */
   cursor?: string

package/src/client/types/app/bsky/feed/sendInteractions.ts

@@ -0,0 +1,38 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { Headers, XRPCError } from '@atproto/xrpc'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { isObj, hasProp } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+import { CID } from 'multiformats/cid'
+import * as AppBskyFeedDefs from './defs'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  interactions: AppBskyFeedDefs.Interaction[]
+  [k: string]: unknown
+}
+
+export interface OutputSchema {
+  [k: string]: unknown
+}
+
+export interface CallOptions {
+  headers?: Headers
+  qp?: QueryParams
+  encoding: 'application/json'
+}
+
+export interface Response {
+  success: boolean
+  headers: Headers
+  data: OutputSchema
+}
+
+export function toKnownErr(e: any) {
+  if (e instanceof XRPCError) {
+  }
+  return e
+}

package/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts

@@ -11,6 +11,8 @@ import * as AppBskyUnspeccedDefs from './defs'
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax. */
   q: string
+  /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
+  viewer?: string
   /** If true, acts as fast/simple 'typeahead' query. */
   typeahead?: boolean
   limit?: number

package/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts

@@ -11,6 +11,26 @@ import * as AppBskyUnspeccedDefs from './defs'
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
+  /** Specifies the ranking order of results. */
+  sort?: 'top' | 'latest' | (string & {})
+  /** Filter results for posts after the indicated datetime (inclusive). Expected to use 'sortAt' timestamp, which may not match 'createdAt'. Can be a datetime, or just an ISO date (YYYY-MM-DD). */
+  since?: string
+  /** Filter results for posts before the indicated datetime (not inclusive). Expected to use 'sortAt' timestamp, which may not match 'createdAt'. Can be a datetime, or just an ISO date (YYY-MM-DD). */
+  until?: string
+  /** Filter to posts which mention the given account. Handles are resolved to DID before query-time. Only matches rich-text facet mentions. */
+  mentions?: string
+  /** Filter to posts by the given account. Handles are resolved to DID before query-time. */
+  author?: string
+  /** Filter to posts in the given language. Expected to be based on post language field, though server may override language detection. */
+  lang?: string
+  /** Filter to posts with URLs (facet links or embeds) linking to the given domain (hostname). Server may apply hostname normalization. */
+  domain?: string
+  /** Filter to posts with links (facet links or embeds) pointing to this URL. Server may apply URL normalization or fuzzy matching. */
+  url?: string
+  /** Filter to posts with the given tag (hashtag), based on rich-text facet or tag field. Do not include the hash (#) prefix. Multiple tags can be specified, with 'AND' matching. */
+  tag?: string[]
+  /** DID of the account making the request (not included for public/unauthenticated queries). Used for 'from:me' queries. */
+  viewer?: string
   limit?: number
   /** Optional pagination mechanism; may not necessarily allow scrolling through entire result set. */
   cursor?: string

package/src/client/types/com/atproto/sync/getRecord.ts

@@ -13,7 +13,7 @@ export interface QueryParams {
   collection: string
   /** Record Key */
   rkey: string
-  /** An optional past commit CID. */
+  /** DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit */
   commit?: string
 }
 

package/src/moderation/mutewords.ts

@@ -82,38 +82,16 @@ export function hasMutedWord({
       if (mutedWord === wordTrimmedPunctuation) return true
       if (mutedWord.length > wordTrimmedPunctuation.length) continue
 
-      // handle hyphenated, slash separated words, etc
-      if (REGEX.SEPARATORS.test(wordTrimmedPunctuation)) {
-        // check against full normalized phrase
-        const wordNormalizedSeparators = wordTrimmedPunctuation.replace(
-          REGEX.SEPARATORS,
-          ' ',
-        )
-        const mutedWordNormalizedSeparators = mutedWord.replace(
-          REGEX.SEPARATORS,
-          ' ',
-        )
-        // hyphenated (or other sep) to spaced words
-        if (wordNormalizedSeparators === mutedWordNormalizedSeparators)
-          return true
+      if (/\p{P}+/u.test(wordTrimmedPunctuation)) {
+        const spacedWord = wordTrimmedPunctuation.replace(/\p{P}+/gu, ' ')
+        if (spacedWord === mutedWord) return true
 
-        /* Disabled for now e.g. `super-cool` to `supercool`
-        const wordNormalizedCompressed = wordNormalizedSeparators.replace(
-          REGEX.WORD_BOUNDARY,
-          '',
-        )
-        const mutedWordNormalizedCompressed =
-          mutedWordNormalizedSeparators.replace(/\s+?/g, '')
-        // hyphenated (or other sep) to non-hyphenated contiguous word
-        if (mutedWordNormalizedCompressed === wordNormalizedCompressed)
-          return true
-        */
+        const contiguousWord = spacedWord.replace(/\s/gu, '')
+        if (contiguousWord === mutedWord) return true
 
-        // then individual parts of separated phrases/words
-        const wordParts = wordTrimmedPunctuation.split(REGEX.SEPARATORS)
-        for (const wp of wordParts) {
-          // still retain internal punctuation
-          if (wp === mutedWord) return true
+        const wordParts = wordTrimmedPunctuation.split(/\p{P}+/u)
+        for (const wordPart of wordParts) {
+          if (wordPart === mutedWord) return true
         }
       }
     }

package/src/moderation/ui.ts

@@ -1,7 +1,7 @@
 import { ModerationCause } from './types'
 
 export class ModerationUI {
-  noOverride: boolean = false
+  noOverride = false
   filters: ModerationCause[] = []
   blurs: ModerationCause[] = []
   alerts: ModerationCause[] = []

package/src/moderation/util.ts

@@ -38,8 +38,8 @@ export function interpretLabelValueDefinition(
     def.severity === 'alert'
       ? 'alert'
       : def.severity === 'inform'
-      ? 'inform'
-      : undefined
+        ? 'inform'
+        : undefined
   if (def.blurs === 'content') {
     // target=account, blurs=content
     behaviors.account.profileList = alertOrInform

package/src/rich-text/rich-text.ts

@@ -117,7 +117,10 @@ export interface RichTextOpts {
 }
 
 export class RichTextSegment {
-  constructor(public text: string, public facet?: Facet) {}
+  constructor(
+    public text: string,
+    public facet?: Facet,
+  ) {}
 
   get link(): FacetLink | undefined {
     const link = this.facet?.features.find(AppBskyRichtextFacet.isLink)

package/tests/bsky-agent.test.ts

@@ -1582,6 +1582,13 @@ describe('agent', () => {
         expect(end.mutedWords.find((m) => m.value === '##️⃣')).toBeFalsy()
       })
 
+      it(`apostrophe: Bluesky's`, async () => {
+        await agent.upsertMutedWords([{ value: `Bluesky's`, targets: [] }])
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
+
+        expect(mutedWords.find((m) => m.value === `Bluesky's`)).toBeTruthy()
+      })
+
       describe(`invalid characters`, () => {
         it('zero width space', async () => {
           const prev = (await agent.getPreferences()).moderationPrefs

package/tests/moderation-mutewords.test.ts

@@ -89,6 +89,22 @@ describe(`hasMutedWord`, () => {
       expect(match).toBe(true)
     })
 
+    it(`match: single char with length > 1 ☠︎`, () => {
+      const rt = new RichText({
+        text: `Idk why ☠︎ but maybe`,
+      })
+      rt.detectFacetsWithoutResolution()
+
+      const match = hasMutedWord({
+        mutedWords: [{ value: '☠︎', targets: ['content'] }],
+        text: rt.text,
+        facets: rt.facets,
+        outlineTags: [],
+      })
+
+      expect(match).toBe(true)
+    })
+
     it(`no match: long muted word, short post`, () => {
       const rt = new RichText({
         text: `hey`,
@@ -248,6 +264,57 @@ describe(`hasMutedWord`, () => {
       })
     })
 
+    describe(`apostrophes: Bluesky's`, () => {
+      const rt = new RichText({
+        text: `Yay, Bluesky's mutewords work`,
+      })
+      rt.detectFacetsWithoutResolution()
+
+      it(`match: Bluesky's`, () => {
+        const match = hasMutedWord({
+          mutedWords: [{ value: `Bluesky's`, targets: ['content'] }],
+          text: rt.text,
+          facets: rt.facets,
+          outlineTags: [],
+        })
+
+        expect(match).toBe(true)
+      })
+
+      it(`match: Bluesky`, () => {
+        const match = hasMutedWord({
+          mutedWords: [{ value: 'Bluesky', targets: ['content'] }],
+          text: rt.text,
+          facets: rt.facets,
+          outlineTags: [],
+        })
+
+        expect(match).toBe(true)
+      })
+
+      it(`match: bluesky`, () => {
+        const match = hasMutedWord({
+          mutedWords: [{ value: 'bluesky', targets: ['content'] }],
+          text: rt.text,
+          facets: rt.facets,
+          outlineTags: [],
+        })
+
+        expect(match).toBe(true)
+      })
+
+      it(`match: blueskys`, () => {
+        const match = hasMutedWord({
+          mutedWords: [{ value: 'blueskys', targets: ['content'] }],
+          text: rt.text,
+          facets: rt.facets,
+          outlineTags: [],
+        })
+
+        expect(match).toBe(true)
+      })
+    })
+
     describe(`Why so S@assy?`, () => {
       const rt = new RichText({
         text: `Why so S@assy?`,
@@ -398,6 +465,17 @@ describe(`hasMutedWord`, () => {
         expect(match).toBe(true)
       })
 
+      it(`match: bad`, () => {
+        const match = hasMutedWord({
+          mutedWords: [{ value: `bad`, targets: ['content'] }],
+          text: rt.text,
+          facets: rt.facets,
+          outlineTags: [],
+        })
+
+        expect(match).toBe(true)
+      })
+
       it(`match: super bad`, () => {
         const match = hasMutedWord({
           mutedWords: [{ value: `super bad`, targets: ['content'] }],
@@ -417,7 +495,7 @@ describe(`hasMutedWord`, () => {
           outlineTags: [],
         })
 
-        expect(match).toBe(false)
+        expect(match).toBe(true)
       })
     })
 
@@ -474,7 +552,7 @@ describe(`hasMutedWord`, () => {
           outlineTags: [],
         })
 
-        expect(match).toBe(false)
+        expect(match).toBe(true)
       })
     })
 

package/tests/util/moderation-behavior.ts

@@ -63,7 +63,7 @@ expect.extend({
   toBeModerationResult(
     actual: ModerationUI,
     expected: ModerationTestSuiteResultFlag[] | undefined,
-    context: string = '',
+    context = '',
     stringifiedResult: string | undefined = undefined,
     _ignoreCause = false,
   ) {