merge

bluesky-social · Dec 20, 2024 · 2ac0182 · 2ac0182
2 parents 0dfce9b + 6d308b8
commit 2ac0182
Show file tree

Hide file tree

Showing 67 changed files with 410 additions and 280 deletions.
diff --git a/.changeset/thick-worms-watch.md b/.changeset/thick-worms-watch.md
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/api
 
+## 0.13.22
+
+### Patch Changes
+
+- [#3270](https://github.com/bluesky-social/atproto/pull/3270) [`f22383cee`](https://github.com/bluesky-social/atproto/commit/f22383cee8feb8b9f761c801ab6e07ad8dc019ed) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Add support for label def aliases, deprecation notices. This provides support for the deprecated `gore` label until a full cleanup effort can be completed.
+
 ## 0.13.21
 
 ### Patch Changes

diff --git a/packages/api/definitions/labels.json b/packages/api/definitions/labels.json
@@ -147,6 +147,7 @@
   },
   {
     "identifier": "graphic-media",
+    "alias": ["gore"],
     "flags": ["adult"],
     "configurable": true,
     "defaultSetting": "warn",

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.13.21",
+  "version": "0.13.22",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [

diff --git a/packages/api/scripts/code/labels.mjs b/packages/api/scripts/code/labels.mjs
@@ -19,12 +19,42 @@ writeFileSync(
 )
 
 async function gen() {
+  const knownValues = new Set()
+  const flattenedLabelDefs = []
+
+  for (const { alias: aliases, ...label } of labelsDef) {
+    knownValues.add(label.identifier)
+    flattenedLabelDefs.push([label.identifier, { ...label, locales: [] }])
+
+    if (aliases) {
+      for (const alias of aliases) {
+        knownValues.add(alias)
+        flattenedLabelDefs.push([
+          alias,
+          {
+            ...label,
+            identifier: alias,
+            locales: [],
+            comment: `@deprecated alias for \`${label.identifier}\``,
+          },
+        ])
+      }
+    }
+  }
+
+  let labelDefsStr = `{`
+  for (const [key, { comment, ...value }] of flattenedLabelDefs) {
+    const commentStr = comment ? `\n/** ${comment} */\n` : ''
+    labelDefsStr += `${commentStr}'${key}': ${JSON.stringify(value, null, 2)},`
+  }
+  labelDefsStr += `}`
+
   return prettier.format(
     `/** this doc is generated by ./scripts/code/labels.mjs **/
   import {InterpretedLabelValueDefinition, LabelPreference} from '../types'
 
-  export type KnownLabelValue = ${labelsDef
-    .map((label) => `"${label.identifier}"`)
+  export type KnownLabelValue = ${Array.from(knownValues)
+    .map((value) => `"${value}"`)
     .join(' | ')}
 
   export const DEFAULT_LABEL_SETTINGS: Record<string, LabelPreference> = ${JSON.stringify(
@@ -35,13 +65,7 @@ async function gen() {
     ),
   )}
 
-  export const LABELS: Record<KnownLabelValue, InterpretedLabelValueDefinition> = ${JSON.stringify(
-    Object.fromEntries(
-      labelsDef.map((label) => [label.identifier, { ...label, locales: [] }]),
-    ),
-    null,
-    2,
-  )}
+  export const LABELS: Record<KnownLabelValue, InterpretedLabelValueDefinition> = ${labelDefsStr}
   `,
     { semi: false, parser: 'typescript', singleQuote: true },
   )

diff --git a/packages/api/src/moderation/const/labels.ts b/packages/api/src/moderation/const/labels.ts
@@ -9,6 +9,7 @@ export type KnownLabelValue =
   | 'sexual'
   | 'nudity'
   | 'graphic-media'
+  | 'gore'
 
 export const DEFAULT_LABEL_SETTINGS: Record<string, LabelPreference> = {
   porn: 'hide',
@@ -193,4 +194,27 @@ export const LABELS: Record<KnownLabelValue, InterpretedLabelValueDefinition> =
       },
       locales: [],
     },
+    /** @deprecated alias for `graphic-media` */
+    gore: {
+      identifier: 'gore',
+      flags: ['adult'],
+      configurable: true,
+      defaultSetting: 'warn',
+      severity: 'none',
+      blurs: 'media',
+      behaviors: {
+        account: {
+          avatar: 'blur',
+          banner: 'blur',
+        },
+        profile: {
+          avatar: 'blur',
+          banner: 'blur',
+        },
+        content: {
+          contentMedia: 'blur',
+        },
+      },
+      locales: [],
+    },
   }
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/bsky
 
+## 0.0.100
+
+### Patch Changes
+
+- Updated dependencies [[`f22383cee`](https://github.com/bluesky-social/atproto/commit/f22383cee8feb8b9f761c801ab6e07ad8dc019ed)]:
+  - @atproto/api@0.13.22
+
 ## 0.0.99
 
 ### Patch Changes

diff --git a/packages/bsky/package.json b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.99",
+  "version": "0.0.100",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [

diff --git a/packages/bsky/src/lexicon/index.ts b/packages/bsky/src/lexicon/index.ts
@@ -2177,13 +2177,13 @@ export class ChatBskyModerationNS {
 
 type SharedRateLimitOpts<T> = {
   name: string
-  calcKey?: (ctx: T) => string
+  calcKey?: (ctx: T) => string | null
   calcPoints?: (ctx: T) => number
 }
 type RouteRateLimitOpts<T> = {
   durationMs: number
   points: number
-  calcKey?: (ctx: T) => string
+  calcKey?: (ctx: T) => string | null
   calcPoints?: (ctx: T) => number
 }
 type HandlerOpts = { blobLimit?: number }

diff --git a/packages/bsky/tests/__snapshots__/feed-generation.test.ts.snap b/packages/bsky/tests/__snapshots__/feed-generation.test.ts.snap
@@ -665,12 +665,12 @@ Array [
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
-              "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+              "alt": "../dev-env/assets/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": "../dev-env/src/seed/img/key-alt.jpg",
+              "alt": "../dev-env/assets/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",
             },
@@ -727,7 +727,7 @@ Array [
             "$type": "app.bsky.embed.images",
             "images": Array [
               Object {
-                "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                "alt": "../dev-env/assets/key-landscape-small.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -738,7 +738,7 @@ Array [
                 },
               },
               Object {
-                "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                "alt": "../dev-env/assets/key-alt.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -950,12 +950,12 @@ Array [
                 "$type": "app.bsky.embed.images#view",
                 "images": Array [
                   Object {
-                    "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                    "alt": "../dev-env/assets/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": "../dev-env/src/seed/img/key-alt.jpg",
+                    "alt": "../dev-env/assets/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",
                   },
@@ -1015,7 +1015,7 @@ Array [
                 "$type": "app.bsky.embed.images",
                 "images": Array [
                   Object {
-                    "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                    "alt": "../dev-env/assets/key-landscape-small.jpg",
                     "image": Object {
                       "$type": "blob",
                       "mimeType": "image/jpeg",
@@ -1026,7 +1026,7 @@ Array [
                     },
                   },
                   Object {
-                    "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                    "alt": "../dev-env/assets/key-alt.jpg",
                     "image": Object {
                       "$type": "blob",
                       "mimeType": "image/jpeg",
@@ -1180,12 +1180,12 @@ Array [
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
-              "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+              "alt": "../dev-env/assets/key-landscape-small.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(4)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(4)@jpeg",
             },
             Object {
-              "alt": "../dev-env/src/seed/img/key-alt.jpg",
+              "alt": "../dev-env/assets/key-alt.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(5)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(5)@jpeg",
             },
@@ -1236,7 +1236,7 @@ Array [
             "$type": "app.bsky.embed.images",
             "images": Array [
               Object {
-                "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                "alt": "../dev-env/assets/key-landscape-small.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -1247,7 +1247,7 @@ Array [
                 },
               },
               Object {
-                "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                "alt": "../dev-env/assets/key-alt.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -1477,12 +1477,12 @@ Array [
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
-              "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+              "alt": "../dev-env/assets/key-landscape-small.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(4)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(4)@jpeg",
             },
             Object {
-              "alt": "../dev-env/src/seed/img/key-alt.jpg",
+              "alt": "../dev-env/assets/key-alt.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(5)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(5)@jpeg",
             },
@@ -1539,7 +1539,7 @@ Array [
             "$type": "app.bsky.embed.images",
             "images": Array [
               Object {
-                "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                "alt": "../dev-env/assets/key-landscape-small.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -1550,7 +1550,7 @@ Array [
                 },
               },
               Object {
-                "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                "alt": "../dev-env/assets/key-alt.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",

diff --git a/packages/bsky/tests/data-plane/__snapshots__/indexing.test.ts.snap b/packages/bsky/tests/data-plane/__snapshots__/indexing.test.ts.snap
@@ -144,7 +144,7 @@ Array [
               "$type": "app.bsky.embed.images#view",
               "images": Array [
                 Object {
-                  "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                  "alt": "../dev-env/assets/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",
                 },
@@ -176,7 +176,7 @@ Array [
                 "$type": "app.bsky.embed.images",
                 "images": Array [
                   Object {
-                    "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                    "alt": "../dev-env/assets/key-landscape-small.jpg",
                     "image": Object {
                       "$type": "blob",
                       "mimeType": "image/jpeg",
@@ -303,7 +303,7 @@ Array [
                           "$type": "app.bsky.embed.images",
                           "images": Array [
                             Object {
-                              "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                              "alt": "../dev-env/assets/key-landscape-small.jpg",
                               "image": Object {
                                 "$type": "blob",
                                 "mimeType": "image/jpeg",
@@ -314,7 +314,7 @@ Array [
                               },
                             },
                             Object {
-                              "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                              "alt": "../dev-env/assets/key-alt.jpg",
                               "image": Object {
                                 "$type": "blob",
                                 "mimeType": "image/jpeg",

diff --git a/packages/bsky/tests/image/sharp.test.ts b/packages/bsky/tests/image/sharp.test.ts
@@ -178,7 +178,7 @@ describe('sharp image processor', () => {
   })
 
   async function processFixture(fixture: string, options: Options) {
-    const image = createReadStream(`../dev-env/src/seed/img/${fixture}`)
+    const image = createReadStream(`../dev-env/assets/${fixture}`)
     const resized = await resize(image, options)
     return await getInfo(resized)
   }