@atproto/ozone 0.1.160 → 0.1.162

package/src/api/moderation/emitEvent.ts

@@ -315,36 +315,44 @@ export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.moderation.emitEvent({
     auth: ctx.authVerifier.modOrAdminToken,
     handler: async ({ input, auth }) => {
-      const moderationEvent = await handleModerationEvent({
-        input,
-        auth,
-        ctx,
-      })
-
-      // On divert events, we need to automatically take down the blobs
-      if (isModEventDivert(input.body.event)) {
-        await handleModerationEvent({
+      try {
+        const moderationEvent = await handleModerationEvent({
+          input,
           auth,
           ctx,
-          input: {
-            ...input,
-            body: {
-              ...input.body,
-              event: {
-                ...input.body.event,
-                $type: 'tools.ozone.moderation.defs#modEventTakedown',
-                comment:
-                  '[DIVERT_SIDE_EFFECT]: Automatically taking down after divert event',
+        })
+
+        // On divert events, we need to automatically take down the blobs
+        if (isModEventDivert(input.body.event)) {
+          await handleModerationEvent({
+            auth,
+            ctx,
+            input: {
+              ...input,
+              body: {
+                ...input.body,
+                event: {
+                  ...input.body.event,
+                  $type: 'tools.ozone.moderation.defs#modEventTakedown',
+                  comment:
+                    '[DIVERT_SIDE_EFFECT]: Automatically taking down after divert event',
+                },
+                modTool: input.body.modTool,
               },
-              modTool: input.body.modTool,
             },
-          },
-        })
-      }
+          })
+        }
 
-      return {
-        encoding: 'application/json',
-        body: moderationEvent,
+        return {
+          encoding: 'application/json',
+          body: moderationEvent,
+        }
+      } catch (err) {
+        httpLogger.error(
+          { err, body: input.body },
+          'failed to emit moderation event',
+        )
+        throw err
       }
     },
   })

package/src/daemon/materialized-view-refresher.ts

@@ -1,6 +1,7 @@
 import { sql } from 'kysely'
 import { MINUTE } from '@atproto/common'
 import { BackgroundQueue, PeriodicBackgroundTask } from '../background'
+import { dbLogger } from '../logger'
 
 export class MaterializedViewRefresher extends PeriodicBackgroundTask {
   constructor(backgroundQueue: BackgroundQueue, interval = 30 * MINUTE) {
@@ -18,9 +19,14 @@ export class MaterializedViewRefresher extends PeriodicBackgroundTask {
         // wait for the current refresh to finish before exiting. This is not
         // ideal, but it is the best we can do until Kysely provides a way to
         // cancel a query.
-        await sql`REFRESH MATERIALIZED VIEW CONCURRENTLY ${sql.id(view)}`.execute(
-          db,
-        )
+        try {
+          await sql`REFRESH MATERIALIZED VIEW CONCURRENTLY ${sql.id(view)}`.execute(
+            db,
+          )
+          dbLogger.info(`refreshed materialized view ${view}`)
+        } catch (err) {
+          dbLogger.error({ err, view }, 'failed to refresh materialized view')
+        }
       }
     })
   }

package/src/lexicon/index.ts

@@ -28,8 +28,13 @@ import * as AppBskyContactGetMatches from './types/app/bsky/contact/getMatches.j
 import * as AppBskyContactGetSyncStatus from './types/app/bsky/contact/getSyncStatus.js'
 import * as AppBskyContactImportContacts from './types/app/bsky/contact/importContacts.js'
 import * as AppBskyContactRemoveData from './types/app/bsky/contact/removeData.js'
+import * as AppBskyContactSendNotification from './types/app/bsky/contact/sendNotification.js'
 import * as AppBskyContactStartPhoneVerification from './types/app/bsky/contact/startPhoneVerification.js'
 import * as AppBskyContactVerifyPhone from './types/app/bsky/contact/verifyPhone.js'
+import * as AppBskyDraftCreateDraft from './types/app/bsky/draft/createDraft.js'
+import * as AppBskyDraftDeleteDraft from './types/app/bsky/draft/deleteDraft.js'
+import * as AppBskyDraftGetDrafts from './types/app/bsky/draft/getDrafts.js'
+import * as AppBskyDraftUpdateDraft from './types/app/bsky/draft/updateDraft.js'
 import * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator.js'
 import * as AppBskyFeedGetActorFeeds from './types/app/bsky/feed/getActorFeeds.js'
 import * as AppBskyFeedGetActorLikes from './types/app/bsky/feed/getActorLikes.js'
@@ -405,6 +410,7 @@ export class AppBskyNS {
   ageassurance: AppBskyAgeassuranceNS
   bookmark: AppBskyBookmarkNS
   contact: AppBskyContactNS
+  draft: AppBskyDraftNS
   embed: AppBskyEmbedNS
   feed: AppBskyFeedNS
   graph: AppBskyGraphNS
@@ -420,6 +426,7 @@ export class AppBskyNS {
     this.ageassurance = new AppBskyAgeassuranceNS(server)
     this.bookmark = new AppBskyBookmarkNS(server)
     this.contact = new AppBskyContactNS(server)
+    this.draft = new AppBskyDraftNS(server)
     this.embed = new AppBskyEmbedNS(server)
     this.feed = new AppBskyFeedNS(server)
     this.graph = new AppBskyGraphNS(server)
@@ -678,6 +685,18 @@ export class AppBskyContactNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  sendNotification<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyContactSendNotification.QueryParams,
+      AppBskyContactSendNotification.HandlerInput,
+      AppBskyContactSendNotification.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.contact.sendNotification' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   startPhoneVerification<A extends Auth = void>(
     cfg: MethodConfigOrHandler<
       A,
@@ -703,6 +722,62 @@ export class AppBskyContactNS {
   }
 }
 
+export class AppBskyDraftNS {
+  _server: Server
+
+  constructor(server: Server) {
+    this._server = server
+  }
+
+  createDraft<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyDraftCreateDraft.QueryParams,
+      AppBskyDraftCreateDraft.HandlerInput,
+      AppBskyDraftCreateDraft.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.draft.createDraft' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  deleteDraft<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyDraftDeleteDraft.QueryParams,
+      AppBskyDraftDeleteDraft.HandlerInput,
+      AppBskyDraftDeleteDraft.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.draft.deleteDraft' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  getDrafts<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyDraftGetDrafts.QueryParams,
+      AppBskyDraftGetDrafts.HandlerInput,
+      AppBskyDraftGetDrafts.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.draft.getDrafts' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  updateDraft<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyDraftUpdateDraft.QueryParams,
+      AppBskyDraftUpdateDraft.HandlerInput,
+      AppBskyDraftUpdateDraft.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.draft.updateDraft' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+}
+
 export class AppBskyEmbedNS {
   _server: Server