merge: fix make sure that signToActivityPubGet defaults to true (#352)

Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/352
Reviewed-by: dakkar <dakkar@noreply.git.joinshakrey.org>
This commit is contained in:
Marie 2024-01-17 17:01:39 +01:00
commit 0d766a6310

View file

@ -149,7 +149,7 @@ export type Config = {
inboxJobMaxAttempts: number | undefined;
proxyRemoteFiles: boolean | undefined;
customMOTD: string[] | undefined;
signToActivityPubGet: boolean | undefined;
signToActivityPubGet: boolean;
checkActivityPubGetSignature: boolean | undefined;
version: string;
@ -265,7 +265,7 @@ export function loadConfig(): Config {
inboxJobMaxAttempts: config.inboxJobMaxAttempts,
proxyRemoteFiles: config.proxyRemoteFiles,
customMOTD: config.customMOTD,
signToActivityPubGet: config.signToActivityPubGet,
signToActivityPubGet: config.signToActivityPubGet ?? true,
checkActivityPubGetSignature: config.checkActivityPubGetSignature,
mediaProxy: externalMediaProxy ?? internalMediaProxy,
externalMediaProxyEnabled: externalMediaProxy !== null && externalMediaProxy !== internalMediaProxy,