@atproto/ozone 0.1.59 → 0.1.61

package/src/lexicon/lexicons.ts

@@ -9257,6 +9257,24 @@ export const schemaDict = {
           },
         },
       },
+      trendingTopic: {
+        type: 'object',
+        required: ['topic', 'link'],
+        properties: {
+          topic: {
+            type: 'string',
+          },
+          displayName: {
+            type: 'string',
+          },
+          description: {
+            type: 'string',
+          },
+          link: {
+            type: 'string',
+          },
+        },
+      },
     },
   },
   AppBskyUnspeccedGetConfig: {
@@ -9437,6 +9455,56 @@ export const schemaDict = {
       },
     },
   },
+  AppBskyUnspeccedGetTrendingTopics: {
+    lexicon: 1,
+    id: 'app.bsky.unspecced.getTrendingTopics',
+    defs: {
+      main: {
+        type: 'query',
+        description: 'Get a list of trending topics',
+        parameters: {
+          type: 'params',
+          properties: {
+            viewer: {
+              type: 'string',
+              format: 'did',
+              description:
+                'DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking.',
+            },
+            limit: {
+              type: 'integer',
+              minimum: 1,
+              maximum: 25,
+              default: 10,
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['topics', 'suggested'],
+            properties: {
+              topics: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:app.bsky.unspecced.defs#trendingTopic',
+                },
+              },
+              suggested: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:app.bsky.unspecced.defs#trendingTopic',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   AppBskyUnspeccedSearchActorsSkeleton: {
     lexicon: 1,
     id: 'app.bsky.unspecced.searchActorsSkeleton',
@@ -12430,6 +12498,9 @@ export const schemaDict = {
               type: 'array',
               items: {
                 type: 'string',
+                maxLength: 25,
+                description:
+                  'Items in this array are applied with OR filters. To apply AND filter, put all tags in the same string and separate using && characters',
               },
             },
             excludeTags: {
@@ -13686,6 +13757,7 @@ export const ids = {
     'app.bsky.unspecced.getSuggestionsSkeleton',
   AppBskyUnspeccedGetTaggedSuggestions:
     'app.bsky.unspecced.getTaggedSuggestions',
+  AppBskyUnspeccedGetTrendingTopics: 'app.bsky.unspecced.getTrendingTopics',
   AppBskyUnspeccedSearchActorsSkeleton:
     'app.bsky.unspecced.searchActorsSkeleton',
   AppBskyUnspeccedSearchPostsSkeleton: 'app.bsky.unspecced.searchPostsSkeleton',

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

@@ -63,3 +63,23 @@ export function validateSkeletonSearchStarterPack(
     v,
   )
 }
+
+export interface TrendingTopic {
+  topic: string
+  displayName?: string
+  description?: string
+  link: string
+  [k: string]: unknown
+}
+
+export function isTrendingTopic(v: unknown): v is TrendingTopic {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.unspecced.defs#trendingTopic'
+  )
+}
+
+export function validateTrendingTopic(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.unspecced.defs#trendingTopic', v)
+}

package/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.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 AppBskyUnspeccedDefs from './defs'
+
+export interface QueryParams {
+  /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
+  viewer?: string
+  limit: number
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  topics: AppBskyUnspeccedDefs.TrendingTopic[]
+  suggested: AppBskyUnspeccedDefs.TrendingTopic[]
+  [k: string]: unknown
+}
+
+export type HandlerInput = undefined
+
+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/mod-service/index.ts

@@ -1,5 +1,5 @@
 import net from 'node:net'
-import { Insertable, sql } from 'kysely'
+import { Insertable, SelectQueryBuilder, sql } from 'kysely'
 import { CID } from 'multiformats/cid'
 import { AtUri, INVALID_HANDLE } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
@@ -791,6 +791,45 @@ export class ModerationService {
     return result
   }
 
+  applyTagFilter = (
+    builder: SelectQueryBuilder<any, any, any>,
+    tags: string[],
+  ) => {
+    const { ref } = this.db.db.dynamic
+    // Build an array of conditions
+    const conditions = tags
+      .map((tag) => {
+        if (tag.includes('&&')) {
+          // Split by '&&' for AND logic
+          const subTags = tag
+            .split('&&')
+            // Make sure spaces on either sides of '&&' are trimmed
+            .map((subTag) => subTag.trim())
+            // Remove empty strings after trimming is applied
+            .filter(Boolean)
+
+          if (!subTags.length) return null
+
+          return sql`(${sql.join(
+            subTags.map(
+              (subTag) =>
+                sql`${ref('moderation_subject_status.tags')} ? ${subTag}`,
+            ),
+            sql` AND `,
+          )})`
+        } else {
+          // Single tag condition
+          return sql`${ref('moderation_subject_status.tags')} ? ${tag}`
+        }
+      })
+      .filter(Boolean)
+
+    if (!conditions.length) return builder
+
+    // Combine all conditions with OR
+    return builder.where(sql`(${sql.join(conditions, sql` OR `)})`)
+  }
+
   async getSubjectStatuses({
     includeAllUserRecords,
     cursor,
@@ -958,11 +997,7 @@ export class ModerationService {
     }
 
     if (tags.length) {
-      builder = builder.where(
-        sql`${ref('moderation_subject_status.tags')} ?| array[${sql.join(
-          tags,
-        )}]::TEXT[]`,
-      )
+      builder = this.applyTagFilter(builder, tags)
     }
 
     if (excludeTags.length) {

package/src/tag-service/index.ts

@@ -22,15 +22,18 @@ export class TagService {
     ]
   }
 
-  async evaluateForSubject() {
+  // Allow the caller to seed the initial tags
+  async evaluateForSubject(initialTags?: Iterable<string>) {
     try {
-      const tags: string[] = []
+      const tags = new Set(initialTags)
 
       await Promise.all(
         this.taggers.map(async (tagger) => {
           try {
             const newTags = await tagger.getTags()
-            if (newTags.length) tags.push(...newTags)
+            for (const newTag of newTags) {
+              tags.add(newTag)
+            }
           } catch (e) {
             // Don't let one tagger error stop the rest from running
             log.error(
@@ -41,11 +44,19 @@ export class TagService {
         }),
       )
 
-      if (tags.length > 0) {
+      // Ensure that before inserting new tags, we discard any tag that may
+      // have been evaluated to be added but is already present in the subject
+      if (this.subjectStatus?.tags?.length) {
+        for (const tag of this.subjectStatus.tags) {
+          tags.delete(tag)
+        }
+      }
+
+      if (tags.size) {
         await this.moderationService.logEvent({
           event: {
             $type: 'tools.ozone.moderation.defs#modEventTag',
-            add: tags,
+            add: [...tags],
             remove: [],
           },
           subject: this.subject,

package/src/tag-service/util.ts

@@ -0,0 +1,5 @@
+import { ReasonType } from '../lexicon/types/com/atproto/moderation/defs'
+
+export const getTagForReport = (reasonType: ReasonType) => {
+  return `report:${reasonType.replace('com.atproto.moderation.defs#reason', '').toLowerCase()}`
+}

package/tests/__snapshots__/get-record.test.ts.snap

@@ -46,7 +46,9 @@ Object {
       "subjectBlobCids": Array [],
       "subjectRepoHandle": "alice.test",
       "tags": Array [
+        "report:spam",
         "lang:en",
+        "report:other",
       ],
       "takendown": true,
       "updatedAt": "1970-01-01T00:00:00.000Z",
@@ -150,7 +152,9 @@ Object {
       "subjectBlobCids": Array [],
       "subjectRepoHandle": "alice.test",
       "tags": Array [
+        "report:spam",
         "lang:en",
+        "report:other",
       ],
       "takendown": true,
       "updatedAt": "1970-01-01T00:00:00.000Z",

package/tests/__snapshots__/get-records.test.ts.snap

@@ -49,7 +49,9 @@ Object {
           "subjectBlobCids": Array [],
           "subjectRepoHandle": "alice.test",
           "tags": Array [
+            "report:spam",
             "lang:en",
+            "report:other",
           ],
           "takendown": true,
           "updatedAt": "1970-01-01T00:00:00.000Z",

package/tests/__snapshots__/get-repo.test.ts.snap

@@ -40,6 +40,8 @@ Object {
       "subjectRepoHandle": "alice.test",
       "tags": Array [
         "lang:und",
+        "report:spam",
+        "report:other",
       ],
       "takendown": true,
       "updatedAt": "1970-01-01T00:00:00.000Z",

package/tests/__snapshots__/get-repos.test.ts.snap

@@ -43,6 +43,8 @@ Object {
           "subjectRepoHandle": "alice.test",
           "tags": Array [
             "lang:und",
+            "report:spam",
+            "report:other",
           ],
           "takendown": true,
           "updatedAt": "1970-01-01T00:00:00.000Z",

package/tests/__snapshots__/moderation-events.test.ts.snap

@@ -35,7 +35,9 @@ Object {
         "subjectBlobCids": Array [],
         "subjectRepoHandle": "alice.test",
         "tags": Array [
+          "report:misleading",
           "lang:und",
+          "report:spam",
         ],
         "takendown": false,
         "updatedAt": "1970-01-01T00:00:00.000Z",
@@ -101,6 +103,7 @@ Array [
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventTag",
       "add": Array [
+        "report:spam",
         "lang:en",
         "lang:i",
       ],
@@ -163,6 +166,7 @@ Array [
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventTag",
       "add": Array [
+        "report:spam",
         "lang:en",
       ],
       "remove": Array [],
@@ -210,7 +214,7 @@ Array [
       "isReporterMuted": false,
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
-    "id": 16,
+    "id": 17,
     "subject": Object {
       "$type": "com.atproto.admin.defs#repoRef",
       "did": "user(0)",
@@ -251,7 +255,7 @@ Array [
       "isReporterMuted": false,
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
-    "id": 16,
+    "id": 17,
     "subject": Object {
       "$type": "com.atproto.admin.defs#repoRef",
       "did": "user(0)",
@@ -292,7 +296,7 @@ Array [
       "isReporterMuted": false,
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
-    "id": 16,
+    "id": 17,
     "subject": Object {
       "$type": "com.atproto.admin.defs#repoRef",
       "did": "user(0)",

package/tests/__snapshots__/moderation-statuses.test.ts.snap

@@ -19,6 +19,7 @@ Array [
     "subjectBlobCids": Array [],
     "subjectRepoHandle": "bob.test",
     "tags": Array [
+      "report:spam",
       "lang:en",
       "lang:i",
     ],
@@ -41,6 +42,7 @@ Array [
     "subjectBlobCids": Array [],
     "subjectRepoHandle": "bob.test",
     "tags": Array [
+      "report:spam",
       "lang:en",
       "lang:i",
     ],
@@ -69,6 +71,7 @@ Array [
     "subjectBlobCids": Array [],
     "subjectRepoHandle": "bob.test",
     "tags": Array [
+      "report:spam",
       "lang:en",
       "lang:i",
     ],
@@ -91,6 +94,7 @@ Array [
     "subjectBlobCids": Array [],
     "subjectRepoHandle": "bob.test",
     "tags": Array [
+      "report:spam",
       "lang:en",
       "lang:i",
     ],
@@ -114,6 +118,7 @@ Array [
     "subjectBlobCids": Array [],
     "subjectRepoHandle": "alice.test",
     "tags": Array [
+      "report:spam",
       "lang:ha",
     ],
     "takendown": false,
@@ -135,6 +140,7 @@ Array [
     "subjectBlobCids": Array [],
     "subjectRepoHandle": "alice.test",
     "tags": Array [
+      "report:misleading",
       "lang:und",
     ],
     "takendown": false,

package/tests/__snapshots__/moderation.test.ts.snap

@@ -4,7 +4,7 @@ exports[`moderation reporting creates reports of a DM chat. 1`] = `
 Array [
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
-    "id": 12,
+    "id": 14,
     "reasonType": "com.atproto.moderation.defs#reasonSpam",
     "reportedBy": "user(0)",
     "subject": Object {
@@ -16,7 +16,7 @@ Array [
   },
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
-    "id": 14,
+    "id": 16,
     "reason": "defamation",
     "reasonType": "com.atproto.moderation.defs#reasonOther",
     "reportedBy": "user(1)",
@@ -34,7 +34,7 @@ exports[`moderation reporting creates reports of a record. 1`] = `
 Array [
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
-    "id": 5,
+    "id": 7,
     "reasonType": "com.atproto.moderation.defs#reasonSpam",
     "reportedBy": "user(0)",
     "subject": Object {
@@ -45,7 +45,7 @@ Array [
   },
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
-    "id": 7,
+    "id": 9,
     "reason": "defamation",
     "reasonType": "com.atproto.moderation.defs#reasonOther",
     "reportedBy": "user(1)",

package/tests/content-tagger.test.ts

@@ -5,6 +5,7 @@ import {
   basicSeed,
 } from '@atproto/dev-env'
 import { REASONSPAM } from '../src/lexicon/types/com/atproto/moderation/defs'
+import { REASONMISLEADING } from '../dist/lexicon/types/com/atproto/moderation/defs'
 
 describe('moderation subject content tagging', () => {
   let network: TestNetwork
@@ -138,4 +139,32 @@ describe('moderation subject content tagging', () => {
       expect(imagePostStatus.tags).toContain('embed:image')
     })
   })
+
+  describe('report tagger', () => {
+    it('Adds report reason tag', async () => {
+      await Promise.all([
+        sc.createReport({
+          reasonType: REASONSPAM,
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: sc.dids.carol,
+          },
+          reportedBy: sc.dids.alice,
+        }),
+        sc.createReport({
+          reasonType: REASONMISLEADING,
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: sc.dids.carol,
+          },
+          reportedBy: sc.dids.alice,
+        }),
+      ])
+
+      const accountStatus = await getStatus(sc.dids.carol)
+
+      expect(accountStatus.tags).toContain('report:spam')
+      expect(accountStatus.tags).toContain('report:misleading')
+    })
+  })
 })

package/tests/moderation-status-tags.test.ts

@@ -71,5 +71,42 @@ describe('moderation-status-tags', () => {
         'follow-churn',
       )
     })
+
+    it('allows filtering by tags', async () => {
+      await modClient.emitEvent({
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: sc.dids.alice,
+        },
+        event: {
+          $type: 'tools.ozone.moderation.defs#modEventTag',
+          add: ['report:spam', 'lang:ja', 'lang:en'],
+          remove: [],
+        },
+      })
+      const [englishAndJapaneseQueue, englishOrJapaneseQueue] =
+        await Promise.all([
+          modClient.queryStatuses({
+            tags: ['lang:ja&&lang:en'],
+          }),
+          modClient.queryStatuses({
+            tags: ['report:ja', 'lang:en'],
+          }),
+        ])
+
+      // Verify that the queue only contains 1 item with both en and ja tags which is alice's account
+      expect(englishAndJapaneseQueue.subjectStatuses.length).toEqual(1)
+      expect(englishAndJapaneseQueue.subjectStatuses[0].subject.did).toEqual(
+        sc.dids.alice,
+      )
+
+      // Verify that when querying for either en or ja tags, both alice and bob are returned
+      expect(englishOrJapaneseQueue.subjectStatuses.length).toEqual(2)
+      const englishOrJapaneseDids = englishOrJapaneseQueue.subjectStatuses.map(
+        ({ subject }) => subject.did,
+      )
+      expect(englishOrJapaneseDids).toContain(sc.dids.alice)
+      expect(englishOrJapaneseDids).toContain(sc.dids.bob)
+    })
   })
 })

package/tests/report-muting.test.ts

@@ -69,7 +69,7 @@ describe('report-muting', () => {
     })
 
     // Verify that a subject status was not created for bob's post since the reporter was muted
-    await assertSubjectStatus(bobsPostSubject.uri, undefined)
+    await assertSubjectStatus(bobsPostSubject.uri, REVIEWNONE)
     // Verify, however, that the event was logged
     await modClient.queryEvents({
       subject: bobsPostSubject.uri,