Read from mergedGeolocation when setting mod authorities (#9509)

* Read from mergedGeolocation when setting mod authorities

* Add deprecation notice

(cherry picked from commit 4407e59e15)

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
 

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