From 049f3f7e09552ac2e84edc6dafb3ab0a5c9e6b7f Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 1 Dec 2022 11:10:32 +0000 Subject: [PATCH 1/2] Exctra checks for moved actor --- daemon.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/daemon.py b/daemon.py index c4ebce580..4e9f50727 100644 --- a/daemon.py +++ b/daemon.py @@ -3008,9 +3008,11 @@ class PubServer(BaseHTTPRequestHandler): options_actor = options_actor.split('&')[0] # actor for the movedTo - options_actor_moved = options_confirm_params.split('movedToActor=')[1] - if '&' in options_actor_moved: - options_actor_moved = options_actor_moved.split('&')[0] + options_actor_moved = None + if 'movedToActor=' in options_confirm_params: + options_actor_moved = options_confirm_params.split('movedToActor=')[1] + if '&' in options_actor_moved: + options_actor_moved = options_actor_moved.split('&')[0] # url of the avatar options_avatar_url = options_confirm_params.split('avatarUrl=')[1] @@ -3421,7 +3423,7 @@ class PubServer(BaseHTTPRequestHandler): # person options screen, move button # See html_person_options followStr - if '&submitMove=' in options_confirm_params: + if '&submitMove=' in options_confirm_params and options_actor_moved: if debug: print('Moving ' + options_actor_moved) msg = \ From a68787d162107e39bdb03f618903f4dd675a86fa Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 1 Dec 2022 11:16:46 +0000 Subject: [PATCH 2/2] Tidying --- daemon.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/daemon.py b/daemon.py index 4e9f50727..caa4bffe1 100644 --- a/daemon.py +++ b/daemon.py @@ -3010,7 +3010,8 @@ class PubServer(BaseHTTPRequestHandler): # actor for the movedTo options_actor_moved = None if 'movedToActor=' in options_confirm_params: - options_actor_moved = options_confirm_params.split('movedToActor=')[1] + options_actor_moved = \ + options_confirm_params.split('movedToActor=')[1] if '&' in options_actor_moved: options_actor_moved = options_actor_moved.split('&')[0]