From 1251d89ef0577c9d450a8581d52dd94b67a45075 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Wed, 7 Apr 2021 20:42:53 -0400 Subject: [PATCH] use discord's default avatars instead of placeholder --- components/channels.cpp | 14 +++++-------- components/chatmessage.cpp | 12 +++++------ components/completer.cpp | 3 +-- components/memberlist.cpp | 3 +-- dialogs/friendpicker.cpp | 22 +++++++++----------- discord/user.cpp | 5 ++++- windows/guildsettings/memberspane.cpp | 10 ++++----- windows/profile/mutualfriendspane.cpp | 22 +++++++++----------- windows/profilewindow.cpp | 30 +++++++++++++-------------- 9 files changed, 54 insertions(+), 67 deletions(-) diff --git a/components/channels.cpp b/components/channels.cpp index 91d1820..8fcbded 100644 --- a/components/channels.cpp +++ b/components/channels.cpp @@ -86,15 +86,11 @@ ChannelListRowDMChannel::ChannelListRowDMChannel(const ChannelData *data) { m_status = Gtk::manage(new StatusIndicator(top_recipient->ID)); m_status->set_margin_start(5); - if (top_recipient->HasAvatar()) { - m_icon = Gtk::manage(new Gtk::Image(Abaddon::Get().GetImageManager().GetPlaceholder(24))); - auto cb = [this](const Glib::RefPtr &pb) { - m_icon->property_pixbuf() = pb->scale_simple(24, 24, Gdk::INTERP_BILINEAR); - }; - Abaddon::Get().GetImageManager().LoadFromURL(top_recipient->GetAvatarURL("png", "16"), sigc::track_obj(cb, *this)); - } 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))); + auto cb = [this](const Glib::RefPtr &pb) { + m_icon->property_pixbuf() = pb->scale_simple(24, 24, Gdk::INTERP_BILINEAR); + }; + Abaddon::Get().GetImageManager().LoadFromURL(top_recipient->GetAvatarURL("png", "16"), sigc::track_obj(cb, *this)); } auto buf = m_lbl->get_buffer(); diff --git a/components/chatmessage.cpp b/components/chatmessage.cpp index dd469ab..8608fdc 100644 --- a/components/chatmessage.cpp +++ b/components/chatmessage.cpp @@ -1042,13 +1042,11 @@ ChatMessageHeader::ChatMessageHeader(const Message *data) { auto &img = Abaddon::Get().GetImageManager(); m_avatar = Gtk::manage(new Gtk::Image(img.GetPlaceholder(AvatarSize))); - if (author->HasAvatar()) { - auto cb = [this](const Glib::RefPtr &pb) { - m_static_avatar = pb->scale_simple(AvatarSize, AvatarSize, Gdk::INTERP_BILINEAR); - m_avatar->property_pixbuf() = m_static_avatar; - }; - img.LoadFromURL(author->GetAvatarURL(), sigc::track_obj(cb, *this)); - } + auto cb = [this](const Glib::RefPtr &pb) { + m_static_avatar = pb->scale_simple(AvatarSize, AvatarSize, Gdk::INTERP_BILINEAR); + m_avatar->property_pixbuf() = m_static_avatar; + }; + img.LoadFromURL(author->GetAvatarURL(), sigc::track_obj(cb, *this)); if (author->HasAnimatedAvatar()) { auto cb = [this](const Glib::RefPtr &pb) { diff --git a/components/completer.cpp b/components/completer.cpp index f32bbd5..4108331 100644 --- a/components/completer.cpp +++ b/components/completer.cpp @@ -137,8 +137,7 @@ void Completer::CompleteMentions(const Glib::ustring &term) { } } - if (author->HasAvatar()) - entry->SetImage(author->GetAvatarURL()); + entry->SetImage(author->GetAvatarURL()); } } diff --git a/components/memberlist.cpp b/components/memberlist.cpp index 0ac5619..e94f5f6 100644 --- a/components/memberlist.cpp +++ b/components/memberlist.cpp @@ -26,8 +26,7 @@ MemberListUserRow::MemberListUserRow(const GuildData *guild, const UserData &dat m_status_indicator->set_margin_start(3); - if (data.HasAvatar()) - m_avatar->SetURL(data.GetAvatarURL("png")); + m_avatar->SetURL(data.GetAvatarURL("png")); get_style_context()->add_class("members-row"); get_style_context()->add_class("members-row-member"); diff --git a/dialogs/friendpicker.cpp b/dialogs/friendpicker.cpp index 43df184..420fa9b 100644 --- a/dialogs/friendpicker.cpp +++ b/dialogs/friendpicker.cpp @@ -67,18 +67,16 @@ FriendPickerDialogItem::FriendPickerDialogItem(Snowflake user_id) m_name.set_single_line_mode(true); m_avatar.property_pixbuf() = Abaddon::Get().GetImageManager().GetPlaceholder(32); - if (user.HasAvatar()) { - if (user.HasAnimatedAvatar() && Abaddon::Get().GetSettings().GetShowAnimations()) { - auto cb = [this](const Glib::RefPtr &pb) { - m_avatar.property_pixbuf_animation() = pb; - }; - Abaddon::Get().GetImageManager().LoadAnimationFromURL(user.GetAvatarURL("gif", "32"), 32, 32, sigc::track_obj(cb, *this)); - } else { - auto cb = [this](const Glib::RefPtr &pb) { - m_avatar.property_pixbuf() = pb->scale_simple(32, 32, Gdk::INTERP_BILINEAR); - }; - Abaddon::Get().GetImageManager().LoadFromURL(user.GetAvatarURL("png", "32"), sigc::track_obj(cb, *this)); - } + if (user.HasAnimatedAvatar() && Abaddon::Get().GetSettings().GetShowAnimations()) { + auto cb = [this](const Glib::RefPtr &pb) { + m_avatar.property_pixbuf_animation() = pb; + }; + Abaddon::Get().GetImageManager().LoadAnimationFromURL(user.GetAvatarURL("gif", "32"), 32, 32, sigc::track_obj(cb, *this)); + } else { + auto cb = [this](const Glib::RefPtr &pb) { + m_avatar.property_pixbuf() = pb->scale_simple(32, 32, Gdk::INTERP_BILINEAR); + }; + Abaddon::Get().GetImageManager().LoadFromURL(user.GetAvatarURL("png", "32"), sigc::track_obj(cb, *this)); } m_avatar.set_margin_end(5); diff --git a/discord/user.cpp b/discord/user.cpp index 0ecf725..144de38 100644 --- a/discord/user.cpp +++ b/discord/user.cpp @@ -14,7 +14,10 @@ bool UserData::HasAnimatedAvatar() const { } std::string UserData::GetAvatarURL(std::string ext, std::string size) const { - return "https://cdn.discordapp.com/avatars/" + std::to_string(ID) + "/" + Avatar + "." + ext + "?size=" + size; + if (HasAvatar()) + return "https://cdn.discordapp.com/avatars/" + std::to_string(ID) + "/" + Avatar + "." + ext + "?size=" + size; + else + return "https://cdn.discordapp.com/embed/avatars/" + std::to_string(std::stoul(Discriminator) % 5) + ".png"; // size isn't respected by the cdn } Snowflake UserData::GetHoistedRole(Snowflake guild_id, bool with_color) const { diff --git a/windows/guildsettings/memberspane.cpp b/windows/guildsettings/memberspane.cpp index 8042639..4d5124e 100644 --- a/windows/guildsettings/memberspane.cpp +++ b/windows/guildsettings/memberspane.cpp @@ -98,12 +98,10 @@ GuildSettingsMembersListItem::GuildSettingsMembersListItem(const GuildData &guil auto &discord = Abaddon::Get().GetDiscordClient(); - if (member.User->HasAvatar()) { - if (member.User->HasAnimatedAvatar() && Abaddon::Get().GetSettings().GetShowAnimations()) - m_avatar.SetURL(member.User->GetAvatarURL("gif", "32")); - else - m_avatar.SetURL(member.User->GetAvatarURL("png", "32")); - } + if (member.User->HasAnimatedAvatar() && Abaddon::Get().GetSettings().GetShowAnimations()) + m_avatar.SetURL(member.User->GetAvatarURL("gif", "32")); + else + m_avatar.SetURL(member.User->GetAvatarURL("png", "32")); DisplayTerm = member.User->Username + "#" + member.User->Discriminator; diff --git a/windows/profile/mutualfriendspane.cpp b/windows/profile/mutualfriendspane.cpp index e0d6fc4..7d30453 100644 --- a/windows/profile/mutualfriendspane.cpp +++ b/windows/profile/mutualfriendspane.cpp @@ -12,18 +12,16 @@ MutualFriendItem::MutualFriendItem(const UserData &user) const auto show_animations = Abaddon::Get().GetSettings().GetShowAnimations(); auto &img = Abaddon::Get().GetImageManager(); m_avatar.property_pixbuf() = img.GetPlaceholder(24); - if (user.HasAvatar()) { - if (user.HasAnimatedAvatar() && show_animations) { - auto cb = [this](const Glib::RefPtr &pb) { - m_avatar.property_pixbuf_animation() = pb; - }; - img.LoadAnimationFromURL(user.GetAvatarURL("gif", "32"), 24, 24, sigc::track_obj(cb, *this)); - } else { - auto cb = [this](const Glib::RefPtr &pb) { - m_avatar.property_pixbuf() = pb->scale_simple(24, 24, Gdk::INTERP_BILINEAR); - }; - img.LoadFromURL(user.GetAvatarURL("png", "32"), sigc::track_obj(cb, *this)); - } + if (user.HasAnimatedAvatar() && show_animations) { + auto cb = [this](const Glib::RefPtr &pb) { + m_avatar.property_pixbuf_animation() = pb; + }; + img.LoadAnimationFromURL(user.GetAvatarURL("gif", "32"), 24, 24, sigc::track_obj(cb, *this)); + } else { + auto cb = [this](const Glib::RefPtr &pb) { + m_avatar.property_pixbuf() = pb->scale_simple(24, 24, Gdk::INTERP_BILINEAR); + }; + img.LoadFromURL(user.GetAvatarURL("png", "32"), sigc::track_obj(cb, *this)); } m_name.set_markup(user.GetEscapedBoldString()); diff --git a/windows/profilewindow.cpp b/windows/profilewindow.cpp index d6ce320..58f3b28 100644 --- a/windows/profilewindow.cpp +++ b/windows/profilewindow.cpp @@ -47,23 +47,21 @@ ProfileWindow::ProfileWindow(Snowflake user_id) static const bool show_animations = Abaddon::Get().GetSettings().GetShowAnimations(); auto &img = Abaddon::Get().GetImageManager(); m_avatar.property_pixbuf() = img.GetPlaceholder(64); - if (user.HasAvatar()) { - auto icon_cb = [this](const Glib::RefPtr &pb) { - set_icon(pb); - }; - img.LoadFromURL(user.GetAvatarURL("png", "64"), sigc::track_obj(icon_cb, *this)); + auto icon_cb = [this](const Glib::RefPtr &pb) { + set_icon(pb); + }; + img.LoadFromURL(user.GetAvatarURL("png", "64"), sigc::track_obj(icon_cb, *this)); - if (show_animations && user.HasAnimatedAvatar()) { - auto cb = [this](const Glib::RefPtr &pb) { - m_avatar.property_pixbuf_animation() = pb; - }; - img.LoadAnimationFromURL(user.GetAvatarURL("gif", "64"), 64, 64, sigc::track_obj(cb, *this)); - } else { - auto cb = [this](const Glib::RefPtr &pb) { - m_avatar.property_pixbuf() = pb->scale_simple(64, 64, Gdk::INTERP_BILINEAR); - }; - img.LoadFromURL(user.GetAvatarURL("png", "64"), sigc::track_obj(cb, *this)); - } + if (show_animations && user.HasAnimatedAvatar()) { + auto cb = [this](const Glib::RefPtr &pb) { + m_avatar.property_pixbuf_animation() = pb; + }; + img.LoadAnimationFromURL(user.GetAvatarURL("gif", "64"), 64, 64, sigc::track_obj(cb, *this)); + } else { + auto cb = [this](const Glib::RefPtr &pb) { + m_avatar.property_pixbuf() = pb->scale_simple(64, 64, Gdk::INTERP_BILINEAR); + }; + img.LoadFromURL(user.GetAvatarURL("png", "64"), sigc::track_obj(cb, *this)); } m_username.set_markup(user.GetEscapedString());