summaryrefslogtreecommitdiff
path: root/packages/backend/src/core/AccountMoveService.ts
diff options
context:
space:
mode:
authorMarie <github@yuugi.dev>2025-05-08 09:17:07 +0000
committerMarie <github@yuugi.dev>2025-05-08 09:17:07 +0000
commita72610c8d6b9dba03a0270f6c9aa86c76cbb8bd9 (patch)
treeee30fb9fbe48e0b4711e3cd51f4484e9aac0ce66 /packages/backend/src/core/AccountMoveService.ts
parentmerge: Respect "enable favicon notification dot" setting (resolves #1048) (!988) (diff)
parentreorder relay activities to avoid delivery race condition (diff)
downloadsharkey-a72610c8d6b9dba03a0270f6c9aa86c76cbb8bd9.tar.gz
sharkey-a72610c8d6b9dba03a0270f6c9aa86c76cbb8bd9.tar.bz2
sharkey-a72610c8d6b9dba03a0270f6c9aa86c76cbb8bd9.zip
merge: Reorder relay activities to avoid delivery race condition (resolves #989) (!986)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/986 Closes #989 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages/backend/src/core/AccountMoveService.ts')
-rw-r--r--packages/backend/src/core/AccountMoveService.ts3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/backend/src/core/AccountMoveService.ts b/packages/backend/src/core/AccountMoveService.ts
index 7bf33e13c5..738026f753 100644
--- a/packages/backend/src/core/AccountMoveService.ts
+++ b/packages/backend/src/core/AccountMoveService.ts
@@ -95,11 +95,12 @@ export class AccountMoveService {
const srcPerson = await this.apRendererService.renderPerson(src);
const updateAct = this.apRendererService.addContext(this.apRendererService.renderUpdate(srcPerson, src));
await this.apDeliverManagerService.deliverToFollowers(src, updateAct);
- this.relayService.deliverToRelays(src, updateAct);
+ await this.relayService.deliverToRelays(src, updateAct);
// Deliver Move activity to the followers of the old account
const moveAct = this.apRendererService.addContext(this.apRendererService.renderMove(src, dst));
await this.apDeliverManagerService.deliverToFollowers(src, moveAct);
+ await this.relayService.deliverToRelays(src, moveAct);
// Publish meUpdated event
const iObj = await this.userEntityService.pack(src.id, src, { schema: 'MeDetailed', includeSecrets: true });