diff options
Diffstat (limited to 'components/chatmessage.cpp')
| -rw-r--r-- | components/chatmessage.cpp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/components/chatmessage.cpp b/components/chatmessage.cpp index 63db7e9..88e3f2c 100644 --- a/components/chatmessage.cpp +++ b/components/chatmessage.cpp @@ -38,8 +38,10 @@ ChatMessageItemContainer *ChatMessageItemContainer::FromMessage(const Message &d if ((data.MessageReference.has_value() || data.Interaction.has_value()) && data.Type != MessageType::CHANNEL_FOLLOW_ADD) { auto *widget = container->CreateReplyComponent(data); - container->m_main.add(*widget); - container->m_main.child_property_position(*widget) = 0; // eek + if (widget != nullptr) { + container->m_main.add(*widget); + container->m_main.child_property_position(*widget) = 0; // eek + } } // there should only ever be 1 embed (i think?) @@ -274,6 +276,20 @@ void ChatMessageItemContainer::UpdateTextComponent(Gtk::TextView *tv) { case MessageType::GUILD_DISCOVERY_GRACE_PERIOD_FINAL_WARNING: { b->insert_markup(s, "<i><span color='#999999'>This server has failed Discovery activity requirements for 3 weeks in a row. If this server fails for 1 more week, it will be removed from Discovery.</span></i>"); } break; + case MessageType::THREAD_CREATED: { + const auto author = Abaddon::Get().GetDiscordClient().GetUser(data->Author.ID); + if (data->MessageReference.has_value() && data->MessageReference->ChannelID.has_value()) { + auto iter = b->insert_markup(s, "<i><span color='#999999'>" + author->GetEscapedBoldName() + " started a thread: </span></i>"); + auto tag = b->create_tag(); + tag->property_weight() = Pango::WEIGHT_BOLD; + m_channel_tagmap[tag] = *data->MessageReference->ChannelID; + b->insert_with_tag(iter, data->Content, tag); + + tv->signal_button_press_event().connect(sigc::mem_fun(*this, &ChatMessageItemContainer::OnClickChannel), false); + } else { + b->insert_markup(s, "<i><span color='#999999'>" + author->GetEscapedBoldName() + " started a thread: </span><b>" + Glib::Markup::escape_text(data->Content) + "</b></i>"); + } + } break; default: break; } } @@ -607,6 +623,8 @@ Gtk::Widget *ChatMessageItemContainer::CreateReactionsComponent(const Message &d } Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data) { + if (data.Type == MessageType::THREAD_CREATED) return nullptr; + auto *box = Gtk::manage(new Gtk::Box); auto *lbl = Gtk::manage(new Gtk::Label); lbl->set_single_line_mode(true); |