Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/sentry/notifications/notifications/activity/note.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from django.utils.html import format_html
from django.utils.safestring import SafeString

from sentry.notifications.utils.avatar import avatar_as_html
from sentry.notifications.utils.avatar import avatar_as_html, get_user_avatar_url
from sentry.services.hybrid_cloud.actor import RpcActor
from sentry.types.integrations import ExternalProviders

Expand Down Expand Up @@ -46,6 +46,11 @@ def description_as_html(self, description: str, params: Mapping[str, Any]) -> Sa
and want the avatar on it's own rather than bundled with the author's display name
because the display name is already shown in the notification title."""
fmt = '<span class="avatar-container">{}</span>'

if self.user:
if self.user.get_avatar_type() == "upload":
return format_html(
'<img class="avatar" src="{}">', get_user_avatar_url(self.user, 48)
)
return format_html(fmt, avatar_as_html(self.user, 48))
return format_html(description)