# HG changeset patch # User Goffi # Date 1665859113 -7200 # Node ID 748094d5a74d36b80ea1d2e21c43ddac23653480 # Parent 8dc6a4cfda4baddfe37ca0c30fcc0185a4bb8742 plugin XEP-0374, XEP-0384: handle cases where "to" is not set in for `feedback_jid` diff -r 8dc6a4cfda4b -r 748094d5a74d sat/plugins/plugin_xep_0374.py --- a/sat/plugins/plugin_xep_0374.py Sat Oct 15 20:38:33 2022 +0200 +++ b/sat/plugins/plugin_xep_0374.py Sat Oct 15 20:38:33 2022 +0200 @@ -209,7 +209,10 @@ if sender_jid.userhostJID() == client.jid.userhostJID(): # TODO: I've seen this cause an exception "builtins.KeyError: 'to'", seems # like "to" isn't always set. - feedback_jid = jid.JID(message_elt["to"]) + try: + feedback_jid = jid.JID(message_elt["to"]) + except KeyError: + feedback_jid = client.server_jid else: feedback_jid = sender_jid diff -r 8dc6a4cfda4b -r 748094d5a74d sat/plugins/plugin_xep_0384.py --- a/sat/plugins/plugin_xep_0384.py Sat Oct 15 20:38:33 2022 +0200 +++ b/sat/plugins/plugin_xep_0384.py Sat Oct 15 20:38:33 2022 +0200 @@ -75,7 +75,6 @@ "OMEMO" ] - log = cast(Logger, getLogger(__name__)) # type: ignore[no-untyped-call] @@ -1572,7 +1571,10 @@ if sender_jid.userhostJID() == client.jid.userhostJID(): # TODO: I've seen this cause an exception "builtins.KeyError: 'to'", seems # like "to" isn't always set. - feedback_jid = jid.JID(message_elt["to"]) + try: + feedback_jid = jid.JID(message_elt["to"]) + except KeyError: + feedback_jid = client.server_jid else: feedback_jid = sender_jid