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

add icons to dms

Browse Source
This commit is contained in:
ouwou 2022-05-11 15:05:32 -04:00
parent 1d8ef79da6
commit 8b488a5ca9
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/components/channeltabswitcherhandy.cpp
View File

@ -164,19 +164,26 @@ void ChannelTabSwitcherHandy::OnPageIconLoad(HdyTabPage *page, const Glib::RefPt
}
void ChannelTabSwitcherHandy::CheckPageIcon(HdyTabPage *page, const ChannelData &data) {
std::optional<std::string> icon_url;
if (data.GuildID.has_value()) {
if (const auto guild = Abaddon::Get().GetDiscordClient().GetGuild(*data.GuildID); guild.has_value() && guild->HasIcon()) {
auto *child_widget = hdy_tab_page_get_child(page);
if (child_widget == nullptr) return; // probably wont happen :---)
// i think this works???
auto *trackable = Glib::wrap(GTK_WIDGET(child_widget));
Abaddon::Get().GetImageManager().LoadFromURL(
guild->GetIconURL("png", "16"),
sigc::track_obj([this, page](const Glib::RefPtr<Gdk::Pixbuf> &pb) { OnPageIconLoad(page, pb); },
*trackable));
return;
icon_url = guild->GetIconURL("png", "16");
}
} else if (data.IsDM()) {
icon_url = data.GetIconURL();
}
if (icon_url.has_value()) {
auto *child_widget = hdy_tab_page_get_child(page);
if (child_widget == nullptr) return; // probably wont happen :---)
// i think this works???
auto *trackable = Glib::wrap(GTK_WIDGET(child_widget));
Abaddon::Get().GetImageManager().LoadFromURL(
*icon_url,
sigc::track_obj([this, page](const Glib::RefPtr<Gdk::Pixbuf> &pb) { OnPageIconLoad(page, pb); },
*trackable));
return;
}

10
src/discord/channel.cpp
View File

@ -89,7 +89,15 @@ bool ChannelData::HasIcon() const noexcept {
}
std::string ChannelData::GetIconURL() const {
return "https://cdn.discordapp.com/channel-icons/" + std::to_string(ID) + "/" + *Icon + ".png";
if (HasIcon()) {
return "https://cdn.discordapp.com/channel-icons/" + std::to_string(ID) + "/" + *Icon + ".png";
} else {
const auto recipients = GetDMRecipients();
if (!recipients.empty())
return recipients[0].GetAvatarURL("png", "32");
else
return "https://cdn.discordapp.com/embed/avatars/0.png";
}
}
std::string ChannelData::GetDisplayName() const {