diff options
Diffstat (limited to 'components/chatwindow.cpp')
| -rw-r--r-- | components/chatwindow.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/chatwindow.cpp b/components/chatwindow.cpp index bf7d506..4973c35 100644 --- a/components/chatwindow.cpp +++ b/components/chatwindow.cpp @@ -158,8 +158,8 @@ ChatMessageItemContainer *ChatWindow::CreateMessageComponent(Snowflake id) { void ChatWindow::ProcessNewMessage(Snowflake id, bool prepend) { const auto &client = Abaddon::Get().GetDiscordClient(); if (!client.IsStarted()) return; // e.g. load channel and then dc - const auto *data = client.GetMessage(id); - if (data == nullptr) return; + const auto data = client.GetMessage(id); + if (!data.has_value()) return; ChatMessageHeader *last_row = nullptr; bool should_attach = false; @@ -180,10 +180,10 @@ void ChatWindow::ProcessNewMessage(Snowflake id, bool prepend) { } else { const auto guild_id = client.GetChannel(m_active_channel)->GuildID; const auto user_id = data->Author.ID; - const auto *user = client.GetUser(user_id); - if (user == nullptr) return; + const auto user = client.GetUser(user_id); + if (!user.has_value()) return; - header = Gtk::manage(new ChatMessageHeader(data)); + header = Gtk::manage(new ChatMessageHeader(&*data)); header->signal_action_insert_mention().connect([this, user_id]() { m_signal_action_insert_mention.emit(user_id); }); |