@atproto/ozone 0.0.15 → 0.0.16

package/dist/lexicon/lexicons.d.ts

@@ -779,6 +779,10 @@ export declare const schemaDict: {
                         type: string;
                         description: string;
                     };
+                    content: {
+                        type: string;
+                        description: string;
+                    };
                     comment: {
                         type: string;
                         description: string;
@@ -4731,6 +4735,7 @@ export declare const schemaDict: {
                     hideRepliesByUnfollowed: {
                         type: string;
                         description: string;
+                        default: boolean;
                     };
                     hideRepliesByLikeCount: {
                         type: string;

package/dist/lexicon/types/app/bsky/actor/defs.d.ts

@@ -88,7 +88,7 @@ export declare function validatePersonalDetailsPref(v: unknown): ValidationResul
 export interface FeedViewPref {
     feed: string;
     hideReplies?: boolean;
-    hideRepliesByUnfollowed?: boolean;
+    hideRepliesByUnfollowed: boolean;
     hideRepliesByLikeCount?: number;
     hideReposts?: boolean;
     hideQuotePosts?: boolean;

package/dist/lexicon/types/com/atproto/admin/defs.d.ts

@@ -313,6 +313,7 @@ export declare function isModEventUnmute(v: unknown): v is ModEventUnmute;
 export declare function validateModEventUnmute(v: unknown): ValidationResult;
 export interface ModEventEmail {
     subjectLine: string;
+    content?: string;
     comment?: string;
     [k: string]: unknown;
 }

package/dist/mod-service/index.d.ts

@@ -1,29 +1,33 @@
 import { CID } from 'multiformats/cid';
 import { AtUri } from '@atproto/syntax';
+import { IdResolver } from '@atproto/identity';
+import AtpAgent from '@atproto/api';
 import { Database } from '../db';
-import { AppviewAuth, ModerationViews } from './views';
+import { AuthHeaders, ModerationViews } from './views';
 import { Main as StrongRef } from '../lexicon/types/com/atproto/repo/strongRef';
 import { RepoRef, RepoBlobRef } from '../lexicon/types/com/atproto/admin/defs';
 import { ModEventType, ModerationEventRow, ModerationSubjectStatusRow, ReversibleModerationEvent } from './types';
 import { ModerationEvent } from '../db/schema/moderation_event';
-import AtpAgent from '@atproto/api';
 import { Label } from '../lexicon/types/com/atproto/label/defs';
 import { ModSubject, RecordSubject, RepoSubject } from './subject';
 import { BackgroundQueue } from '../background';
 import { EventPusher } from '../daemon';
 import { ImageInvalidator } from '../image-invalidator';
+import { OzoneConfig } from '../config';
 export type ModerationServiceCreator = (db: Database) => ModerationService;
 export declare class ModerationService {
     db: Database;
+    cfg: OzoneConfig;
     backgroundQueue: BackgroundQueue;
+    idResolver: IdResolver;
     eventPusher: EventPusher;
     appviewAgent: AtpAgent;
-    private appviewAuth;
+    private createAuthHeaders;
     serverDid: string;
     imgInvalidator?: ImageInvalidator | undefined;
     cdnPaths?: string[] | undefined;
-    constructor(db: Database, backgroundQueue: BackgroundQueue, eventPusher: EventPusher, appviewAgent: AtpAgent, appviewAuth: AppviewAuth, serverDid: string, imgInvalidator?: ImageInvalidator | undefined, cdnPaths?: string[] | undefined);
-    static creator(backgroundQueue: BackgroundQueue, eventPusher: EventPusher, appviewAgent: AtpAgent, appviewAuth: AppviewAuth, serverDid: string, imgInvalidator?: ImageInvalidator, cdnPaths?: string[]): (db: Database) => ModerationService;
+    constructor(db: Database, cfg: OzoneConfig, backgroundQueue: BackgroundQueue, idResolver: IdResolver, eventPusher: EventPusher, appviewAgent: AtpAgent, createAuthHeaders: (aud: string) => Promise<AuthHeaders>, serverDid: string, imgInvalidator?: ImageInvalidator | undefined, cdnPaths?: string[] | undefined);
+    static creator(cfg: OzoneConfig, backgroundQueue: BackgroundQueue, idResolver: IdResolver, eventPusher: EventPusher, appviewAgent: AtpAgent, createAuthHeaders: (aud: string) => Promise<AuthHeaders>, serverDid: string, imgInvalidator?: ImageInvalidator, cdnPaths?: string[]): (db: Database) => ModerationService;
     views: ModerationViews;
     getEvent(id: number): Promise<ModerationEventRow | undefined>;
     getEventOrThrow(id: number): Promise<ModerationEventRow>;
@@ -56,8 +60,8 @@ export declare class ModerationService {
     } | {
         cids: CID[];
     }): Promise<{
-        did: string;
         id: number;
+        did: string;
         createdAt: string;
         updatedAt: string;
         reviewState: "com.atproto.admin.defs#reviewOpen" | "com.atproto.admin.defs#reviewEscalated" | "com.atproto.admin.defs#reviewClosed";
@@ -142,8 +146,8 @@ export declare class ModerationService {
     }): Promise<{
         statuses: {
             handle: string;
-            did: string;
             id: number;
+            did: string;
             createdAt: string;
             updatedAt: string;
             reviewState: "com.atproto.admin.defs#reviewOpen" | "com.atproto.admin.defs#reviewEscalated" | "com.atproto.admin.defs#reviewClosed";
@@ -169,6 +173,11 @@ export declare class ModerationService {
         negate?: string[];
     }): Promise<Label[]>;
     createLabels(labels: Label[]): Promise<void>;
+    sendEmail(opts: {
+        content: string;
+        recipientDid: string;
+        subject: string;
+    }): Promise<void>;
 }
 export type TakedownSubjects = {
     did: string;

package/dist/mod-service/views.d.ts

@@ -5,16 +5,16 @@ import { ModEventView, RepoView, RepoViewDetail, RecordView, RecordViewDetail, R
 import { OutputSchema as ReportOutput } from '../lexicon/types/com/atproto/moderation/createReport';
 import { Label } from '../lexicon/types/com/atproto/label/defs';
 import { ModerationEventRowWithHandle, ModerationSubjectStatusRowWithHandle } from './types';
-export type AppviewAuth = () => Promise<{
+export type AuthHeaders = {
     headers: {
         authorization: string;
     };
-} | undefined>;
+};
 export declare class ModerationViews {
     private db;
     private appviewAgent;
     private appviewAuth;
-    constructor(db: Database, appviewAgent: AtpAgent, appviewAuth: AppviewAuth);
+    constructor(db: Database, appviewAgent: AtpAgent, appviewAuth: () => Promise<AuthHeaders>);
     getAccoutInfosByDid(dids: string[]): Promise<Map<string, AccountView>>;
     repos(dids: string[]): Promise<Map<string, RepoView>>;
     formatEvent(event: ModerationEventRowWithHandle): ModEventView;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -30,7 +30,7 @@
     "pino-http": "^8.2.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.10.4",
+    "@atproto/api": "^0.10.5",
     "@atproto/common": "^0.3.3",
     "@atproto/crypto": "^0.3.0",
     "@atproto/identity": "^0.3.2",
@@ -46,10 +46,10 @@
     "@types/pg": "^8.6.6",
     "@types/qs": "^6.9.7",
     "axios": "^0.27.2",
-    "@atproto/api": "^0.10.4",
-    "@atproto/dev-env": "^0.2.36",
+    "@atproto/api": "^0.10.5",
+    "@atproto/dev-env": "^0.2.37",
     "@atproto/lex-cli": "^0.3.1",
-    "@atproto/pds": "^0.4.4",
+    "@atproto/pds": "^0.4.5",
     "@atproto/xrpc": "^0.4.2"
   },
   "scripts": {

package/src/api/admin/createCommunicationTemplate.ts

@@ -4,13 +4,13 @@ import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.createCommunicationTemplate({
-    auth: ctx.roleVerifier,
+    auth: ctx.authVerifier.modOrRole,
     handler: async ({ input, auth }) => {
       const access = auth.credentials
       const db = ctx.db
       const { createdBy, ...template } = input.body
 
-      if (!access.admin) {
+      if (!access.isAdmin) {
         throw new AuthRequiredError(
           'Must be an admin to create a communication template',
         )

package/src/api/admin/deleteCommunicationTemplate.ts

@@ -4,13 +4,13 @@ import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.deleteCommunicationTemplate({
-    auth: ctx.roleVerifier,
+    auth: ctx.authVerifier.modOrRole,
     handler: async ({ input, auth }) => {
       const access = auth.credentials
       const db = ctx.db
       const { id } = input.body
 
-      if (!access.admin) {
+      if (!access.isAdmin) {
         throw new AuthRequiredError(
           'Must be an admin to delete a communication template',
         )

package/src/api/admin/emitModerationEvent.ts

@@ -2,16 +2,18 @@ import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
 import { Server } from '../../lexicon'
 import AppContext from '../../context'
 import {
+  isModEventEmail,
   isModEventLabel,
   isModEventReverseTakedown,
   isModEventTakedown,
 } from '../../lexicon/types/com/atproto/admin/defs'
 import { subjectFromInput } from '../../mod-service/subject'
 import { ModerationLangService } from '../../mod-service/lang'
+import { retryHttp } from '../../util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.emitModerationEvent({
-    auth: ctx.roleVerifier,
+    auth: ctx.authVerifier.modOrRole,
     handler: async ({ input, auth }) => {
       const access = auth.credentials
       const db = ctx.db
@@ -29,7 +31,7 @@ export default function (server: Server, ctx: AppContext) {
 
       // if less than moderator access then can only take ack and escalation actions
       if (isTakedownEvent || isReverseTakedownEvent) {
-        if (!access.moderator) {
+        if (!access.isModerator) {
           throw new AuthRequiredError(
             'Must be a full moderator to take this type of action',
           )
@@ -37,7 +39,7 @@ export default function (server: Server, ctx: AppContext) {
 
         // Non admins should not be able to take down feed generators
         if (
-          !access.admin &&
+          !access.isAdmin &&
           subject.recordPath?.includes('app.bsky.feed.generator/')
         ) {
           throw new AuthRequiredError(
@@ -46,7 +48,7 @@ export default function (server: Server, ctx: AppContext) {
         }
       }
       // if less than moderator access then can not apply labels
-      if (!access.moderator && isLabelEvent) {
+      if (!access.isModerator && isLabelEvent) {
         throw new AuthRequiredError('Must be a full moderator to label content')
       }
 
@@ -75,6 +77,23 @@ export default function (server: Server, ctx: AppContext) {
         }
       }
 
+      if (isModEventEmail(event) && event.content) {
+        // sending email prior to logging the event to avoid a long transaction below
+        if (!subject.isRepo()) {
+          throw new InvalidRequestError(
+            'Email can only be sent to a repo subject',
+          )
+        }
+        const { content, subjectLine } = event
+        await retryHttp(() =>
+          ctx.modService(db).sendEmail({
+            subject: subjectLine,
+            content,
+            recipientDid: subject.did,
+          }),
+        )
+      }
+
       const moderationEvent = await db.transaction(async (dbTxn) => {
         const moderationTxn = ctx.modService(dbTxn)
 

package/src/api/admin/getModerationEvent.ts

@@ -3,7 +3,7 @@ import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.getModerationEvent({
-    auth: ctx.roleVerifier,
+    auth: ctx.authVerifier.modOrRole,
     handler: async ({ params }) => {
       const { id } = params
       const db = ctx.db

package/src/api/admin/getRecord.ts

@@ -6,7 +6,7 @@ import { AtUri } from '@atproto/syntax'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.getRecord({
-    auth: ctx.roleVerifier,
+    auth: ctx.authVerifier.modOrRole,
     handler: async ({ params, auth }) => {
       const db = ctx.db
 
@@ -22,7 +22,7 @@ export default function (server: Server, ctx: AppContext) {
       record.repo = addAccountInfoToRepoView(
         record.repo,
         accountInfo,
-        auth.credentials.moderator,
+        auth.credentials.isModerator,
       )
 
       return {

package/src/api/admin/getRepo.ts

@@ -5,7 +5,7 @@ import { addAccountInfoToRepoViewDetail, getPdsAccountInfo } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.getRepo({
-    auth: ctx.roleVerifier,
+    auth: ctx.authVerifier.modOrRole,
     handler: async ({ params, auth }) => {
       const { did } = params
       const db = ctx.db
@@ -20,7 +20,7 @@ export default function (server: Server, ctx: AppContext) {
       const repo = addAccountInfoToRepoViewDetail(
         partialRepo,
         accountInfo,
-        auth.credentials.moderator,
+        auth.credentials.isModerator,
       )
       return {
         encoding: 'application/json',

package/src/api/admin/listCommunicationTemplates.ts

@@ -4,12 +4,12 @@ import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.listCommunicationTemplates({
-    auth: ctx.roleVerifier,
+    auth: ctx.authVerifier.modOrRole,
     handler: async ({ auth }) => {
       const access = auth.credentials
       const db = ctx.db
 
-      if (!access.moderator) {
+      if (!access.isModerator) {
         throw new AuthRequiredError(
           'Must be a full moderator to view list of communication template',
         )

package/src/api/admin/queryModerationEvents.ts

@@ -4,7 +4,7 @@ import { getEventType } from '../moderation/util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.queryModerationEvents({
-    auth: ctx.roleVerifier,
+    auth: ctx.authVerifier.modOrRole,
     handler: async ({ params }) => {
       const {
         subject,

package/src/api/admin/queryModerationStatuses.ts

@@ -4,7 +4,7 @@ import { getReviewState } from '../moderation/util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.queryModerationStatuses({
-    auth: ctx.roleVerifier,
+    auth: ctx.authVerifier.modOrRole,
     handler: async ({ params }) => {
       const {
         subject,

package/src/api/admin/searchRepos.ts

@@ -4,7 +4,7 @@ import { mapDefined } from '@atproto/common'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.searchRepos({
-    auth: ctx.roleVerifier,
+    auth: ctx.authVerifier.modOrRole,
     handler: async ({ params }) => {
       const modService = ctx.modService(ctx.db)
 

package/src/api/admin/updateCommunicationTemplate.ts

@@ -4,13 +4,13 @@ import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.updateCommunicationTemplate({
-    auth: ctx.roleVerifier,
+    auth: ctx.authVerifier.modOrRole,
     handler: async ({ input, auth }) => {
       const access = auth.credentials
       const db = ctx.db
       const { id, updatedBy, ...template } = input.body
 
-      if (!access.admin) {
+      if (!access.isAdmin) {
         throw new AuthRequiredError(
           'Must be an admin to update a communication template',
         )

package/src/api/index.ts

@@ -15,6 +15,7 @@ import createCommunicationTemplate from './admin/createCommunicationTemplate'
 import updateCommunicationTemplate from './admin/updateCommunicationTemplate'
 import deleteCommunicationTemplate from './admin/deleteCommunicationTemplate'
 import listCommunicationTemplates from './admin/listCommunicationTemplates'
+import proxied from './proxied'
 
 export * as health from './health'
 
@@ -36,5 +37,6 @@ export default function (server: Server, ctx: AppContext) {
   createCommunicationTemplate(server, ctx)
   updateCommunicationTemplate(server, ctx)
   deleteCommunicationTemplate(server, ctx)
+  proxied(server, ctx)
   return server
 }

package/src/api/moderation/createReport.ts

@@ -9,10 +9,10 @@ import { ModerationLangService } from '../../mod-service/lang'
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.moderation.createReport({
     // @TODO anonymous reports w/ optional auth are a temporary measure
-    auth: ctx.authOptionalAccessOrRoleVerifier,
+    auth: ctx.authVerifier.standardOptionalOrRole,
     handler: async ({ input, auth }) => {
       const requester =
-        'did' in auth.credentials ? auth.credentials.did : ctx.cfg.service.did
+        'iss' in auth.credentials ? auth.credentials.iss : ctx.cfg.service.did
       const { reasonType, reason } = input.body
       const subject = subjectFromInput(input.body.subject)
 

package/src/api/proxied.ts

@@ -0,0 +1,116 @@
+import { Server } from '../lexicon'
+import AppContext from '../context'
+
+export default function (server: Server, ctx: AppContext) {
+  server.app.bsky.actor.getProfile({
+    auth: ctx.authVerifier.modOrRole,
+    handler: async (request) => {
+      const res = await ctx.appviewAgent.api.app.bsky.actor.getProfile(
+        request.params,
+        await ctx.appviewAuth(),
+      )
+      return {
+        encoding: 'application/json',
+        body: res.data,
+      }
+    },
+  })
+
+  server.app.bsky.actor.getProfiles({
+    auth: ctx.authVerifier.modOrRole,
+    handler: async (request) => {
+      const res = await ctx.appviewAgent.api.app.bsky.actor.getProfiles(
+        request.params,
+        await ctx.appviewAuth(),
+      )
+      return {
+        encoding: 'application/json',
+        body: res.data,
+      }
+    },
+  })
+
+  server.app.bsky.feed.getAuthorFeed({
+    auth: ctx.authVerifier.modOrRole,
+    handler: async (request) => {
+      const res = await ctx.appviewAgent.api.app.bsky.feed.getAuthorFeed(
+        request.params,
+        await ctx.appviewAuth(),
+      )
+      return {
+        encoding: 'application/json',
+        body: res.data,
+      }
+    },
+  })
+
+  server.app.bsky.feed.getPostThread({
+    auth: ctx.authVerifier.modOrRole,
+    handler: async (request) => {
+      const res = await ctx.appviewAgent.api.app.bsky.feed.getPostThread(
+        request.params,
+        await ctx.appviewAuth(),
+      )
+      return {
+        encoding: 'application/json',
+        body: res.data,
+      }
+    },
+  })
+
+  server.app.bsky.feed.getFeedGenerator({
+    auth: ctx.authVerifier.modOrRole,
+    handler: async (request) => {
+      const res = await ctx.appviewAgent.api.app.bsky.feed.getFeedGenerator(
+        request.params,
+        await ctx.appviewAuth(),
+      )
+      return {
+        encoding: 'application/json',
+        body: res.data,
+      }
+    },
+  })
+
+  server.app.bsky.graph.getFollows({
+    auth: ctx.authVerifier.modOrRole,
+    handler: async (request) => {
+      const res = await ctx.appviewAgent.api.app.bsky.graph.getFollows(
+        request.params,
+        await ctx.appviewAuth(),
+      )
+      return {
+        encoding: 'application/json',
+        body: res.data,
+      }
+    },
+  })
+
+  server.app.bsky.graph.getFollowers({
+    auth: ctx.authVerifier.modOrRole,
+    handler: async (request) => {
+      const res = await ctx.appviewAgent.api.app.bsky.graph.getFollowers(
+        request.params,
+        await ctx.appviewAuth(),
+      )
+      return {
+        encoding: 'application/json',
+        body: res.data,
+      }
+    },
+  })
+
+  server.app.bsky.graph.getList({
+    auth: ctx.authVerifier.modOrRole,
+    handler: async (request) => {
+      const res = await ctx.appviewAgent.api.app.bsky.graph.getList(
+        request.params,
+        await ctx.appviewAuth(),
+      )
+      return {
+        encoding: 'application/json',
+        body: res.data,
+      }
+    },
+  })
+}

package/src/api/temp/fetchLabels.ts

@@ -8,13 +8,13 @@ import {
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.temp.fetchLabels({
-    auth: ctx.authOptionalAccessOrRoleVerifier,
+    auth: ctx.authVerifier.standardOptionalOrRole,
     handler: async ({ auth, params }) => {
       const { limit } = params
       const since =
         params.since !== undefined ? new Date(params.since).toISOString() : ''
       const includeUnspeccedTakedowns =
-        auth.credentials.type === 'role' && auth.credentials.admin
+        auth.credentials.type === 'none' ? false : auth.credentials.isAdmin
       const labelRes = await ctx.db.db
         .selectFrom('label')
         .selectAll()

package/src/api/well-known.ts

@@ -15,7 +15,7 @@ export const createRouter = (ctx: AppContext): express.Router => {
       id: ctx.cfg.service.did,
       verificationMethod: [
         {
-          id: `${ctx.cfg.service.did}#atproto`,
+          id: `${ctx.cfg.service.did}#atproto_label`,
           type: 'Multikey',
           controller: ctx.cfg.service.did,
           publicKeyMultibase: ctx.signingKey.did().replace('did:key:', ''),
@@ -23,8 +23,8 @@ export const createRouter = (ctx: AppContext): express.Router => {
       ],
       service: [
         {
-          id: '#atproto_mod',
-          type: 'AtprotoModerationService',
+          id: '#atproto_labeler',
+          type: 'AtprotoLabeler',
           serviceEndpoint: `https://${hostname}`,
         },
       ],