summaryrefslogtreecommitdiff
path: root/packages/backend/src/server
diff options
context:
space:
mode:
authorMarie <marie@kaifa.ch>2024-04-07 15:36:59 +0000
committerMarie <marie@kaifa.ch>2024-04-07 15:36:59 +0000
commitbb7b4a8ea4249be07ac04e1e12dd1b9918f40eeb (patch)
tree19092d791f1675971751fe244ca32cb7e726b768 /packages/backend/src/server
parentmerge: fix: load libopenmpt on demand (!469) (diff)
parentfix: send null for empty edited_at in mastodon api (diff)
downloadsharkey-bb7b4a8ea4249be07ac04e1e12dd1b9918f40eeb.tar.gz
sharkey-bb7b4a8ea4249be07ac04e1e12dd1b9918f40eeb.tar.bz2
sharkey-bb7b4a8ea4249be07ac04e1e12dd1b9918f40eeb.zip
merge: fix: send null for empty edited_at in mastodon api (!487)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/487 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Marie <marie@kaifa.ch>
Diffstat (limited to 'packages/backend/src/server')
-rw-r--r--packages/backend/src/server/api/mastodon/converters.ts5
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/backend/src/server/api/mastodon/converters.ts b/packages/backend/src/server/api/mastodon/converters.ts
index 20fccec21d..60e25c0dfd 100644
--- a/packages/backend/src/server/api/mastodon/converters.ts
+++ b/packages/backend/src/server/api/mastodon/converters.ts
@@ -83,7 +83,7 @@ export class MastoConverters {
}
return 'unknown';
}
-
+
public encodeFile(f: any): Entity.Attachment {
return {
id: f.id,
@@ -279,7 +279,8 @@ export class MastoConverters {
emoji_reactions: status.emoji_reactions,
bookmarked: false,
quote: isQuote ? await this.convertReblog(status.reblog) : false,
- edited_at: note.updatedAt?.toISOString(),
+ // optional chaining cannot be used, as it evaluates to undefined, not null
+ edited_at: note.updatedAt ? note.updatedAt.toISOString() : null,
});
}
}