@atproto/bsky 0.0.10 → 0.0.12

package/src/services/moderation/index.ts

@@ -7,7 +7,12 @@ import { ModerationAction, ModerationReport } from '../../db/tables/moderation'
 import { ModerationViews } from './views'
 import { ImageUriBuilder } from '../../image/uri'
 import { ImageInvalidator } from '../../image/invalidator'
-import { TAKEDOWN } from '../../lexicon/types/com/atproto/admin/defs'
+import {
+  RepoRef,
+  RepoBlobRef,
+  TAKEDOWN,
+} from '../../lexicon/types/com/atproto/admin/defs'
+import { Main as StrongRef } from '../../lexicon/types/com/atproto/repo/strongRef'
 import { addHoursToDate } from '../../util/date'
 
 export class ModerationService {
@@ -355,7 +360,10 @@ export class ModerationService {
     createdBy,
     createdAt,
     reason,
-  }: ReversibleModerationAction) {
+  }: ReversibleModerationAction): Promise<{
+    result: ModerationActionRow
+    restored?: TakedownSubjects
+  }> {
     this.db.assertTransaction()
     const result = await this.logReverseAction({
       id,
@@ -364,6 +372,8 @@ export class ModerationService {
       reason,
     })
 
+    let restored: TakedownSubjects | undefined
+
     if (
       result.action === TAKEDOWN &&
       result.subjectType === 'com.atproto.admin.defs#repoRef' &&
@@ -372,6 +382,15 @@ export class ModerationService {
       await this.reverseTakedownRepo({
         did: result.subjectDid,
       })
+      restored = {
+        did: result.subjectDid,
+        subjects: [
+          {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: result.subjectDid,
+          },
+        ],
+      }
     }
 
     if (
@@ -379,12 +398,35 @@ export class ModerationService {
       result.subjectType === 'com.atproto.repo.strongRef' &&
       result.subjectUri
     ) {
+      const uri = new AtUri(result.subjectUri)
       await this.reverseTakedownRecord({
-        uri: new AtUri(result.subjectUri),
+        uri,
       })
+      const did = uri.hostname
+      const actionBlobs = await this.db.db
+        .selectFrom('moderation_action_subject_blob')
+        .where('actionId', '=', id)
+        .select('cid')
+        .execute()
+      restored = {
+        did,
+        subjects: [
+          {
+            $type: 'com.atproto.repo.strongRef',
+            uri: result.subjectUri,
+            cid: result.subjectCid ?? '',
+          },
+          ...actionBlobs.map((row) => ({
+            $type: 'com.atproto.admin.defs#repoBlobRef',
+            did,
+            cid: row.cid,
+            recordUri: result.subjectUri,
+          })),
+        ],
+      }
     }
 
-    return result
+    return { result, restored }
   }
 
   async logReverseAction(
@@ -410,13 +452,27 @@ export class ModerationService {
     return result
   }
 
-  async takedownRepo(info: { takedownId: number; did: string }) {
+  async takedownRepo(info: {
+    takedownId: number
+    did: string
+  }): Promise<TakedownSubjects> {
+    const { takedownId, did } = info
     await this.db.db
       .updateTable('actor')
-      .set({ takedownId: info.takedownId })
-      .where('did', '=', info.did)
+      .set({ takedownId })
+      .where('did', '=', did)
       .where('takedownId', 'is', null)
       .executeTakeFirst()
+
+    return {
+      did,
+      subjects: [
+        {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did,
+        },
+      ],
+    }
   }
 
   async reverseTakedownRepo(info: { did: string }) {
@@ -430,26 +486,45 @@ export class ModerationService {
   async takedownRecord(info: {
     takedownId: number
     uri: AtUri
+    cid: CID
     blobCids?: CID[]
-  }) {
+  }): Promise<TakedownSubjects> {
+    const { takedownId, uri, cid, blobCids } = info
+    const did = uri.hostname
     this.db.assertTransaction()
     await this.db.db
       .updateTable('record')
-      .set({ takedownId: info.takedownId })
-      .where('uri', '=', info.uri.toString())
+      .set({ takedownId })
+      .where('uri', '=', uri.toString())
       .where('takedownId', 'is', null)
       .executeTakeFirst()
-    if (info.blobCids) {
+    if (blobCids) {
       await Promise.all(
-        info.blobCids.map(async (cid) => {
+        blobCids.map(async (cid) => {
           const paths = ImageUriBuilder.presets.map((id) => {
-            const uri = this.imgUriBuilder.getPresetUri(id, info.uri.host, cid)
-            return uri.replace(this.imgUriBuilder.endpoint, '')
+            const imgUri = this.imgUriBuilder.getPresetUri(id, uri.host, cid)
+            return imgUri.replace(this.imgUriBuilder.endpoint, '')
           })
           await this.imgInvalidator.invalidate(cid.toString(), paths)
         }),
       )
     }
+    return {
+      did,
+      subjects: [
+        {
+          $type: 'com.atproto.repo.strongRef',
+          uri: uri.toString(),
+          cid: cid.toString(),
+        },
+        ...(blobCids || []).map((cid) => ({
+          $type: 'com.atproto.admin.defs#repoBlobRef',
+          did,
+          cid: cid.toString(),
+          recordUri: uri.toString(),
+        })),
+      ],
+    }
   }
 
   async reverseTakedownRecord(info: { uri: AtUri }) {
@@ -563,6 +638,11 @@ export class ModerationService {
   }
 }
 
+export type TakedownSubjects = {
+  did: string
+  subjects: (RepoRef | RepoBlobRef | StrongRef)[]
+}
+
 export type ModerationActionRow = Selectable<ModerationAction>
 export type ReversibleModerationAction = Pick<
   ModerationActionRow,

package/src/services/moderation/views.ts

@@ -211,6 +211,7 @@ export class ModerationViews {
         .selectFrom('moderation_report')
         .where('subjectType', '=', 'com.atproto.repo.strongRef')
         .where('subjectUri', '=', result.uri)
+        .leftJoin('actor', 'actor.did', 'moderation_report.subjectDid')
         .orderBy('id', 'desc')
         .selectAll()
         .execute(),

package/src/services/util/search.ts

@@ -7,17 +7,17 @@ import { GenericKeyset, paginate } from '../../db/pagination'
 export const getUserSearchQuery = (
   db: Database,
   opts: {
-    term: string
+    query: string
     limit: number
     cursor?: string
     includeSoftDeleted?: boolean
   },
 ) => {
   const { ref } = db.db.dynamic
-  const { term, limit, cursor, includeSoftDeleted } = opts
+  const { query, limit, cursor, includeSoftDeleted } = opts
   // Matching user accounts based on handle
-  const distanceAccount = distance(term, ref('handle'))
-  let accountsQb = getMatchingAccountsQb(db, { term, includeSoftDeleted })
+  const distanceAccount = distance(query, ref('handle'))
+  let accountsQb = getMatchingAccountsQb(db, { query, includeSoftDeleted })
   accountsQb = paginate(accountsQb, {
     limit,
     cursor,
@@ -25,8 +25,8 @@ export const getUserSearchQuery = (
     keyset: new SearchKeyset(distanceAccount, ref('actor.did')),
   })
   // Matching profiles based on display name
-  const distanceProfile = distance(term, ref('displayName'))
-  let profilesQb = getMatchingProfilesQb(db, { term, includeSoftDeleted })
+  const distanceProfile = distance(query, ref('displayName'))
+  let profilesQb = getMatchingProfilesQb(db, { query, includeSoftDeleted })
   profilesQb = paginate(profilesQb, {
     limit,
     cursor,
@@ -46,18 +46,18 @@ export const getUserSearchQuery = (
 export const getUserSearchQuerySimple = (
   db: Database,
   opts: {
-    term: string
+    query: string
     limit: number
   },
 ) => {
   const { ref } = db.db.dynamic
-  const { term, limit } = opts
+  const { query, limit } = opts
   // Matching user accounts based on handle
-  const accountsQb = getMatchingAccountsQb(db, { term })
+  const accountsQb = getMatchingAccountsQb(db, { query })
     .orderBy('distance', 'asc')
     .limit(limit)
   // Matching profiles based on display name
-  const profilesQb = getMatchingProfilesQb(db, { term })
+  const profilesQb = getMatchingProfilesQb(db, { query })
     .orderBy('distance', 'asc')
     .limit(limit)
   // Combine and paginate result set
@@ -71,29 +71,29 @@ export const getUserSearchQuerySimple = (
 // Matching user accounts based on handle
 const getMatchingAccountsQb = (
   db: Database,
-  opts: { term: string; includeSoftDeleted?: boolean },
+  opts: { query: string; includeSoftDeleted?: boolean },
 ) => {
   const { ref } = db.db.dynamic
-  const { term, includeSoftDeleted } = opts
-  const distanceAccount = distance(term, ref('handle'))
+  const { query, includeSoftDeleted } = opts
+  const distanceAccount = distance(query, ref('handle'))
   return db.db
     .selectFrom('actor')
     .if(!includeSoftDeleted, (qb) =>
       qb.where(notSoftDeletedClause(ref('actor'))),
     )
     .where('actor.handle', 'is not', null)
-    .where(similar(term, ref('handle'))) // Coarse filter engaging trigram index
+    .where(similar(query, ref('handle'))) // Coarse filter engaging trigram index
     .select(['actor.did as did', distanceAccount.as('distance')])
 }
 
 // Matching profiles based on display name
 const getMatchingProfilesQb = (
   db: Database,
-  opts: { term: string; includeSoftDeleted?: boolean },
+  opts: { query: string; includeSoftDeleted?: boolean },
 ) => {
   const { ref } = db.db.dynamic
-  const { term, includeSoftDeleted } = opts
-  const distanceProfile = distance(term, ref('displayName'))
+  const { query, includeSoftDeleted } = opts
+  const distanceProfile = distance(query, ref('displayName'))
   return db.db
     .selectFrom('profile')
     .innerJoin('actor', 'actor.did', 'profile.creator')
@@ -101,7 +101,7 @@ const getMatchingProfilesQb = (
       qb.where(notSoftDeletedClause(ref('actor'))),
     )
     .where('actor.handle', 'is not', null)
-    .where(similar(term, ref('displayName'))) // Coarse filter engaging trigram index
+    .where(similar(query, ref('displayName'))) // Coarse filter engaging trigram index
     .select(['profile.creator as did', distanceProfile.as('distance')])
 }
 
@@ -133,15 +133,16 @@ const combineAccountsAndProfilesQb = (
 }
 
 // Remove leading @ in case a handle is input that way
-export const cleanTerm = (term: string) => term.trim().replace(/^@/g, '')
+export const cleanQuery = (query: string) => query.trim().replace(/^@/g, '')
 
-// Uses pg_trgm strict word similarity to check similarity between a search term and a stored value
-const distance = (term: string, ref: DbRef) =>
-  sql<number>`(${term} <<-> ${ref})`
+// Uses pg_trgm strict word similarity to check similarity between a search query and a stored value
+const distance = (query: string, ref: DbRef) =>
+  sql<number>`(${query} <<-> ${ref})`
 
 // Can utilize trigram index to match on strict word similarity.
 // The word_similarity_threshold is set to .4 (i.e. distance < .6) in db/index.ts.
-const similar = (term: string, ref: DbRef) => sql<boolean>`(${term} <% ${ref})`
+const similar = (query: string, ref: DbRef) =>
+  sql<boolean>`(${query} <% ${ref})`
 
 type Result = { distance: number; did: string }
 type LabeledResult = { primary: number; secondary: string }

package/tests/__snapshots__/feed-generation.test.ts.snap

@@ -419,12 +419,12 @@ Array [
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
-              "alt": "tests/image/fixtures/key-landscape-small.jpg",
+              "alt": "tests/sample-img/key-landscape-small.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(5)/cids(5)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(5)/cids(5)@jpeg",
             },
             Object {
-              "alt": "tests/image/fixtures/key-alt.jpg",
+              "alt": "tests/sample-img/key-alt.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(5)/cids(6)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(5)/cids(6)@jpeg",
             },
@@ -475,7 +475,7 @@ Array [
             "$type": "app.bsky.embed.images",
             "images": Array [
               Object {
-                "alt": "tests/image/fixtures/key-landscape-small.jpg",
+                "alt": "tests/sample-img/key-landscape-small.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -486,7 +486,7 @@ Array [
                 },
               },
               Object {
-                "alt": "tests/image/fixtures/key-alt.jpg",
+                "alt": "tests/sample-img/key-alt.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -679,12 +679,12 @@ Array [
                 "$type": "app.bsky.embed.images#view",
                 "images": Array [
                   Object {
-                    "alt": "tests/image/fixtures/key-landscape-small.jpg",
+                    "alt": "tests/sample-img/key-landscape-small.jpg",
                     "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(5)/cids(5)@jpeg",
                     "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(5)/cids(5)@jpeg",
                   },
                   Object {
-                    "alt": "tests/image/fixtures/key-alt.jpg",
+                    "alt": "tests/sample-img/key-alt.jpg",
                     "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(5)/cids(6)@jpeg",
                     "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(5)/cids(6)@jpeg",
                   },
@@ -735,7 +735,7 @@ Array [
                 "$type": "app.bsky.embed.images",
                 "images": Array [
                   Object {
-                    "alt": "tests/image/fixtures/key-landscape-small.jpg",
+                    "alt": "tests/sample-img/key-landscape-small.jpg",
                     "image": Object {
                       "$type": "blob",
                       "mimeType": "image/jpeg",
@@ -746,7 +746,7 @@ Array [
                     },
                   },
                   Object {
-                    "alt": "tests/image/fixtures/key-alt.jpg",
+                    "alt": "tests/sample-img/key-alt.jpg",
                     "image": Object {
                       "$type": "blob",
                       "mimeType": "image/jpeg",
@@ -906,12 +906,12 @@ Array [
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
-              "alt": "tests/image/fixtures/key-landscape-small.jpg",
+              "alt": "tests/sample-img/key-landscape-small.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(5)/cids(4)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(5)/cids(4)@jpeg",
             },
             Object {
-              "alt": "tests/image/fixtures/key-alt.jpg",
+              "alt": "tests/sample-img/key-alt.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(5)/cids(5)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(5)/cids(5)@jpeg",
             },
@@ -962,7 +962,7 @@ Array [
             "$type": "app.bsky.embed.images",
             "images": Array [
               Object {
-                "alt": "tests/image/fixtures/key-landscape-small.jpg",
+                "alt": "tests/sample-img/key-landscape-small.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -973,7 +973,7 @@ Array [
                 },
               },
               Object {
-                "alt": "tests/image/fixtures/key-alt.jpg",
+                "alt": "tests/sample-img/key-alt.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",

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

@@ -101,7 +101,7 @@ Array [
               "$type": "app.bsky.embed.images#view",
               "images": Array [
                 Object {
-                  "alt": "tests/image/fixtures/key-landscape-small.jpg",
+                  "alt": "tests/sample-img/key-landscape-small.jpg",
                   "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(2)/cids(5)@jpeg",
                   "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(2)/cids(5)@jpeg",
                 },
@@ -134,7 +134,7 @@ Array [
                 "$type": "app.bsky.embed.images",
                 "images": Array [
                   Object {
-                    "alt": "tests/image/fixtures/key-landscape-small.jpg",
+                    "alt": "tests/sample-img/key-landscape-small.jpg",
                     "image": Object {
                       "$type": "blob",
                       "mimeType": "image/jpeg",
@@ -245,7 +245,7 @@ Array [
                           "$type": "app.bsky.embed.images",
                           "images": Array [
                             Object {
-                              "alt": "tests/image/fixtures/key-landscape-small.jpg",
+                              "alt": "tests/sample-img/key-landscape-small.jpg",
                               "image": Object {
                                 "$type": "blob",
                                 "mimeType": "image/jpeg",
@@ -256,7 +256,7 @@ Array [
                               },
                             },
                             Object {
-                              "alt": "tests/image/fixtures/key-alt.jpg",
+                              "alt": "tests/sample-img/key-alt.jpg",
                               "image": Object {
                                 "$type": "blob",
                                 "mimeType": "image/jpeg",

package/tests/admin/__snapshots__/get-moderation-action.test.ts.snap

@@ -0,0 +1,172 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`admin get moderation action view gets moderation action for a record. 1`] = `
+Object {
+  "action": "com.atproto.admin.defs#takedown",
+  "createdAt": "1970-01-01T00:00:00.000Z",
+  "createdBy": "did:example:admin",
+  "id": 2,
+  "reason": "X",
+  "resolvedReports": Array [
+    Object {
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "id": 2,
+      "reason": "defamation",
+      "reasonType": "com.atproto.moderation.defs#reasonOther",
+      "reportedBy": "user(1)",
+      "resolvedByActionIds": Array [
+        2,
+        1,
+      ],
+      "subject": Object {
+        "$type": "com.atproto.repo.strongRef",
+        "cid": "cids(0)",
+        "uri": "record(0)",
+      },
+    },
+  ],
+  "subject": Object {
+    "$type": "com.atproto.admin.defs#recordView",
+    "blobCids": Array [],
+    "cid": "cids(0)",
+    "indexedAt": "1970-01-01T00:00:00.000Z",
+    "moderation": Object {
+      "currentAction": Object {
+        "action": "com.atproto.admin.defs#takedown",
+        "id": 2,
+      },
+    },
+    "repo": Object {
+      "did": "user(0)",
+      "email": "alice@test.com",
+      "handle": "alice.test",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "invitesDisabled": false,
+      "moderation": Object {},
+      "relatedRecords": Array [
+        Object {
+          "$type": "app.bsky.actor.profile",
+          "avatar": Object {
+            "$type": "blob",
+            "mimeType": "image/jpeg",
+            "ref": Object {
+              "$link": "cids(1)",
+            },
+            "size": 3976,
+          },
+          "description": "its me!",
+          "displayName": "ali",
+          "labels": Object {
+            "$type": "com.atproto.label.defs#selfLabels",
+            "values": Array [
+              Object {
+                "val": "self-label-a",
+              },
+              Object {
+                "val": "self-label-b",
+              },
+            ],
+          },
+        },
+      ],
+    },
+    "uri": "record(0)",
+    "value": Object {
+      "$type": "app.bsky.feed.post",
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "labels": Object {
+        "$type": "com.atproto.label.defs#selfLabels",
+        "values": Array [
+          Object {
+            "val": "self-label",
+          },
+        ],
+      },
+      "text": "hey there",
+    },
+  },
+  "subjectBlobs": Array [],
+}
+`;
+
+exports[`admin get moderation action view gets moderation action for a repo. 1`] = `
+Object {
+  "action": "com.atproto.admin.defs#flag",
+  "createdAt": "1970-01-01T00:00:00.000Z",
+  "createdBy": "did:example:admin",
+  "id": 1,
+  "reason": "X",
+  "resolvedReports": Array [
+    Object {
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "id": 2,
+      "reason": "defamation",
+      "reasonType": "com.atproto.moderation.defs#reasonOther",
+      "reportedBy": "user(1)",
+      "resolvedByActionIds": Array [
+        2,
+        1,
+      ],
+      "subject": Object {
+        "$type": "com.atproto.repo.strongRef",
+        "cid": "cids(1)",
+        "uri": "record(0)",
+      },
+    },
+    Object {
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "id": 1,
+      "reasonType": "com.atproto.moderation.defs#reasonSpam",
+      "reportedBy": "user(2)",
+      "resolvedByActionIds": Array [
+        1,
+      ],
+      "subject": Object {
+        "$type": "com.atproto.admin.defs#repoRef",
+        "did": "user(0)",
+      },
+    },
+  ],
+  "reversal": Object {
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "createdBy": "did:example:admin",
+    "reason": "X",
+  },
+  "subject": Object {
+    "$type": "com.atproto.admin.defs#repoView",
+    "did": "user(0)",
+    "email": "alice@test.com",
+    "handle": "alice.test",
+    "indexedAt": "1970-01-01T00:00:00.000Z",
+    "invitesDisabled": false,
+    "moderation": Object {},
+    "relatedRecords": Array [
+      Object {
+        "$type": "app.bsky.actor.profile",
+        "avatar": Object {
+          "$type": "blob",
+          "mimeType": "image/jpeg",
+          "ref": Object {
+            "$link": "cids(0)",
+          },
+          "size": 3976,
+        },
+        "description": "its me!",
+        "displayName": "ali",
+        "labels": Object {
+          "$type": "com.atproto.label.defs#selfLabels",
+          "values": Array [
+            Object {
+              "val": "self-label-a",
+            },
+            Object {
+              "val": "self-label-b",
+            },
+          ],
+        },
+      },
+    ],
+  },
+  "subjectBlobs": Array [],
+}
+`;