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

fix some requests being fired for icons that dont exist

Browse Source
This commit is contained in:
ouwou
2020-10-02 23:40:54 -04:00
parent 08f304da1b
commit 86455b60ca
3 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
components/channels.cpp
View File

@@ -41,12 +41,16 @@ ChannelListRowDMChannel::ChannelListRowDMChannel(const Channel *data) {
m_lbl->get_style_context()->add_class("channel-row-label"); m_lbl->get_style_context()->add_class("channel-row-label");
if (data->Type == ChannelType::DM) { if (data->Type == ChannelType::DM) {
auto buf = Abaddon::Get().GetImageManager().GetFromURLIfCached(data->Recipients[0].GetAvatarURL("png", "16")); if (data->Recipients[0].HasAvatar()) {
if (buf) auto buf = Abaddon::Get().GetImageManager().GetFromURLIfCached(data->Recipients[0].GetAvatarURL("png", "16"));
m_icon = Gtk::manage(new Gtk::Image(buf)); if (buf)
else { m_icon = Gtk::manage(new Gtk::Image(buf));
else {
m_icon = Gtk::manage(new Gtk::Image(Abaddon::Get().GetImageManager().GetPlaceholder(24)));
Abaddon::Get().GetImageManager().LoadFromURL(data->Recipients[0].GetAvatarURL("png", "16"), sigc::mem_fun(*this, &ChannelListRowDMChannel::OnImageLoad));
}
} else {
m_icon = Gtk::manage(new Gtk::Image(Abaddon::Get().GetImageManager().GetPlaceholder(24))); m_icon = Gtk::manage(new Gtk::Image(Abaddon::Get().GetImageManager().GetPlaceholder(24)));
Abaddon::Get().GetImageManager().LoadFromURL(data->Recipients[0].GetAvatarURL("png", "16"), sigc::mem_fun(*this, &ChannelListRowDMChannel::OnImageLoad));
} }
} }
@@ -75,18 +79,22 @@ ChannelListRowGuild::ChannelListRowGuild(const Guild *data) {
m_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL)); m_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL));
m_lbl = Gtk::manage(new Gtk::Label); m_lbl = Gtk::manage(new Gtk::Label);
auto buf = Abaddon::Get().GetImageManager().GetFromURLIfCached(data->GetIconURL("png", "32")); if (data->HasIcon()) {
if (buf) auto buf = Abaddon::Get().GetImageManager().GetFromURLIfCached(data->GetIconURL("png", "32"));
m_icon = Gtk::manage(new Gtk::Image(buf->scale_simple(24, 24, Gdk::INTERP_BILINEAR))); if (buf)
else { m_icon = Gtk::manage(new Gtk::Image(buf->scale_simple(24, 24, Gdk::INTERP_BILINEAR)));
m_icon = Gtk::manage(new Gtk::Image(Abaddon::Get().GetImageManager().GetPlaceholder(24))); else {
Abaddon::Get().GetImageManager().LoadFromURL(data->GetIconURL("png", "32"), [this](Glib::RefPtr<Gdk::Pixbuf> ldbuf) { m_icon = Gtk::manage(new Gtk::Image(Abaddon::Get().GetImageManager().GetPlaceholder(24)));
Glib::signal_idle().connect([this, ldbuf]() -> bool { Abaddon::Get().GetImageManager().LoadFromURL(data->GetIconURL("png", "32"), [this](Glib::RefPtr<Gdk::Pixbuf> ldbuf) {
m_icon->property_pixbuf() = ldbuf->scale_simple(24, 24, Gdk::INTERP_BILINEAR); Glib::signal_idle().connect([this, ldbuf]() -> bool {
m_icon->property_pixbuf() = ldbuf->scale_simple(24, 24, Gdk::INTERP_BILINEAR);
return false; return false;
});
}); });
}); }
} else {
m_icon = Gtk::manage(new Gtk::Image(Abaddon::Get().GetImageManager().GetPlaceholder(24)));
} }
get_style_context()->add_class("channel-row"); get_style_context()->add_class("channel-row");

4
discord/guild.cpp
View File

@@ -57,6 +57,10 @@ void from_json(const nlohmann::json &j, Guild &m) {
JS_O("approximate_presence_count", m.ApproximatePresenceCount); JS_O("approximate_presence_count", m.ApproximatePresenceCount);
} }
bool Guild::HasIcon() const {
return Icon != "";
}
std::string Guild::GetIconURL(std::string ext, std::string size) const { std::string Guild::GetIconURL(std::string ext, std::string size) const {
return "https://cdn.discordapp.com/icons/" + std::to_string(ID) + "/" + Icon + "." + ext + "?size=" + size; return "https://cdn.discordapp.com/icons/" + std::to_string(ID) + "/" + Icon + "." + ext + "?size=" + size;
} }

1
discord/guild.hpp
View File

@@ -65,5 +65,6 @@ struct Guild {
friend void from_json(const nlohmann::json &j, Guild &m); friend void from_json(const nlohmann::json &j, Guild &m);
bool HasIcon() const;
std::string GetIconURL(std::string ext = "png", std::string size = "32") const; std::string GetIconURL(std::string ext = "png", std::string size = "32") const;
}; };