diff options
| -rw-r--r-- | components/channels.cpp | 38 | ||||
| -rw-r--r-- | discord/guild.cpp | 4 | ||||
| -rw-r--r-- | discord/guild.hpp | 1 |
3 files changed, 28 insertions, 15 deletions
diff --git a/components/channels.cpp b/components/channels.cpp index cb5307b..6d2f60e 100644 --- a/components/channels.cpp +++ b/components/channels.cpp @@ -41,12 +41,16 @@ ChannelListRowDMChannel::ChannelListRowDMChannel(const Channel *data) { m_lbl->get_style_context()->add_class("channel-row-label"); if (data->Type == ChannelType::DM) { - auto buf = Abaddon::Get().GetImageManager().GetFromURLIfCached(data->Recipients[0].GetAvatarURL("png", "16")); - if (buf) - m_icon = Gtk::manage(new Gtk::Image(buf)); - else { + if (data->Recipients[0].HasAvatar()) { + auto buf = Abaddon::Get().GetImageManager().GetFromURLIfCached(data->Recipients[0].GetAvatarURL("png", "16")); + if (buf) + 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))); - 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_lbl = Gtk::manage(new Gtk::Label); - auto buf = Abaddon::Get().GetImageManager().GetFromURLIfCached(data->GetIconURL("png", "32")); - if (buf) - m_icon = Gtk::manage(new Gtk::Image(buf->scale_simple(24, 24, Gdk::INTERP_BILINEAR))); - else { - m_icon = Gtk::manage(new Gtk::Image(Abaddon::Get().GetImageManager().GetPlaceholder(24))); - Abaddon::Get().GetImageManager().LoadFromURL(data->GetIconURL("png", "32"), [this](Glib::RefPtr<Gdk::Pixbuf> ldbuf) { - Glib::signal_idle().connect([this, ldbuf]() -> bool { - m_icon->property_pixbuf() = ldbuf->scale_simple(24, 24, Gdk::INTERP_BILINEAR); + if (data->HasIcon()) { + auto buf = Abaddon::Get().GetImageManager().GetFromURLIfCached(data->GetIconURL("png", "32")); + if (buf) + m_icon = Gtk::manage(new Gtk::Image(buf->scale_simple(24, 24, Gdk::INTERP_BILINEAR))); + else { + m_icon = Gtk::manage(new Gtk::Image(Abaddon::Get().GetImageManager().GetPlaceholder(24))); + Abaddon::Get().GetImageManager().LoadFromURL(data->GetIconURL("png", "32"), [this](Glib::RefPtr<Gdk::Pixbuf> ldbuf) { + 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"); diff --git a/discord/guild.cpp b/discord/guild.cpp index bf279e7..8062575 100644 --- a/discord/guild.cpp +++ b/discord/guild.cpp @@ -57,6 +57,10 @@ void from_json(const nlohmann::json &j, Guild &m) { JS_O("approximate_presence_count", m.ApproximatePresenceCount); } +bool Guild::HasIcon() const { + return Icon != ""; +} + 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; } diff --git a/discord/guild.hpp b/discord/guild.hpp index 4966b34..a618335 100644 --- a/discord/guild.hpp +++ b/discord/guild.hpp @@ -65,5 +65,6 @@ struct Guild { 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; }; |