From c9a5f9b64e0cc06b48c79d76b62f640b8c57322d Mon Sep 17 00:00:00 2001 From: Simon Dablander Date: Fri, 22 May 2026 20:39:10 +0200 Subject: [PATCH 1/2] fix: check if `social_acc` is `None` When self hosting, an `org_member` might not have a `socialaccount` set. --- backend/api/emails.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/api/emails.py b/backend/api/emails.py index 47c0ed52a..22d1e74b5 100644 --- a/backend/api/emails.py +++ b/backend/api/emails.py @@ -28,7 +28,7 @@ def _frontend_url(): def get_org_member_name(org_member): social_acc = org_member.user.socialaccount_set.first() - member_name = social_acc.extra_data.get("name") + member_name = social_acc.extra_data.get("name") if social_acc else None if member_name is None: member_name = org_member.user.email From 4a2f8b59a3eb598f8fadf837cf11288b0dca4243 Mon Sep 17 00:00:00 2001 From: Simon Dablander Date: Sun, 24 May 2026 19:08:33 +0200 Subject: [PATCH 2/2] fix: check if `full_name` is set before using `email` --- backend/api/emails.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/backend/api/emails.py b/backend/api/emails.py index 22d1e74b5..a7d6618ef 100644 --- a/backend/api/emails.py +++ b/backend/api/emails.py @@ -26,14 +26,18 @@ def _frontend_url(): def get_org_member_name(org_member): - social_acc = org_member.user.socialaccount_set.first() + user = org_member.user - member_name = social_acc.extra_data.get("name") if social_acc else None + social_acc = user.socialaccount_set.first() + if social_acc: + name = (social_acc.extra_data or {}).get("name") + if name: + return name - if member_name is None: - member_name = org_member.user.email + if user.full_name: + return user.full_name - return member_name + return user.email def send_email(subject, recipient_list, template_name, context):