From 5c7631e71382b0c1727bd8e1487a7e41feaf2efc Mon Sep 17 00:00:00 2001
From: ouwou <26526779+ouwou@users.noreply.github.com>
Date: Tue, 5 Jul 2022 03:53:00 -0400
Subject: fix checks for is bot

---
 src/components/chatmessage.cpp            | 4 ++--
 src/discord/user.cpp                      | 4 ++++
 src/discord/user.hpp                      | 1 +
 src/windows/guildsettings/memberspane.cpp | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/chatmessage.cpp b/src/components/chatmessage.cpp
index 4d6eec5..863349f 100644
--- a/src/components/chatmessage.cpp
+++ b/src/components/chatmessage.cpp
@@ -1122,7 +1122,7 @@ ChatMessageHeader::ChatMessageHeader(const Message &data)
 
     m_meta_ev.signal_button_press_event().connect(sigc::mem_fun(*this, &ChatMessageHeader::on_author_button_press));
 
-    if (author->IsBot || data.WebhookID.has_value()) {
+    if (author->IsABot() || data.WebhookID.has_value()) {
         m_extra = Gtk::manage(new Gtk::Label);
         m_extra->get_style_context()->add_class("message-container-extra");
         m_extra->set_single_line_mode(true);
@@ -1130,7 +1130,7 @@ ChatMessageHeader::ChatMessageHeader(const Message &data)
         m_extra->set_can_focus(false);
         m_extra->set_use_markup(true);
     }
-    if (author->IsBot)
+    if (author->IsABot())
         m_extra->set_markup("<b>BOT</b>");
     else if (data.WebhookID.has_value())
         m_extra->set_markup("<b>Webhook</b>");
diff --git a/src/discord/user.cpp b/src/discord/user.cpp
index 4393992..0ab2af5 100644
--- a/src/discord/user.cpp
+++ b/src/discord/user.cpp
@@ -1,6 +1,10 @@
 #include "user.hpp"
 #include "abaddon.hpp"
 
+bool UserData::IsABot() const noexcept {
+    return IsBot.has_value() && *IsBot;
+}
+
 bool UserData::IsDeleted() const {
     return Discriminator == "0000";
 }
diff --git a/src/discord/user.hpp b/src/discord/user.hpp
index 083f5c4..1b9d517 100644
--- a/src/discord/user.hpp
+++ b/src/discord/user.hpp
@@ -60,6 +60,7 @@ struct UserData {
     friend void to_json(nlohmann::json &j, const UserData &m);
     void update_from_json(const nlohmann::json &j);
 
+    [[nodiscard]] bool IsABot() const noexcept;
     [[nodiscard]] bool IsDeleted() const;
     [[nodiscard]] bool HasAvatar() const;
     [[nodiscard]] bool HasAnimatedAvatar() const noexcept;
diff --git a/src/windows/guildsettings/memberspane.cpp b/src/windows/guildsettings/memberspane.cpp
index 34650ad..973e380 100644
--- a/src/windows/guildsettings/memberspane.cpp
+++ b/src/windows/guildsettings/memberspane.cpp
@@ -204,7 +204,7 @@ void GuildSettingsMembersPaneInfo::SetUser(Snowflake user_id) {
     auto member = *discord.GetMember(user_id, GuildID);
     member.User = discord.GetUser(user_id);
 
-    m_bot.set_visible(member.User->IsBot.has_value() && *member.User->IsBot);
+    m_bot.set_visible(member.User->IsABot());
 
     m_id.set_text("User ID: " + std::to_string(user_id));
     m_created.set_text("Account created: " + user_id.GetLocalTimestamp());
-- 
cgit v1.2.3