Minki/abaddon-ppc
1
0
Fork 0
forked from OpenGamers/abaddon
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some potential crashes because of optionals

Browse Source
This commit is contained in:
ouwou
2022-09-09 02:40:33 -04:00
parent 348c1cb965
commit f3e5dcbe65
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/chatmessage.cpp
View File

@@ -655,13 +655,19 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data)
const auto role = discord.GetRole(role_id); const auto role = discord.GetRole(role_id);
if (role.has_value()) { if (role.has_value()) {
const auto author = discord.GetUser(author_id); const auto author = discord.GetUser(author_id);
return "<b><span color=\"#" + IntToCSSColor(role->Color) + "\">" + author->GetEscapedString() + "</span></b>"; if (author.has_value()) {
return "<b><span color=\"#" + IntToCSSColor(role->Color) + "\">" + author->GetEscapedString() + "</span></b>";
}
} }
} }
} }
const auto author = discord.GetUser(author_id); const auto author = discord.GetUser(author_id);
return author->GetEscapedBoldString<false>(); if (author.has_value()) {
return author->GetEscapedBoldString<false>();
}
return "<b>Unknown User</b>";
}; };
// if the message wasnt fetched from store it might have an un-fetched reference // if the message wasnt fetched from store it might have an un-fetched reference
@@ -673,15 +679,15 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data)
} }
if (data.Interaction.has_value()) { if (data.Interaction.has_value()) {
const auto user = *discord.GetUser(data.Interaction->User.ID);
if (data.GuildID.has_value()) { if (data.GuildID.has_value()) {
lbl->set_markup(get_author_markup(user.ID, *data.GuildID) + lbl->set_markup(get_author_markup(data.Interaction->User.ID, *data.GuildID) +
" used <span color='#697ec4'>/" + " used <span color='#697ec4'>/" +
Glib::Markup::escape_text(data.Interaction->Name) + Glib::Markup::escape_text(data.Interaction->Name) +
"</span>"); "</span>");
} else if (const auto user = discord.GetUser(data.Interaction->User.ID); user.has_value()) {
lbl->set_markup(user->GetEscapedBoldString<false>());
} else { } else {
lbl->set_markup(user.GetEscapedBoldString<false>()); lbl->set_markup("<b>Unknown User</b>");
} }
} else if (referenced_message.has_value()) { } else if (referenced_message.has_value()) {
if (referenced_message.value() == nullptr) { if (referenced_message.value() == nullptr) {