Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
1 change: 1 addition & 0 deletions backend/apps/slack/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ class MessageAdmin(admin.ModelAdmin):
"text",
"has_replies",
"author",
"message_body",
)
search_fields = (
"slack_message_id",
Expand Down
18 changes: 6 additions & 12 deletions backend/apps/slack/management/commands/slack_sync_messages.py
Comment thread
arkid15r marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -322,18 +322,12 @@ def _create_message_from_data(
parent_message: Message | None = None,
) -> Message | None:
"""Create Message instance using from_slack pattern."""
if message_data.get("subtype") in {
"channel_join",
"channel_leave",
"bot_message",
} or not any(
[
message_data.get("text"),
message_data.get("attachments"),
message_data.get("files"),
message_data.get("blocks"),
]
):
if not [
message_data.get("text"),
message_data.get("attachments"),
message_data.get("files"),
message_data.get("blocks"),
]:
Comment thread
arkid15r marked this conversation as resolved.
Outdated
return None

try:
Expand Down
17 changes: 17 additions & 0 deletions backend/apps/slack/migrations/0016_message_message_body.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 5.2.3 on 2025-06-16 17:34

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("slack", "0015_remove_message_is_thread_parent_message_has_replies_and_more"),
]

operations = [
migrations.AddField(
model_name="message",
name="message_body",
field=models.JSONField(default=dict, verbose_name="Message body"),
),
]
2 changes: 2 additions & 0 deletions backend/apps/slack/models/message.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class Meta:
has_replies = models.BooleanField(verbose_name="Has replies", default=False)
slack_message_id = models.CharField(verbose_name="Slack message ID", max_length=50)
text = models.TextField(verbose_name="Text")
message_body = models.JSONField(verbose_name="Message body", default=dict)

# FKs.
author = models.ForeignKey(Member, on_delete=models.CASCADE, related_name="messages")
Expand Down Expand Up @@ -53,6 +54,7 @@ def from_slack(
self.has_replies = message_data.get("reply_count", 0) > 0
self.slack_message_id = message_data.get("ts", "")
self.text = message_data.get("text", "")
self.message_body = message_data
Comment thread
Dishant1804 marked this conversation as resolved.
Outdated

self.author = author
self.conversation = conversation
Expand Down