Skip to content

Commit 3c1d595

Browse files
ChristinarlongJesse-Box
authored andcommitted
chore(np): Actually dont use fields for discord embed (#103132)
1 parent d3409fc commit 3c1d595

File tree

2 files changed

+8
-27
lines changed

2 files changed

+8
-27
lines changed

src/sentry/notifications/platform/discord/provider.py

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424

2525
if TYPE_CHECKING:
2626
from sentry.integrations.discord.message_builder.base.base import DiscordMessage
27-
from sentry.integrations.discord.message_builder.base.embed.field import (
28-
DiscordMessageEmbedField,
29-
)
3027

3128
# TODO(ecosystem): Proper typing - https://discord.com/developers/docs/resources/message#create-message
3229
type DiscordRenderable = DiscordMessage
@@ -65,7 +62,7 @@ def render[DataT: NotificationData](
6562
embeds.append(
6663
DiscordMessageEmbed(
6764
title=rendered_template.subject,
68-
fields=body_blocks,
65+
description=body_blocks,
6966
image=(
7067
DiscordMessageEmbedImage(url=rendered_template.chart.url)
7168
if rendered_template.chart
@@ -94,28 +91,15 @@ def render[DataT: NotificationData](
9491
return builder.build()
9592

9693
@classmethod
97-
def render_body_blocks(
98-
cls, body: list[NotificationBodyFormattingBlock]
99-
) -> list[DiscordMessageEmbedField]:
100-
from sentry.integrations.discord.message_builder.base.embed.field import (
101-
DiscordMessageEmbedField,
102-
)
94+
def render_body_blocks(cls, body: list[NotificationBodyFormattingBlock]) -> str:
10395

104-
fields = []
96+
description = []
10597
for block in body:
10698
if block.type == NotificationBodyFormattingBlockType.PARAGRAPH:
107-
fields.append(
108-
DiscordMessageEmbedField(
109-
name=block.type.value, value=cls.render_text_blocks(block.blocks)
110-
)
111-
)
99+
description.append(f"\n{cls.render_text_blocks(block.blocks)}")
112100
elif block.type == NotificationBodyFormattingBlockType.CODE_BLOCK:
113-
fields.append(
114-
DiscordMessageEmbedField(
115-
name=block.type.value, value=f"```{cls.render_text_blocks(block.blocks)}```"
116-
)
117-
)
118-
return fields
101+
description.append(f"\n```{cls.render_text_blocks(block.blocks)}```")
102+
return "".join(description)
119103

120104
@classmethod
121105
def render_text_blocks(cls, blocks: list[NotificationBodyTextBlock]) -> str:

tests/sentry/notifications/platform/discord/test_provider.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,8 @@ def test_default_renderer(self) -> None:
7070
embeds = renderable["embeds"]
7171
assert len(embeds) == 1
7272
embed = embeds[0]
73-
fields = list(embed["fields"])
74-
assert len(fields) == 1
75-
field = fields[0]
76-
assert field["name"] == "paragraph"
77-
assert field["value"] == "test"
73+
description = embed["description"]
74+
assert description == "\ntest"
7875
assert embed["title"] == "Mock Notification"
7976
assert embed["footer"]["text"] == "This is a mock footer"
8077
assert (

0 commit comments

Comments
 (0)