Fix broken local actors

Some channels can't federate because they don't have public/private
keys, maybe because the generation failed for various reasons

2 files changed, 25 insertions, 0 deletions

diff --git a/server/lib/job-queue/handlers/actor-keys.ts b/server/lib/job-queue/handlers/actor-keys.ts
new file mode 100644
index 000000000..8da549640
--- /dev/null
+++ b/server/lib/job-queue/handlers/actor-keys.ts
@@ -0,0 +1,20 @@
+import * as Bull from 'bull'
+import { generateAndSaveActorKeys } from '@server/lib/activitypub/actor'
+import { ActorModel } from '@server/models/activitypub/actor'
+import { ActorKeysPayload } from '@shared/models'
+import { logger } from '../../../helpers/logger'
+
+async function processActorKeys (job: Bull.Job) {
+  const payload = job.data as ActorKeysPayload
+  logger.info('Processing email in job %d.', job.id)
+
+  const actor = await ActorModel.load(payload.actorId)
+
+  await generateAndSaveActorKeys(actor)
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+  processActorKeys
+}
diff --git a/server/lib/job-queue/job-queue.ts b/server/lib/job-queue/job-queue.ts
index 72fed6072..efda2e038 100644
--- a/server/lib/job-queue/job-queue.ts
+++ b/server/lib/job-queue/job-queue.ts
@@ -7,6 +7,7 @@ import {
   ActivitypubHttpBroadcastPayload,
   ActivitypubHttpFetcherPayload,
   ActivitypubHttpUnicastPayload,
+  ActorKeysPayload,
   EmailPayload,
   JobState,
   JobType,
@@ -25,6 +26,7 @@ import { processActivityPubHttpBroadcast } from './handlers/activitypub-http-bro
 import { processActivityPubHttpFetcher } from './handlers/activitypub-http-fetcher'
 import { processActivityPubHttpUnicast } from './handlers/activitypub-http-unicast'
 import { refreshAPObject } from './handlers/activitypub-refresher'
+import { processActorKeys } from './handlers/actor-keys'
 import { processEmail } from './handlers/email'
 import { processVideoFileImport } from './handlers/video-file-import'
 import { processVideoImport } from './handlers/video-import'
@@ -44,6 +46,7 @@ type CreateJobArgument =
   { type: 'activitypub-refresher', payload: RefreshPayload } |
   { type: 'videos-views', payload: {} } |
   { type: 'video-live-ending', payload: VideoLiveEndingPayload } |
+  { type: 'actor-keys', payload: ActorKeysPayload } |
   { type: 'video-redundancy', payload: VideoRedundancyPayload }
 
 type CreateJobOptions = {
@@ -63,6 +66,7 @@ const handlers: { [id in JobType]: (job: Bull.Job) => Promise<any> } = {
   'videos-views': processVideosViews,
   'activitypub-refresher': refreshAPObject,
   'video-live-ending': processVideoLiveEnding,
+  'actor-keys': processActorKeys,
   'video-redundancy': processVideoRedundancy
 }
 
@@ -78,6 +82,7 @@ const jobTypes: JobType[] = [
   'videos-views',
   'activitypub-refresher',
   'video-redundancy',
+  'actor-keys',
   'video-live-ending'
 ]