From 7991d6fea683ee33a774be6aa3c9050f7a50d90d Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Mon, 8 Dec 2025 19:24:19 -0600 Subject: [PATCH] Read from mergedGeolocation when setting mod authorities (#9509) * Read from mergedGeolocation when setting mod authorities * Add deprecation notice (cherry picked from commit 4407e59e156875dcb2fd97bf390574ab6c9f5133) --- src/state/session/additional-moderation-authorities.ts | 2 +- src/storage/schema.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/state/session/additional-moderation-authorities.ts b/src/state/session/additional-moderation-authorities.ts index 7f0adf7977..8c2511b8e8 100644 --- a/src/state/session/additional-moderation-authorities.ts +++ b/src/state/session/additional-moderation-authorities.ts @@ -70,7 +70,7 @@ export function isNonConfigurableModerationAuthority(did: string) { } export function configureAdditionalModerationAuthorities() { - const geolocation = device.get(['geolocation']) + const geolocation = device.get(['mergedGeolocation']) // default to all let additionalLabelers: string[] = MODERATION_AUTHORITIES_DIDS diff --git a/src/storage/schema.ts b/src/storage/schema.ts index 4cc9782262..d1e4a8d88c 100644 --- a/src/storage/schema.ts +++ b/src/storage/schema.ts @@ -13,6 +13,8 @@ export type Device = { * Geolocation config, fetched from the IP service. This previously did * double duty as the "status" for geolocation state, but that has since * moved here to the client. + * + * @deprecated use `mergedGeolocation` instead */ geolocation?: { countryCode: string | undefined