From e79643a47b074bddec736ed7408e7872f38b43d8 Mon Sep 17 00:00:00 2001 From: Benjamin Braatz Date: Wed, 22 Sep 2021 14:57:13 +0200 Subject: [PATCH] Also handle cases without trailing slash in translation. --- controlpi_plugins/wsclient.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/controlpi_plugins/wsclient.py b/controlpi_plugins/wsclient.py index f0a2263..1043baf 100644 --- a/controlpi_plugins/wsclient.py +++ b/controlpi_plugins/wsclient.py @@ -27,7 +27,8 @@ def translate_message(original_message: Dict[str, Any], sender: str, original_sender = sender if 'original sender' in message: assert isinstance(message['original sender'], str) - if message['original sender'].startswith(prefix): + if (message['original sender'] == receiver + or message['original sender'].startswith(prefix)): return None original_sender += '/' + message['original sender'] elif 'sender' in message: @@ -41,6 +42,8 @@ def translate_message(original_message: Dict[str, Any], sender: str, target = message['target'] if target == '': target = sender + elif target == receiver: + target = '' elif target.startswith(prefix): target = target[len(prefix):] else: @@ -83,6 +86,8 @@ def translate_template(original_template: Dict[str, Any], sender: str, target = template['target']['const'] if target == '': target = sender + elif target == receiver: + target = '' elif target.startswith(prefix): target = target[len(prefix):] else: -- 2.34.1