@atproto/ozone 0.1.6 → 0.1.8

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/server/createSession.ts

@@ -14,6 +14,7 @@ export interface InputSchema {
   /** Handle or other identifier supported by the server for the authenticating user. */
   identifier: string
   password: string
+  authFactorToken?: string
   [k: string]: unknown
 }
 
@@ -25,6 +26,7 @@ export interface OutputSchema {
   didDoc?: {}
   email?: string
   emailConfirmed?: boolean
+  emailAuthFactor?: boolean
   [k: string]: unknown
 }
 
@@ -42,7 +44,7 @@ export interface HandlerSuccess {
 export interface HandlerError {
   status: number
   message?: string
-  error?: 'AccountTakedown'
+  error?: 'AccountTakedown' | 'AuthFactorTokenRequired'
 }
 
 export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough

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

@@ -17,6 +17,7 @@ export interface OutputSchema {
   did: string
   email?: string
   emailConfirmed?: boolean
+  emailAuthFactor?: boolean
   didDoc?: {}
   [k: string]: unknown
 }

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

@@ -12,6 +12,7 @@ export interface QueryParams {}
 
 export interface InputSchema {
   email: string
+  emailAuthFactor?: boolean
   /** Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. */
   token?: string
   [k: string]: unknown

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/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))