From bd66c4420fa153f4866ef6417153cf13ad0d19c6 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 21 Jan 2021 18:16:43 +0000
Subject: [PATCH] Remove nomadicLocations

---
 daemon.py |  6 +-----
 person.py | 10 ----------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/daemon.py b/daemon.py
index 3e2486b0a..96e954a25 100644
--- a/daemon.py
+++ b/daemon.py
@@ -3873,7 +3873,7 @@ class PubServer(BaseHTTPRequestHandler):
                     if not actorJson.get('discoverable'):
                         # discoverable in profile directory
                         # which isn't implemented in Epicyon
-                        actorJson['discoverable'] = False
+                        actorJson['discoverable'] = True
                         actorChanged = True
                     if not actorJson['@context'][2].get('orgSchema'):
                         actorJson['@context'][2]['orgSchema'] = \
@@ -3891,10 +3891,6 @@ class PubServer(BaseHTTPRequestHandler):
                     if not actorJson['@context'][2].get('availability'):
                         actorJson['@context'][2]['availaibility'] = \
                             'toot:availability'
-                    if not actorJson['@context'][2].get('nomadicLocations'):
-                        actorJson['@context'][2]['nomadicLocations'] = \
-                            'toot:nomadicLocations'
-                        actorChanged = True
                     if actorJson.get('capabilityAcquisitionEndpoint'):
                         del actorJson['capabilityAcquisitionEndpoint']
                         actorChanged = True
diff --git a/person.py b/person.py
index 7f53c98b1..95c6f9bca 100644
--- a/person.py
+++ b/person.py
@@ -540,16 +540,6 @@ def personUpgradeActor(baseDir: str, personJson: {},
         return
     if not personJson:
         personJson = loadJson(filename)
-    if not personJson.get('nomadicLocations'):
-        personJson['nomadicLocations'] = [{
-            'id': personJson['id'],
-            'type': 'nomadicLocation',
-            'locationAddress':'acct:'+handle,
-            'locationPrimary':True,
-            'locationDeleted':False
-        }]
-        print('Nomadic locations added to to actor ' + handle)
-        updateActor = True
 
     if updateActor:
         saveJson(personJson, filename)