@atproto/ozone 0.1.5 → 0.1.7

package/src/lexicon/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/lexicon/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/lexicon/types/app/bsky/feed/searchPosts.ts

@@ -12,6 +12,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/lexicon/types/app/bsky/feed/sendInteractions.ts

@@ -0,0 +1,49 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+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 HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

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

@@ -12,6 +12,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/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts

@@ -12,6 +12,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/lexicon/types/com/atproto/sync/getRecord.ts

@@ -15,7 +15,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/mod-service/index.ts

@@ -759,7 +759,9 @@ export class ModerationService {
 
     if (tags.length) {
       builder = builder.where(
-        sql`${ref('moderation_subject_status.tags')} @> ${jsonb(tags)}`,
+        sql`${ref('moderation_subject_status.tags')} ?| array[${sql.join(
+          tags,
+        )}]::TEXT[]`,
       )
     }
 
@@ -767,9 +769,9 @@ export class ModerationService {
       builder = builder.where((qb) =>
         qb
           .where(
-            sql`NOT(${ref('moderation_subject_status.tags')} @> ${jsonb(
-              excludeTags,
-            )})`,
+            sql`NOT(${ref(
+              'moderation_subject_status.tags',
+            )} ?| array[${sql.join(excludeTags)}]::TEXT[])`,
           )
           .orWhere('tags', 'is', null),
       )
@@ -787,7 +789,6 @@ export class ModerationService {
       tryIndex: true,
       nullsLast: true,
     })
-
     const results = await paginatedBuilder.execute()
 
     const infos = await this.views.getAccoutInfosByDid(

package/src/sequencer/outbox.ts

@@ -13,7 +13,10 @@ export class Outbox {
   cutoverBuffer: LabelsEvt[]
   outBuffer: AsyncBuffer<LabelsEvt>
 
-  constructor(public sequencer: Sequencer, opts: Partial<OutboxOpts> = {}) {
+  constructor(
+    public sequencer: Sequencer,
+    opts: Partial<OutboxOpts> = {},
+  ) {
     const { maxBufferSize = 500 } = opts
     this.cutoverBuffer = []
     this.outBuffer = new AsyncBuffer<LabelsEvt>(maxBufferSize)

package/src/sequencer/sequencer.ts

@@ -18,7 +18,10 @@ export class Sequencer extends (EventEmitter as new () => SequencerEmitter) {
   queued = false
   conn: PoolClient | undefined
 
-  constructor(public modSrvc: ModerationService, public lastSeen = 0) {
+  constructor(
+    public modSrvc: ModerationService,
+    public lastSeen = 0,
+  ) {
     super()
     this.db = modSrvc.db
     // note: this does not err when surpassed, just prints a warning to stderr

package/tests/_util.ts

@@ -164,16 +164,16 @@ export const stripViewerFromPost = (postUnknown: unknown): PostView => {
     post.embed && isViewRecord(post.embed.record)
       ? post.embed.record // Record from record embed
       : post.embed?.['record'] && isViewRecord(post.embed['record']['record'])
-      ? post.embed['record']['record'] // Record from record-with-media embed
-      : undefined
+        ? post.embed['record']['record'] // Record from record-with-media embed
+        : undefined
   if (recordEmbed) {
     recordEmbed.author = stripViewer(recordEmbed.author)
     recordEmbed.embeds?.forEach((deepEmbed) => {
       const deepRecordEmbed = isViewRecord(deepEmbed.record)
         ? deepEmbed.record // Record from record embed
         : deepEmbed['record'] && isViewRecord(deepEmbed['record']['record'])
-        ? deepEmbed['record']['record'] // Record from record-with-media embed
-        : undefined
+          ? deepEmbed['record']['record'] // Record from record-with-media embed
+          : undefined
       if (deepRecordEmbed) {
         deepRecordEmbed.author = stripViewer(deepRecordEmbed.author)
       }

package/tests/communication-templates.test.ts

@@ -42,11 +42,11 @@ describe('communication-templates', () => {
         { ...templateOne, createdBy: sc.dids.bob },
         {
           encoding: 'application/json',
-          headers: await network.ozone.modHeaders('moderator'),
+          headers: await network.ozone.modHeaders('triage'),
         },
       )
       await expect(moderatorReq).rejects.toThrow(
-        'Must be an admin to create a communication template',
+        'Must be a moderator to create a communication template',
       )
       const modReq = await agent.api.tools.ozone.communication.createTemplate(
         { ...templateOne, createdBy: sc.dids.bob },
@@ -105,19 +105,19 @@ describe('communication-templates', () => {
         { id: '1' },
         {
           encoding: 'application/json',
-          headers: await network.ozone.modHeaders('moderator'),
+          headers: await network.ozone.modHeaders('triage'),
         },
       )
 
       await expect(modReq).rejects.toThrow(
-        'Must be an admin to delete a communication template',
+        'Must be a moderator to delete a communication template',
       )
 
       await agent.api.tools.ozone.communication.deleteTemplate(
         { id: '1' },
         {
           encoding: 'application/json',
-          headers: await network.ozone.modHeaders('admin'),
+          headers: await network.ozone.modHeaders('moderator'),
         },
       )
       const list = await listTemplates()

package/tests/moderation-statuses.test.ts

@@ -99,6 +99,33 @@ describe('moderation-statuses', () => {
       expect(nonKlingonQueue.subjectStatuses.map((s) => s.id)).not.toContain(
         klingonQueue.subjectStatuses[0].id,
       )
+
+      // Verify multi lang tag exclusion
+      Promise.all(
+        nonKlingonQueue.subjectStatuses.map((s, i) => {
+          return modClient.emitEvent({
+            subject: s.subject,
+            event: {
+              $type: 'tools.ozone.moderation.defs#modEventTag',
+              add: [i % 2 ? 'lang:jp' : 'lang:it'],
+              remove: [],
+              comment: 'Adding custom lang tag',
+            },
+            createdBy: sc.dids.alice,
+          })
+        }),
+      )
+
+      const queueWithoutKlingonAndItalian = await modClient.queryStatuses({
+        excludeTags: ['lang:i', 'lang:it'],
+      })
+
+      queueWithoutKlingonAndItalian.subjectStatuses
+        .map((s) => s.tags)
+        .flat()
+        .forEach((tag) => {
+          expect(['lang:it', 'lang:i']).not.toContain(tag)
+        })
     })
 
     it('returns paginated statuses', async () => {

package/tests/repo-search.test.ts

@@ -52,7 +52,7 @@ describe('admin repo search view', () => {
     const shouldContain = [
       'cara-wiegand69.test', // Present despite repo takedown
       'carlos6.test',
-      'carolina-mcdermott77.test',
+      'carolina-mcderm77.test',
     ]
 
     shouldContain.forEach((handle) => expect(handles).toContain(handle))