@atproto/ozone 0.1.77 → 0.1.78

package/dist/tag-service/embed-tagger.js

@@ -28,10 +28,11 @@ class EmbedTagger extends content_tagger_1.ContentTagger {
                 return [];
             }
             const tags = [];
-            if (api_1.AppBskyFeedPost.isRecord(recordValue)) {
-                const embedContent = api_1.AppBskyEmbedRecordWithMedia.isMain(recordValue.embed)
-                    ? recordValue.embed.media
-                    : recordValue.embed;
+            const result = api_1.AppBskyFeedPost.validateRecord(recordValue);
+            if (result.success) {
+                const embedContent = api_1.AppBskyEmbedRecordWithMedia.isMain(result.value.embed)
+                    ? result.value.embed.media
+                    : result.value.embed;
                 if (api_1.AppBskyEmbedImages.isMain(embedContent)) {
                     tags.push(`${this.tagPrefix}image`);
                 }

package/dist/tag-service/embed-tagger.js.map

@@ -1 +1 @@
-{"version":3,"file":"embed-tagger.js","sourceRoot":"","sources":["../../src/tag-service/embed-tagger.ts"],"names":[],"mappings":";;;AAAA,sCAMqB;AACrB,kDAAyC;AACzC,sCAA6C;AAC7C,qDAAgD;AAEhD,MAAa,WAAY,SAAQ,8BAAa;IAA9C;;QACE;;;;mBAAY,QAAQ;WAAA;IAuDtB,CAAC;IArDC,YAAY;QACV,OAAO,CACL,CAAC,CAAC,IAAI,CAAC,aAAa;YACpB,CAAC,IAAI,CAAC,gBAAgB,EAAE;YACxB,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACvB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,KAAK,cAAG,CAAC,eAAe,CAC1D,CAAA;IACH,CAAC;IAED,KAAK,CAAC,SAAS;QACb,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;YAC/C,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO,EAAE,CAAA;YACX,CAAC;YACD,MAAM,IAAI,GAAa,EAAE,CAAA;YACzB,IAAI,qBAAe,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC1C,MAAM,YAAY,GAAG,iCAA2B,CAAC,MAAM,CACrD,WAAW,CAAC,KAAK,CAClB;oBACC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK;oBACzB,CAAC,CAAC,WAAW,CAAC,KAAK,CAAA;gBAErB,IAAI,wBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC5C,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,OAAO,CAAC,CAAA;gBACrC,CAAC;gBAED,IAAI,uBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC3C,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,OAAO,CAAC,CAAA;gBACrC,CAAC;gBAED,IAAI,0BAAoB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC9C,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,UAAU,CAAC,CAAA;gBACxC,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,mBAAG,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,4BAA4B,CAAC,CAAA;YACvE,OAAO,EAAE,CAAA;QACX,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC7B,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,YAAY,CAAC;YAClE,IAAI,CAAC,OAAO;SACb,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAChD,OAAO,MAAM,EAAE,KAAK,CAAA;IACtB,CAAC;CACF;AAxDD,kCAwDC"}
+{"version":3,"file":"embed-tagger.js","sourceRoot":"","sources":["../../src/tag-service/embed-tagger.ts"],"names":[],"mappings":";;;AAAA,sCAMqB;AACrB,kDAAyC;AACzC,sCAA6C;AAC7C,qDAAgD;AAEhD,MAAa,WAAY,SAAQ,8BAAa;IAA9C;;QACE;;;;mBAAY,QAAQ;WAAA;IAyDtB,CAAC;IAvDC,YAAY;QACV,OAAO,CACL,CAAC,CAAC,IAAI,CAAC,aAAa;YACpB,CAAC,IAAI,CAAC,gBAAgB,EAAE;YACxB,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACvB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,KAAK,cAAG,CAAC,eAAe,CAC1D,CAAA;IACH,CAAC;IAED,KAAK,CAAC,SAAS;QACb,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;YAC/C,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO,EAAE,CAAA;YACX,CAAC;YACD,MAAM,IAAI,GAAa,EAAE,CAAA;YACzB,MAAM,MAAM,GAAG,qBAAe,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;YAE1D,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,MAAM,YAAY,GAAG,iCAA2B,CAAC,MAAM,CACrD,MAAM,CAAC,KAAK,CAAC,KAAK,CACnB;oBACC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK;oBAC1B,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAA;gBAEtB,IAAI,wBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC5C,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,OAAO,CAAC,CAAA;gBACrC,CAAC;gBAED,IAAI,uBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC3C,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,OAAO,CAAC,CAAA;gBACrC,CAAC;gBAED,IAAI,0BAAoB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC9C,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,UAAU,CAAC,CAAA;gBACxC,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,mBAAG,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,4BAA4B,CAAC,CAAA;YACvE,OAAO,EAAE,CAAA;QACX,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC7B,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,YAAY,CAAC;YAClE,IAAI,CAAC,OAAO;SACb,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAChD,OAAO,MAAM,EAAE,KAAK,CAAA;IACtB,CAAC;CACF;AA1DD,kCA0DC"}

package/dist/tag-service/language-tagger.d.ts

@@ -3,7 +3,7 @@ export declare class LanguageTagger extends ContentTagger {
     tagPrefix: string;
     isApplicable(): boolean;
     buildTags(): Promise<string[]>;
-    getTextFromRecord(recordValue?: Record<string, unknown>): string | undefined;
+    getTextFromRecord(recordValue: Record<string, unknown>): string | undefined;
     getRecordLang(): Promise<string[] | null>;
 }
 //# sourceMappingURL=language-tagger.d.ts.map

package/dist/tag-service/language-tagger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"language-tagger.d.ts","sourceRoot":"","sources":["../../src/tag-service/language-tagger.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAGhD,qBAAa,cAAe,SAAQ,aAAa;IAC/C,SAAS,SAAU;IAEnB,YAAY,IAAI,OAAO;IAIjB,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAYpC,iBAAiB,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,SAAS;IAiBtE,aAAa,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;CA4ChD"}
+{"version":3,"file":"language-tagger.d.ts","sourceRoot":"","sources":["../../src/tag-service/language-tagger.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAQhD,qBAAa,cAAe,SAAQ,aAAa;IAC/C,SAAS,SAAU;IAEnB,YAAY,IAAI,OAAO;IAIjB,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAYpC,iBAAiB,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,SAAS;IAqBrE,aAAa,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;CA8ChD"}

package/dist/tag-service/language-tagger.js

@@ -28,6 +28,8 @@ const api_1 = require("@atproto/api");
 const logger_1 = require("../logger");
 const content_tagger_1 = require("./content-tagger");
 const language_data_1 = require("./language-data");
+const ifString = (value) => typeof value === 'string' ? value : undefined;
+const isStringProp = (obj, prop) => prop in obj ? ifString(obj[prop]) : undefined;
 class LanguageTagger extends content_tagger_1.ContentTagger {
     constructor() {
         super(...arguments);
@@ -56,14 +58,18 @@ class LanguageTagger extends content_tagger_1.ContentTagger {
     getTextFromRecord(recordValue) {
         let text;
         if (api_1.AppBskyGraphList.isRecord(recordValue)) {
-            text = recordValue.description || recordValue.name;
+            text =
+                isStringProp(recordValue, 'description') ||
+                    isStringProp(recordValue, 'name');
         }
         else if (api_1.AppBskyFeedGenerator.isRecord(recordValue) ||
             api_1.AppBskyActorProfile.isRecord(recordValue)) {
-            text = recordValue.description || recordValue.displayName;
+            text =
+                isStringProp(recordValue, 'description') ||
+                    isStringProp(recordValue, 'displayName');
         }
         else if (api_1.AppBskyFeedPost.isRecord(recordValue)) {
-            text = recordValue.text;
+            text = isStringProp(recordValue, 'text');
         }
         return text?.trim();
     }
@@ -87,7 +93,9 @@ class LanguageTagger extends content_tagger_1.ContentTagger {
             ]);
             const record = recordByUri.get(this.subject.uri);
             const recordLang = record?.value.langs;
-            const recordText = this.getTextFromRecord(record?.value);
+            const recordText = record
+                ? this.getTextFromRecord(record.value)
+                : undefined;
             if (recordLang?.length) {
                 recordLang
                     .map((lang) => lang.split('-')[0])

package/dist/tag-service/language-tagger.js.map

@@ -1 +1 @@
-{"version":3,"file":"language-tagger.js","sourceRoot":"","sources":["../../src/tag-service/language-tagger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"language-tagger.js","sourceRoot":"","sources":["../../src/tag-service/language-tagger.ts"],"names":[],"mappings":"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"}

package/jest.config.js

@@ -7,4 +7,5 @@ module.exports = {
   ],
   testTimeout: 60000,
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.77",
+  "version": "0.1.78",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -35,14 +35,14 @@
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
     "undici": "^6.14.1",
-    "@atproto/api": "^0.13.35",
+    "@atproto/api": "^0.14.0",
     "@atproto/common": "^0.4.8",
     "@atproto/crypto": "^0.4.4",
     "@atproto/identity": "^0.4.6",
-    "@atproto/lexicon": "^0.4.6",
-    "@atproto/syntax": "^0.3.2",
-    "@atproto/xrpc": "^0.6.8",
-    "@atproto/xrpc-server": "^0.7.10"
+    "@atproto/lexicon": "^0.4.7",
+    "@atproto/syntax": "^0.3.3",
+    "@atproto/xrpc": "^0.6.9",
+    "@atproto/xrpc-server": "^0.7.11"
   },
   "devDependencies": {
     "@did-plc/server": "^0.0.1",
@@ -54,8 +54,8 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
-    "@atproto/lex-cli": "^0.5.7",
-    "@atproto/pds": "^0.4.94"
+    "@atproto/lex-cli": "^0.6.0",
+    "@atproto/pds": "^0.4.95"
   },
   "scripts": {
     "codegen": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",

package/src/api/moderation/emitEvent.ts

@@ -5,7 +5,6 @@ import { Server } from '../../lexicon'
 import {
   ModEventTag,
   isModEventAcknowledge,
-  isModEventDivert,
   isModEventEmail,
   isModEventLabel,
   isModEventMuteReporter,
@@ -14,8 +13,10 @@ import {
   isModEventTag,
   isModEventTakedown,
   isModEventUnmuteReporter,
+  validateModEventDivert,
 } from '../../lexicon/types/tools/ozone/moderation/defs'
 import { HandlerInput } from '../../lexicon/types/tools/ozone/moderation/emitEvent'
+import { asPredicate } from '../../lexicon/util'
 import { subjectFromInput } from '../../mod-service/subject'
 import { ProtectedTagSettingKey } from '../../setting/constants'
 import { SettingService } from '../../setting/service'
@@ -24,6 +25,8 @@ import { TagService } from '../../tag-service'
 import { getTagForReport } from '../../tag-service/util'
 import { retryHttp } from '../../util'
 
+const isValidModEventDivert = asPredicate(validateModEventDivert)
+
 const handleModerationEvent = async ({
   ctx,
   input,
@@ -127,7 +130,7 @@ const handleModerationEvent = async ({
     )
   }
 
-  if (isModEventDivert(event) && subject.isRecord()) {
+  if (isValidModEventDivert(event) && subject.isRecord()) {
     if (!ctx.blobDiverter) {
       throw new InvalidRequestError(
         'BlobDiverter not configured for this service',
@@ -228,7 +231,7 @@ export default function (server: Server, ctx: AppContext) {
       })
 
       // On divert events, we need to automatically take down the blobs
-      if (isModEventDivert(input.body.event)) {
+      if (isValidModEventDivert(input.body.event)) {
         await handleModerationEvent({
           auth,
           ctx,

package/src/api/moderation/getRepos.ts

@@ -23,12 +23,12 @@ export default function (server: Server, ctx: AppContext) {
           }
         }
         return {
-          $type: 'tools.ozone.moderation.defs#repoViewDetail',
           ...addAccountInfoToRepoViewDetail(
             partialRepo,
             accountInfo.get(did) || null,
             auth.credentials.isModerator,
           ),
+          $type: 'tools.ozone.moderation.defs#repoViewDetail',
         }
       })
 

package/src/api/util.ts

@@ -13,6 +13,7 @@ import {
   REASONSEXUAL,
   REASONSPAM,
   REASONVIOLATION,
+  ReasonType,
 } from '../lexicon/types/com/atproto/moderation/defs'
 import {
   REVIEWCLOSED,
@@ -51,12 +52,26 @@ export const getPdsAccountInfos = async (
   }
 }
 
+function un$type<T extends object>(obj: T): Omit<T, '$type'> {
+  if ('$type' in obj) {
+    const { $type: _, ...rest } = obj
+    return rest
+  }
+  return obj
+}
+
 export const addAccountInfoToRepoViewDetail = (
-  repoView: RepoViewDetail,
+  repoView: RepoView | RepoViewDetail,
   accountInfo: AccountView | null,
   includeEmail = false,
 ): RepoViewDetail => {
-  if (!accountInfo) return repoView
+  if (!accountInfo) {
+    return un$type({
+      ...repoView,
+      moderation: un$type(repoView.moderation),
+    })
+  }
+
   const {
     email,
     deactivatedAt,
@@ -67,6 +82,7 @@ export const addAccountInfoToRepoViewDetail = (
     invitesDisabled,
     threatSignatures,
     // pick some duplicate/unwanted details out
+    $type: _accountType,
     did: _did,
     handle: _handle,
     indexedAt: _indexedAt,
@@ -75,7 +91,8 @@ export const addAccountInfoToRepoViewDetail = (
   } = accountInfo
   return {
     ...otherAccountInfo,
-    ...repoView,
+    ...un$type(repoView),
+    moderation: un$type(repoView.moderation),
     email: includeEmail ? email : undefined,
     invitedBy,
     invitesDisabled,
@@ -106,7 +123,7 @@ export const addAccountInfoToRepoView = (
 
 export const getReasonType = (reasonType: ReportInput['reasonType']) => {
   if (reasonTypes.has(reasonType)) {
-    return reasonType as NonNullable<ModerationEvent['meta']>['reportType']
+    return reasonType
   }
   throw new InvalidRequestError('Invalid reason type')
 }
@@ -128,7 +145,7 @@ export const getReviewState = (reviewState?: string) => {
 
 const reviewStates = new Set([REVIEWCLOSED, REVIEWESCALATED, REVIEWOPEN])
 
-const reasonTypes = new Set([
+const reasonTypes = new Set<ReasonType>([
   REASONOTHER,
   REASONSPAM,
   REASONMISLEADING,