From 113e61d418601286200d52a8285764e44e8a8e42 Mon Sep 17 00:00:00 2001 From: Fernando Olivares Date: Sun, 25 Jan 2026 21:23:57 -0600 Subject: [PATCH] Add avatar_url so we always get an avatar even when the user hasn't set one --- app/models/notification/default_payload.rb | 4 ++++ saas/app/models/notification/push_target/native.rb | 8 +------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/models/notification/default_payload.rb b/app/models/notification/default_payload.rb index 9cabc4988..65ca068e2 100644 --- a/app/models/notification/default_payload.rb +++ b/app/models/notification/default_payload.rb @@ -31,6 +31,10 @@ class Notification::DefaultPayload false end + def avatar_url + Rails.application.routes.url_helpers.user_avatar_url(notification.creator, **url_options) + end + private def card_url(card) Rails.application.routes.url_helpers.card_url(card, **url_options) diff --git a/saas/app/models/notification/push_target/native.rb b/saas/app/models/notification/push_target/native.rb index d4dce6168..94d8f4086 100644 --- a/saas/app/models/notification/push_target/native.rb +++ b/saas/app/models/notification/push_target/native.rb @@ -31,7 +31,7 @@ class Notification::PushTarget::Native < Notification::PushTarget body: payload.body, url: payload.url, account_id: notification.account.external_account_id, - avatar_url: creator_avatar_url, + avatar_url: payload.avatar_url, card_id: card&.id, card_title: card&.title, creator_name: notification.creator.name, @@ -50,10 +50,4 @@ class Notification::PushTarget::Native < Notification::PushTarget def interruption_level payload.high_priority? ? "time-sensitive" : "active" end - - def creator_avatar_url - if notification.creator.respond_to?(:avatar) && notification.creator.avatar.attached? - Rails.application.routes.url_helpers.url_for(notification.creator.avatar) - end - end end