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

fix build

Browse Source
This commit is contained in:
ouwou 2021-04-04 14:57:04 -04:00
parent 6f1013d146
commit f7a5cccc5e
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/chatmessage.cpp
View File

@ -593,11 +593,15 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data)
if (data.Interaction.has_value()) {
const auto user = *discord.GetUser(data.Interaction->User.ID);
lbl->set_markup(
get_author_markup(user.ID, data.GuildID.has_value() ? *data.GuildID : Snowflake::Invalid) +
" used <span color='#697ec4'>/" +
Glib::Markup::escape_text(data.Interaction->Name) +
"</span>");
if (data.GuildID.has_value()) {
lbl->set_markup(get_author_markup(user.ID, *data.GuildID) +
" used <span color='#697ec4'>/" +
Glib::Markup::escape_text(data.Interaction->Name) +
"</span>");
} else {
lbl->set_markup(user.GetEscapedBoldString<false>());
}
} else if (data.ReferencedMessage.has_value()) {
if (data.ReferencedMessage.value().get() == nullptr) {
lbl->set_markup("<i>deleted message</i>");

2
discord/store.hpp
View File

@ -156,5 +156,5 @@ inline void Store::Get(sqlite3_stmt *stmt, int index, std::optional<T> &out) con
template<typename T>
inline typename std::enable_if<std::is_enum<T>::value, void>::type
Store::Get(sqlite3_stmt *stmt, int index, T &out) const {
out = static_cast<typename T>(sqlite3_column_int(stmt, index));
out = static_cast<T>(sqlite3_column_int(stmt, index));
}