Authentication-Results: mail-b.sr.ht; dkim=pass header.d=splintermail.com header.i=@splintermail.com Received: from splintermail.com (splintermail.com [206.189.222.90]) by mail-b.sr.ht (Postfix) with ESMTPS id 7DDB711EED7 for <~nicoco/public-inbox@lists.sr.ht>; Sun, 31 Jul 2022 15:00:43 +0000 (UTC) Received: (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by splintermail.com (Postfix) with ESMTPSA id 73B4AA00B5; Sun, 31 Jul 2022 09:00:42 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=splintermail.com; s=mail; t=1659279642; bh=4fU+XVKqcwaa5Zd9lg6lT3f4cxaWZGXi3GKkqo7zRvE=; h=From:To:Cc:Subject:Date:From; b=X0+V5re7pkz9Rp19q5eTKhcvaO5SgMXQnriQnkhxPtymA889jKr2DWwJmQ2GhKaX9 d2qFYQx6WNiA4TO01lfVSZd0x6YuPyUDXdaZ1yM0ZgRczqQiPhZT+8De3K4AXHrXYE ZH25CpTBmdgYc9Y39/RbXlMQJziGEUy5/PXhrnqQ= From: Rex Roni To: ~nicoco/public-inbox@lists.sr.ht Cc: Rex Roni Subject: [PATCH v2] Signal: fix missing profile.name handling Date: Sun, 31 Jul 2022 15:00:20 +0000 Message-Id: <20220731150020.222547-1-rexroni@splintermail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Bug introduced in 29df2273: if profile.name is None, an exception would be raised before falling back to profile.profile_name. --- slidge/plugins/signal/session.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slidge/plugins/signal/session.py b/slidge/plugins/signal/session.py index deec944..dd551ed 100644 --- a/slidge/plugins/signal/session.py +++ b/slidge/plugins/signal/session.py @@ -150,9 +150,9 @@ class Session(BaseSession["Contact", "Roster", "Gateway"]): ) contact = self.contacts.by_phone(profile.address.number) contact.uuid = profile.address.uuid - contact.name = profile.name.replace( - "\u0000", " " - ) or profile.profile_name.replace("\u0000", " ") + contact.name = profile.name or profile.profile_name + if contact.name is not None: + contact.name = contact.name.replace("\u0000", "") if full_profile.avatar is not None: with open(full_profile.avatar, "rb") as f: contact.avatar = f.read() -- 2.37.1