From f9deeef70dbc4f407d85ba04d56a7bae70f77ee7 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sat, 3 Jun 2023 18:04:48 -0400 Subject: dont let message ListBoxRow steal focus on click --- src/components/chatmessage.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/components') diff --git a/src/components/chatmessage.cpp b/src/components/chatmessage.cpp index 5f4c9a5..4b2e748 100644 --- a/src/components/chatmessage.cpp +++ b/src/components/chatmessage.cpp @@ -1011,6 +1011,7 @@ ChatMessageHeader::ChatMessageHeader(const Message &data) add(m_main_box); set_margin_bottom(8); + set_focus_on_click(false); show_all(); -- cgit v1.2.3 From bfc5b0e682852173e03d703b1098530fd65a0dd4 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Tue, 13 Jun 2023 20:20:59 -0400 Subject: show pomelo names in member list --- src/components/memberlist.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/components') diff --git a/src/components/memberlist.cpp b/src/components/memberlist.cpp index 19b4fb8..a477832 100644 --- a/src/components/memberlist.cpp +++ b/src/components/memberlist.cpp @@ -37,9 +37,17 @@ MemberListUserRow::MemberListUserRow(const std::optional &guild, cons m_label->set_single_line_mode(true); m_label->set_ellipsize(Pango::ELLIPSIZE_END); - std::string display = data.Username; - if (Abaddon::Get().GetSettings().ShowMemberListDiscriminators) - display += "#" + data.Discriminator; + // todo remove after migration complete + std::string display; + if (data.IsPomelo()) { + display = data.GetName(); + } else { + display = data.Username; + if (Abaddon::Get().GetSettings().ShowMemberListDiscriminators) { + display += "#" + data.Discriminator; + } + } + if (guild.has_value()) { if (const auto col_id = data.GetHoistedRole(guild->ID, true); col_id.IsValid()) { auto color = Abaddon::Get().GetDiscordClient().GetRole(col_id)->Color; -- cgit v1.2.3 From 6f1bd0014cad37f2f0b43a9b83733d9f65a91406 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Tue, 13 Jun 2023 21:28:18 -0400 Subject: refactor, update user mention handling --- src/components/channels.cpp | 2 +- src/components/chatmessage.cpp | 22 +++++++++++----------- src/components/chatwindow.cpp | 2 +- src/components/friendslist.cpp | 2 +- src/components/memberlist.cpp | 2 +- src/dialogs/friendpicker.cpp | 2 +- src/discord/user.cpp | 16 ++++++++-------- src/discord/user.hpp | 24 +++++++++++++++--------- src/misc/chatutil.cpp | 8 ++++---- src/windows/guildsettings/auditlogpane.cpp | 18 +++++++++--------- src/windows/guildsettings/memberspane.cpp | 4 ++-- src/windows/profile/mutualfriendspane.cpp | 2 +- src/windows/profilewindow.cpp | 2 +- 13 files changed, 56 insertions(+), 50 deletions(-) (limited to 'src/components') diff --git a/src/components/channels.cpp b/src/components/channels.cpp index 0e97837..15a8348 100644 --- a/src/components/channels.cpp +++ b/src/components/channels.cpp @@ -863,7 +863,7 @@ Gtk::TreeModel::iterator ChannelList::CreateVoiceParticipantRow(const UserData & auto row = *m_model->append(parent); row[m_columns.m_type] = RenderType::VoiceParticipant; row[m_columns.m_id] = user.ID; - row[m_columns.m_name] = user.GetEscapedName(); + row[m_columns.m_name] = user.GetDisplayNameEscaped(); const auto voice_state = Abaddon::Get().GetDiscordClient().GetVoiceState(user.ID); if (voice_state.has_value()) { diff --git a/src/components/chatmessage.cpp b/src/components/chatmessage.cpp index 4b2e748..2f3a86d 100644 --- a/src/components/chatmessage.cpp +++ b/src/components/chatmessage.cpp @@ -234,23 +234,23 @@ void ChatMessageItemContainer::UpdateTextComponent(Gtk::TextView *tv) { } break; case MessageType::CHANNEL_NAME_CHANGE: { const auto author = Abaddon::Get().GetDiscordClient().GetUser(data->Author.ID); - b->insert_markup(s, "" + author->GetEscapedBoldName() + " changed the name to " + Glib::Markup::escape_text(data->Content) + ""); + b->insert_markup(s, "" + author->GetDisplayNameEscapedBold() + " changed the name to " + Glib::Markup::escape_text(data->Content) + ""); } break; case MessageType::CHANNEL_ICON_CHANGE: { const auto author = Abaddon::Get().GetDiscordClient().GetUser(data->Author.ID); - b->insert_markup(s, "" + author->GetEscapedBoldName() + " changed the channel icon"); + b->insert_markup(s, "" + author->GetDisplayNameEscapedBold() + " changed the channel icon"); } break; case MessageType::USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_1: case MessageType::USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_2: case MessageType::USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_3: { const auto author = Abaddon::Get().GetDiscordClient().GetUser(data->Author.ID); const auto guild = Abaddon::Get().GetDiscordClient().GetGuild(*data->GuildID); - b->insert_markup(s, "" + author->GetEscapedBoldName() + " just boosted the server " + Glib::Markup::escape_text(data->Content) + " times! " + + b->insert_markup(s, "" + author->GetDisplayNameEscapedBold() + " just boosted the server " + Glib::Markup::escape_text(data->Content) + " times! " + Glib::Markup::escape_text(guild->Name) + " has achieved Level " + std::to_string(static_cast(data->Type) - 8) + "!"); // oo cheeky me !!! } break; case MessageType::CHANNEL_FOLLOW_ADD: { const auto author = Abaddon::Get().GetDiscordClient().GetUser(data->Author.ID); - b->insert_markup(s, "" + author->GetEscapedBoldName() + " has added " + Glib::Markup::escape_text(data->Content) + " to this channel. Its most important updates will show up here."); + b->insert_markup(s, "" + author->GetDisplayNameEscapedBold() + " has added " + Glib::Markup::escape_text(data->Content) + " to this channel. Its most important updates will show up here."); } break; case MessageType::CALL: { b->insert_markup(s, "[started a call]"); @@ -270,13 +270,13 @@ void ChatMessageItemContainer::UpdateTextComponent(Gtk::TextView *tv) { case MessageType::THREAD_CREATED: { const auto author = Abaddon::Get().GetDiscordClient().GetUser(data->Author.ID); if (data->MessageReference.has_value() && data->MessageReference->ChannelID.has_value()) { - auto iter = b->insert_markup(s, "" + author->GetEscapedBoldName() + " started a thread: "); + auto iter = b->insert_markup(s, "" + author->GetDisplayNameEscapedBold() + " started a thread: "); auto tag = b->create_tag(); tag->property_weight() = Pango::WEIGHT_BOLD; m_channel_tagmap[tag] = *data->MessageReference->ChannelID; b->insert_with_tag(iter, data->Content, tag); } else { - b->insert_markup(s, "" + author->GetEscapedBoldName() + " started a thread: " + Glib::Markup::escape_text(data->Content) + ""); + b->insert_markup(s, "" + author->GetDisplayNameEscapedBold() + " started a thread: " + Glib::Markup::escape_text(data->Content) + ""); } } break; default: break; @@ -656,7 +656,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data) if (role.has_value()) { const auto author = discord.GetUser(author_id); if (author.has_value()) { - return "Color) + "\">" + author->GetEscapedString() + ""; + return "Color) + "\">" + author->GetUsernameEscaped() + ""; } } } @@ -664,7 +664,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data) const auto author = discord.GetUser(author_id); if (author.has_value()) { - return author->GetEscapedBoldString(); + return author->GetUsernameEscapedBold(); } return "Unknown User"; @@ -685,7 +685,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data) Glib::Markup::escape_text(data.Interaction->Name) + ""); } else if (const auto user = discord.GetUser(data.Interaction->User.ID); user.has_value()) { - lbl->set_markup(user->GetEscapedBoldString()); + lbl->set_markup(user->GetUsernameEscapedBold()); } else { lbl->set_markup("Unknown User"); } @@ -1043,7 +1043,7 @@ void ChatMessageHeader::UpdateName() { else m_author.set_markup("" + name + ""); } else - m_author.set_markup("" + user->GetEscapedName() + ""); + m_author.set_markup("" + user->GetDisplayNameEscaped() + ""); } std::vector ChatMessageHeader::GetChildContent() { @@ -1069,7 +1069,7 @@ Glib::ustring ChatMessageHeader::GetEscapedDisplayName(const UserData &user, con if (member.has_value() && !member->Nickname.empty()) return Glib::Markup::escape_text(member->Nickname); else - return Glib::Markup::escape_text(user.GetEscapedName()); + return Glib::Markup::escape_text(user.GetDisplayNameEscaped()); } bool ChatMessageHeader::on_author_button_press(GdkEventButton *ev) { diff --git a/src/components/chatwindow.cpp b/src/components/chatwindow.cpp index 1565d0c..8f59944 100644 --- a/src/components/chatwindow.cpp +++ b/src/components/chatwindow.cpp @@ -301,7 +301,7 @@ void ChatWindow::StartReplying(Snowflake message_id) { m_is_replying = true; m_input->StartReplying(); if (author.has_value()) - m_input_indicator->SetCustomMarkup("Replying to " + author->GetEscapedBoldString()); + m_input_indicator->SetCustomMarkup("Replying to " + author->GetUsernameEscapedBold()); else m_input_indicator->SetCustomMarkup("Replying..."); } diff --git a/src/components/friendslist.cpp b/src/components/friendslist.cpp index d8a566f..5839b65 100644 --- a/src/components/friendslist.cpp +++ b/src/components/friendslist.cpp @@ -265,7 +265,7 @@ FriendsListFriendRow::FriendsListFriendRow(RelationshipType type, const UserData img->SetURL(data.GetAvatarURL("png", "32")); } - namelbl->set_markup(data.GetEscapedBoldName()); + namelbl->set_markup(data.GetDisplayNameEscapedBold()); UpdatePresenceLabel(); diff --git a/src/components/memberlist.cpp b/src/components/memberlist.cpp index a477832..9450548 100644 --- a/src/components/memberlist.cpp +++ b/src/components/memberlist.cpp @@ -40,7 +40,7 @@ MemberListUserRow::MemberListUserRow(const std::optional &guild, cons // todo remove after migration complete std::string display; if (data.IsPomelo()) { - display = data.GetName(); + display = data.GetDisplayName(); } else { display = data.Username; if (Abaddon::Get().GetSettings().ShowMemberListDiscriminators) { diff --git a/src/dialogs/friendpicker.cpp b/src/dialogs/friendpicker.cpp index c70a9e9..873ddbd 100644 --- a/src/dialogs/friendpicker.cpp +++ b/src/dialogs/friendpicker.cpp @@ -62,7 +62,7 @@ FriendPickerDialogItem::FriendPickerDialogItem(Snowflake user_id) , m_layout(Gtk::ORIENTATION_HORIZONTAL) { auto user = *Abaddon::Get().GetDiscordClient().GetUser(user_id); - m_name.set_markup(user.GetEscapedBoldString()); + m_name.set_markup(user.GetUsernameEscapedBold()); m_name.set_single_line_mode(true); m_avatar.property_pixbuf() = Abaddon::Get().GetImageManager().GetPlaceholder(32); diff --git a/src/discord/user.cpp b/src/discord/user.cpp index 06073ad..38157e7 100644 --- a/src/discord/user.cpp +++ b/src/discord/user.cpp @@ -81,7 +81,7 @@ std::string UserData::GetMention() const { return "<@" + std::to_string(ID) + ">"; } -std::string UserData::GetName() const { +std::string UserData::GetDisplayName() const { if (IsPomelo() && GlobalName.has_value()) { return *GlobalName; } @@ -97,19 +97,19 @@ std::string UserData::GetUsername() const { return Username + "#" + Discriminator; } -std::string UserData::GetEscapedName() const { - return Glib::Markup::escape_text(GetName()); +std::string UserData::GetDisplayNameEscaped() const { + return Glib::Markup::escape_text(GetDisplayName()); } -std::string UserData::GetEscapedBoldName() const { - return "" + Glib::Markup::escape_text(GetName()) + ""; +std::string UserData::GetDisplayNameEscapedBold() const { + return "" + Glib::Markup::escape_text(GetDisplayName()) + ""; } -std::string UserData::GetEscapedString() const { +std::string UserData::GetUsernameEscaped() const { if (IsPomelo()) { - return GetEscapedName(); + return GetDisplayNameEscaped(); } - return Glib::Markup::escape_text(GetName()) + "#" + Discriminator; + return Glib::Markup::escape_text(GetDisplayName()) + "#" + Discriminator; } void from_json(const nlohmann::json &j, UserData &m) { diff --git a/src/discord/user.hpp b/src/discord/user.hpp index 05acd05..d2c1002 100644 --- a/src/discord/user.hpp +++ b/src/discord/user.hpp @@ -79,16 +79,22 @@ struct UserData { [[nodiscard]] std::string GetDefaultAvatarURL() const; [[nodiscard]] Snowflake GetHoistedRole(Snowflake guild_id, bool with_color = false) const; [[nodiscard]] std::string GetMention() const; - [[nodiscard]] std::string GetName() const; + [[nodiscard]] std::string GetDisplayName() const; + [[nodiscard]] std::string GetDisplayNameEscaped() const; + [[nodiscard]] std::string GetDisplayNameEscapedBold() const; [[nodiscard]] std::string GetUsername() const; - [[nodiscard]] std::string GetEscapedName() const; - [[nodiscard]] std::string GetEscapedBoldName() const; - [[nodiscard]] std::string GetEscapedString() const; + [[nodiscard]] std::string GetUsernameEscaped() const; template - [[nodiscard]] inline std::string GetEscapedBoldString() const { - if constexpr (with_at) - return "@" + Glib::Markup::escape_text(Username) + "#" + Discriminator; - else - return "" + Glib::Markup::escape_text(Username) + "#" + Discriminator; + [[nodiscard]] inline std::string GetUsernameEscapedBold() const { + // stupid microoptimization (nanooptimization) that shouldnt exist + if constexpr (with_at) { + std::string r = "@" + Glib::Markup::escape_text(Username) + ""; + if (!IsPomelo()) r += "#" + Discriminator; + return r; + } else { + std::string r = "" + Glib::Markup::escape_text(Username) + ""; + if (!IsPomelo()) r += "#" + Discriminator; + return r; + } } }; diff --git a/src/misc/chatutil.cpp b/src/misc/chatutil.cpp index a87df00..b5917ca 100644 --- a/src/misc/chatutil.cpp +++ b/src/misc/chatutil.cpp @@ -74,17 +74,17 @@ void HandleUserMentions(const Glib::RefPtr &buf, Snowflake chan if (channel->Type == ChannelType::DM || channel->Type == ChannelType::GROUP_DM || !channel->GuildID.has_value() || plain) { if (plain) { - replacement = "@" + user->Username + "#" + user->Discriminator; + replacement = "@" + user->GetUsername(); } else { - replacement = user->GetEscapedBoldString(); + replacement = user->GetUsernameEscapedBold(); } } else { const auto role_id = user->GetHoistedRole(*channel->GuildID, true); const auto role = discord.GetRole(role_id); if (!role.has_value()) - replacement = user->GetEscapedBoldString(); + replacement = user->GetUsernameEscapedBold(); else - replacement = "Color) + "\">" + user->GetEscapedBoldString() + ""; + replacement = "Color) + "\">" + user->GetUsernameEscapedBold() + ""; } // regex returns byte positions and theres no straightforward way in the c++ bindings to deal with that :( diff --git a/src/windows/guildsettings/auditlogpane.cpp b/src/windows/guildsettings/auditlogpane.cpp index 53bfd15..7402c55 100644 --- a/src/windows/guildsettings/auditlogpane.cpp +++ b/src/windows/guildsettings/auditlogpane.cpp @@ -38,7 +38,7 @@ void GuildSettingsAuditLogPane::OnAuditLogFetch(const AuditLogData &data) { Glib::ustring user_markup = "Unknown User"; if (entry.UserID.has_value()) { if (auto user = discord.GetUser(*entry.UserID); user.has_value()) - user_markup = discord.GetUser(*entry.UserID)->GetEscapedBoldString(); + user_markup = discord.GetUser(*entry.UserID)->GetUsernameEscapedBold(); } // spaghetti moment @@ -177,7 +177,7 @@ void GuildSettingsAuditLogPane::OnAuditLogFetch(const AuditLogData &data) { const auto target_user = discord.GetUser(entry.TargetID); markup = user_markup + " kicked " + - target_user->GetEscapedString() + + target_user->GetUsernameEscaped() + ""; } break; case AuditLogActionType::MEMBER_PRUNE: { @@ -193,21 +193,21 @@ void GuildSettingsAuditLogPane::OnAuditLogFetch(const AuditLogData &data) { const auto target_user = discord.GetUser(entry.TargetID); markup = user_markup + " banned " + - target_user->GetEscapedString() + + target_user->GetUsernameEscaped() + ""; } break; case AuditLogActionType::MEMBER_BAN_REMOVE: { const auto target_user = discord.GetUser(entry.TargetID); markup = user_markup + " removed the ban for " + - target_user->GetEscapedString() + + target_user->GetUsernameEscaped() + ""; } break; case AuditLogActionType::MEMBER_UPDATE: { const auto target_user = discord.GetUser(entry.TargetID); markup = user_markup + " updated " + - target_user->GetEscapedString() + + target_user->GetUsernameEscaped() + ""; if (entry.Changes.has_value()) for (const auto &change : *entry.Changes) { @@ -227,7 +227,7 @@ void GuildSettingsAuditLogPane::OnAuditLogFetch(const AuditLogData &data) { const auto target_user = discord.GetUser(entry.TargetID); markup = user_markup + " updated roles for " + - target_user->GetEscapedString() + ""; + target_user->GetUsernameEscaped() + ""; if (entry.Changes.has_value()) for (const auto &change : *entry.Changes) { if (change.Key == "$remove" && change.NewValue.has_value()) { @@ -262,7 +262,7 @@ void GuildSettingsAuditLogPane::OnAuditLogFetch(const AuditLogData &data) { const auto target_user = discord.GetUser(entry.TargetID); markup = user_markup + " added " + - target_user->GetEscapedString() + + target_user->GetUsernameEscaped() + " to the server"; } break; case AuditLogActionType::ROLE_CREATE: { @@ -450,14 +450,14 @@ void GuildSettingsAuditLogPane::OnAuditLogFetch(const AuditLogData &data) { const auto target_user = discord.GetUser(entry.TargetID); markup = user_markup + " pinned a message by " + - target_user->GetEscapedString() + + target_user->GetUsernameEscaped() + ""; } break; case AuditLogActionType::MESSAGE_UNPIN: { const auto target_user = discord.GetUser(entry.TargetID); markup = user_markup + " unpinned a message by " + - target_user->GetEscapedString() + + target_user->GetUsernameEscaped() + ""; } break; case AuditLogActionType::STAGE_INSTANCE_CREATE: { diff --git a/src/windows/guildsettings/memberspane.cpp b/src/windows/guildsettings/memberspane.cpp index 64c28cb..ab4ec1a 100644 --- a/src/windows/guildsettings/memberspane.cpp +++ b/src/windows/guildsettings/memberspane.cpp @@ -150,9 +150,9 @@ void GuildSettingsMembersListItem::UpdateColor() { const auto user = *discord.GetUser(UserID); if (auto color_id = discord.GetMemberHoistedRole(GuildID, UserID, true); color_id.IsValid()) { auto role = *discord.GetRole(color_id); - m_name.set_markup("" + user.GetEscapedBoldString() + ""); + m_name.set_markup("" + user.GetUsernameEscapedBold() + ""); } else - m_name.set_markup(user.GetEscapedBoldString()); + m_name.set_markup(user.GetUsernameEscapedBold()); } GuildSettingsMembersPaneInfo::GuildSettingsMembersPaneInfo(Snowflake guild_id) diff --git a/src/windows/profile/mutualfriendspane.cpp b/src/windows/profile/mutualfriendspane.cpp index e9f465b..2983fd5 100644 --- a/src/windows/profile/mutualfriendspane.cpp +++ b/src/windows/profile/mutualfriendspane.cpp @@ -22,7 +22,7 @@ MutualFriendItem::MutualFriendItem(const UserData &user) img.LoadFromURL(user.GetAvatarURL("png", "32"), sigc::track_obj(cb, *this)); } - m_name.set_markup(user.GetEscapedBoldString()); + m_name.set_markup(user.GetUsernameEscapedBold()); m_name.set_valign(Gtk::ALIGN_CENTER); add(m_avatar); diff --git a/src/windows/profilewindow.cpp b/src/windows/profilewindow.cpp index 1469e49..ed8cd8a 100644 --- a/src/windows/profilewindow.cpp +++ b/src/windows/profilewindow.cpp @@ -64,7 +64,7 @@ ProfileWindow::ProfileWindow(Snowflake user_id) img.LoadFromURL(user.GetAvatarURL("png", "64"), sigc::track_obj(cb, *this)); } - m_displayname.set_markup(user.GetEscapedName()); + m_displayname.set_markup(user.GetDisplayNameEscaped()); m_username.set_label(user.GetUsername()); m_switcher.set_stack(m_stack); -- cgit v1.2.3 From 8ec96944028a885f1af3ee8988b29b48ee2a07f7 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Tue, 13 Jun 2023 21:34:29 -0400 Subject: use display name in replies --- src/components/chatmessage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/components') diff --git a/src/components/chatmessage.cpp b/src/components/chatmessage.cpp index 2f3a86d..9e01cf0 100644 --- a/src/components/chatmessage.cpp +++ b/src/components/chatmessage.cpp @@ -656,7 +656,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data) if (role.has_value()) { const auto author = discord.GetUser(author_id); if (author.has_value()) { - return "Color) + "\">" + author->GetUsernameEscaped() + ""; + return "Color) + "\">" + author->GetDisplayNameEscaped() + ""; } } } @@ -664,7 +664,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data) const auto author = discord.GetUser(author_id); if (author.has_value()) { - return author->GetUsernameEscapedBold(); + return author->GetDisplayNameEscapedBold(); } return "Unknown User"; @@ -685,7 +685,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data) Glib::Markup::escape_text(data.Interaction->Name) + ""); } else if (const auto user = discord.GetUser(data.Interaction->User.ID); user.has_value()) { - lbl->set_markup(user->GetUsernameEscapedBold()); + lbl->set_markup(user->GetDisplayNameEscapedBold()); } else { lbl->set_markup("Unknown User"); } -- cgit v1.2.3 From c98d2c96b4f3544481ca0f7ccdd3b309b0fabd83 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Tue, 13 Jun 2023 21:48:57 -0400 Subject: remove dumb template stuff --- src/components/chatwindow.cpp | 2 +- src/dialogs/friendpicker.cpp | 2 +- src/discord/user.cpp | 29 ++++++++++++++++++++++------- src/discord/user.hpp | 15 ++------------- src/misc/chatutil.cpp | 6 +++--- src/windows/guildsettings/auditlogpane.cpp | 2 +- src/windows/guildsettings/memberspane.cpp | 4 ++-- src/windows/profile/mutualfriendspane.cpp | 2 +- 8 files changed, 33 insertions(+), 29 deletions(-) (limited to 'src/components') diff --git a/src/components/chatwindow.cpp b/src/components/chatwindow.cpp index 8f59944..e51d491 100644 --- a/src/components/chatwindow.cpp +++ b/src/components/chatwindow.cpp @@ -301,7 +301,7 @@ void ChatWindow::StartReplying(Snowflake message_id) { m_is_replying = true; m_input->StartReplying(); if (author.has_value()) - m_input_indicator->SetCustomMarkup("Replying to " + author->GetUsernameEscapedBold()); + m_input_indicator->SetCustomMarkup("Replying to " + author->GetUsernameEscapedBold()); else m_input_indicator->SetCustomMarkup("Replying..."); } diff --git a/src/dialogs/friendpicker.cpp b/src/dialogs/friendpicker.cpp index 873ddbd..fe52b77 100644 --- a/src/dialogs/friendpicker.cpp +++ b/src/dialogs/friendpicker.cpp @@ -62,7 +62,7 @@ FriendPickerDialogItem::FriendPickerDialogItem(Snowflake user_id) , m_layout(Gtk::ORIENTATION_HORIZONTAL) { auto user = *Abaddon::Get().GetDiscordClient().GetUser(user_id); - m_name.set_markup(user.GetUsernameEscapedBold()); + m_name.set_markup(user.GetUsernameEscapedBold()); m_name.set_single_line_mode(true); m_avatar.property_pixbuf() = Abaddon::Get().GetImageManager().GetPlaceholder(32); diff --git a/src/discord/user.cpp b/src/discord/user.cpp index 38157e7..1d5d15a 100644 --- a/src/discord/user.cpp +++ b/src/discord/user.cpp @@ -89,6 +89,14 @@ std::string UserData::GetDisplayName() const { return Username; } +std::string UserData::GetDisplayNameEscaped() const { + return Glib::Markup::escape_text(GetDisplayName()); +} + +std::string UserData::GetDisplayNameEscapedBold() const { + return "" + Glib::Markup::escape_text(GetDisplayName()) + ""; +} + std::string UserData::GetUsername() const { if (IsPomelo()) { return Username; @@ -97,19 +105,26 @@ std::string UserData::GetUsername() const { return Username + "#" + Discriminator; } -std::string UserData::GetDisplayNameEscaped() const { - return Glib::Markup::escape_text(GetDisplayName()); +std::string UserData::GetUsernameEscaped() const { + if (IsPomelo()) { + return Glib::Markup::escape_text(Username); + } + + return Glib::Markup::escape_text(Username) + "#" + Discriminator; } -std::string UserData::GetDisplayNameEscapedBold() const { - return "" + Glib::Markup::escape_text(GetDisplayName()) + ""; +std::string UserData::GetUsernameEscapedBold() const { + if (IsPomelo()) { + return "" + Glib::Markup::escape_text(Username) + ""; + } + return "" + Glib::Markup::escape_text(Username) + "#" + Discriminator; } -std::string UserData::GetUsernameEscaped() const { +std::string UserData::GetUsernameEscapedBoldAt() const { if (IsPomelo()) { - return GetDisplayNameEscaped(); + return "@" + Glib::Markup::escape_text(Username) + ""; } - return Glib::Markup::escape_text(GetDisplayName()) + "#" + Discriminator; + return "@" + Glib::Markup::escape_text(Username) + "#" + Discriminator; } void from_json(const nlohmann::json &j, UserData &m) { diff --git a/src/discord/user.hpp b/src/discord/user.hpp index d2c1002..19a0bf9 100644 --- a/src/discord/user.hpp +++ b/src/discord/user.hpp @@ -84,17 +84,6 @@ struct UserData { [[nodiscard]] std::string GetDisplayNameEscapedBold() const; [[nodiscard]] std::string GetUsername() const; [[nodiscard]] std::string GetUsernameEscaped() const; - template - [[nodiscard]] inline std::string GetUsernameEscapedBold() const { - // stupid microoptimization (nanooptimization) that shouldnt exist - if constexpr (with_at) { - std::string r = "@" + Glib::Markup::escape_text(Username) + ""; - if (!IsPomelo()) r += "#" + Discriminator; - return r; - } else { - std::string r = "" + Glib::Markup::escape_text(Username) + ""; - if (!IsPomelo()) r += "#" + Discriminator; - return r; - } - } + [[nodiscard]] std::string GetUsernameEscapedBold() const; + [[nodiscard]] std::string GetUsernameEscapedBoldAt() const; }; diff --git a/src/misc/chatutil.cpp b/src/misc/chatutil.cpp index b5917ca..e61d32b 100644 --- a/src/misc/chatutil.cpp +++ b/src/misc/chatutil.cpp @@ -76,15 +76,15 @@ void HandleUserMentions(const Glib::RefPtr &buf, Snowflake chan if (plain) { replacement = "@" + user->GetUsername(); } else { - replacement = user->GetUsernameEscapedBold(); + replacement = user->GetUsernameEscapedBoldAt(); } } else { const auto role_id = user->GetHoistedRole(*channel->GuildID, true); const auto role = discord.GetRole(role_id); if (!role.has_value()) - replacement = user->GetUsernameEscapedBold(); + replacement = user->GetUsernameEscapedBoldAt(); else - replacement = "Color) + "\">" + user->GetUsernameEscapedBold() + ""; + replacement = "Color) + "\">" + user->GetUsernameEscapedBoldAt() + ""; } // regex returns byte positions and theres no straightforward way in the c++ bindings to deal with that :( diff --git a/src/windows/guildsettings/auditlogpane.cpp b/src/windows/guildsettings/auditlogpane.cpp index 7402c55..f2f4a17 100644 --- a/src/windows/guildsettings/auditlogpane.cpp +++ b/src/windows/guildsettings/auditlogpane.cpp @@ -38,7 +38,7 @@ void GuildSettingsAuditLogPane::OnAuditLogFetch(const AuditLogData &data) { Glib::ustring user_markup = "Unknown User"; if (entry.UserID.has_value()) { if (auto user = discord.GetUser(*entry.UserID); user.has_value()) - user_markup = discord.GetUser(*entry.UserID)->GetUsernameEscapedBold(); + user_markup = discord.GetUser(*entry.UserID)->GetUsernameEscapedBold(); } // spaghetti moment diff --git a/src/windows/guildsettings/memberspane.cpp b/src/windows/guildsettings/memberspane.cpp index ab4ec1a..c6fb7c2 100644 --- a/src/windows/guildsettings/memberspane.cpp +++ b/src/windows/guildsettings/memberspane.cpp @@ -150,9 +150,9 @@ void GuildSettingsMembersListItem::UpdateColor() { const auto user = *discord.GetUser(UserID); if (auto color_id = discord.GetMemberHoistedRole(GuildID, UserID, true); color_id.IsValid()) { auto role = *discord.GetRole(color_id); - m_name.set_markup("" + user.GetUsernameEscapedBold() + ""); + m_name.set_markup("" + user.GetUsernameEscapedBold() + ""); } else - m_name.set_markup(user.GetUsernameEscapedBold()); + m_name.set_markup(user.GetUsernameEscapedBold()); } GuildSettingsMembersPaneInfo::GuildSettingsMembersPaneInfo(Snowflake guild_id) diff --git a/src/windows/profile/mutualfriendspane.cpp b/src/windows/profile/mutualfriendspane.cpp index 2983fd5..75fb4a6 100644 --- a/src/windows/profile/mutualfriendspane.cpp +++ b/src/windows/profile/mutualfriendspane.cpp @@ -22,7 +22,7 @@ MutualFriendItem::MutualFriendItem(const UserData &user) img.LoadFromURL(user.GetAvatarURL("png", "32"), sigc::track_obj(cb, *this)); } - m_name.set_markup(user.GetUsernameEscapedBold()); + m_name.set_markup(user.GetUsernameEscapedBold()); m_name.set_valign(Gtk::ALIGN_CENTER); add(m_avatar); -- cgit v1.2.3 From 29a049e62a6a701c7e6290a643f709a35ba5f4cf Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Tue, 13 Jun 2023 22:15:48 -0400 Subject: handle nickname in reply component --- src/components/chatmessage.cpp | 4 ++-- src/discord/user.cpp | 16 ++++++++++++++++ src/discord/user.hpp | 3 +++ 3 files changed, 21 insertions(+), 2 deletions(-) (limited to 'src/components') diff --git a/src/components/chatmessage.cpp b/src/components/chatmessage.cpp index 9e01cf0..12f8c33 100644 --- a/src/components/chatmessage.cpp +++ b/src/components/chatmessage.cpp @@ -656,7 +656,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data) if (role.has_value()) { const auto author = discord.GetUser(author_id); if (author.has_value()) { - return "Color) + "\">" + author->GetDisplayNameEscaped() + ""; + return "Color) + "\">" + author->GetDisplayNameEscaped(guild_id) + ""; } } } @@ -664,7 +664,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data) const auto author = discord.GetUser(author_id); if (author.has_value()) { - return author->GetDisplayNameEscapedBold(); + return author->GetDisplayNameEscapedBold(guild_id); } return "Unknown User"; diff --git a/src/discord/user.cpp b/src/discord/user.cpp index 1d5d15a..0f89fe2 100644 --- a/src/discord/user.cpp +++ b/src/discord/user.cpp @@ -89,14 +89,30 @@ std::string UserData::GetDisplayName() const { return Username; } +std::string UserData::GetDisplayName(Snowflake guild_id) const { + const auto member = Abaddon::Get().GetDiscordClient().GetMember(ID, guild_id); + if (member.has_value() && !member->Nickname.empty()) { + return member->Nickname; + } + return GetDisplayName(); +} + std::string UserData::GetDisplayNameEscaped() const { return Glib::Markup::escape_text(GetDisplayName()); } +std::string UserData::GetDisplayNameEscaped(Snowflake guild_id) const { + return Glib::Markup::escape_text(GetDisplayName(guild_id)); +} + std::string UserData::GetDisplayNameEscapedBold() const { return "" + Glib::Markup::escape_text(GetDisplayName()) + ""; } +std::string UserData::GetDisplayNameEscapedBold(Snowflake guild_id) const { + return "" + Glib::Markup::escape_text(GetDisplayName(guild_id)) + ""; +} + std::string UserData::GetUsername() const { if (IsPomelo()) { return Username; diff --git a/src/discord/user.hpp b/src/discord/user.hpp index 19a0bf9..29de62a 100644 --- a/src/discord/user.hpp +++ b/src/discord/user.hpp @@ -80,8 +80,11 @@ struct UserData { [[nodiscard]] Snowflake GetHoistedRole(Snowflake guild_id, bool with_color = false) const; [[nodiscard]] std::string GetMention() const; [[nodiscard]] std::string GetDisplayName() const; + [[nodiscard]] std::string GetDisplayName(Snowflake guild_id) const; [[nodiscard]] std::string GetDisplayNameEscaped() const; + [[nodiscard]] std::string GetDisplayNameEscaped(Snowflake guild_id) const; [[nodiscard]] std::string GetDisplayNameEscapedBold() const; + [[nodiscard]] std::string GetDisplayNameEscapedBold(Snowflake guild_id) const; [[nodiscard]] std::string GetUsername() const; [[nodiscard]] std::string GetUsernameEscaped() const; [[nodiscard]] std::string GetUsernameEscapedBold() const; -- cgit v1.2.3 From e097342f5558aa4b0d313f0cde707d56b2f6df58 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Tue, 13 Jun 2023 22:21:06 -0400 Subject: show nicknames in member list --- src/components/memberlist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components') diff --git a/src/components/memberlist.cpp b/src/components/memberlist.cpp index 9450548..975b527 100644 --- a/src/components/memberlist.cpp +++ b/src/components/memberlist.cpp @@ -40,7 +40,7 @@ MemberListUserRow::MemberListUserRow(const std::optional &guild, cons // todo remove after migration complete std::string display; if (data.IsPomelo()) { - display = data.GetDisplayName(); + display = data.GetDisplayName(guild.has_value() ? guild->ID : Snowflake::Invalid); } else { display = data.Username; if (Abaddon::Get().GetSettings().ShowMemberListDiscriminators) { -- cgit v1.2.3 From 878616e2efaa9a4fa1fa6b5e7dd376eb0dd1c79a Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Wed, 14 Jun 2023 01:56:46 -0400 Subject: use display name in typing indicator --- src/components/chatinputindicator.cpp | 14 ++++++++++---- src/components/chatinputindicator.hpp | 1 + src/discord/user.cpp | 7 +++++++ src/discord/user.hpp | 1 + 4 files changed, 19 insertions(+), 4 deletions(-) (limited to 'src/components') diff --git a/src/components/chatinputindicator.cpp b/src/components/chatinputindicator.cpp index 13315c6..0611e71 100644 --- a/src/components/chatinputindicator.cpp +++ b/src/components/chatinputindicator.cpp @@ -54,6 +54,12 @@ void ChatInputIndicator::AddUser(Snowflake channel_id, const UserData &user, int void ChatInputIndicator::SetActiveChannel(Snowflake id) { m_active_channel = id; + const auto channel = Abaddon::Get().GetDiscordClient().GetChannel(id); + if (channel.has_value()) { + m_active_guild = channel->GuildID; + } else { + m_active_guild = std::nullopt; + } ComputeTypingString(); } @@ -105,14 +111,14 @@ void ChatInputIndicator::ComputeTypingString() { if (typers.empty()) { SetTypingString(""); } else if (typers.size() == 1) { - SetTypingString(typers[0].Username + " is typing..."); + SetTypingString(typers[0].GetDisplayName(m_active_guild) + " is typing..."); } else if (typers.size() == 2) { - SetTypingString(typers[0].Username + " and " + typers[1].Username + " are typing..."); + SetTypingString(typers[0].GetDisplayName(m_active_guild) + " and " + typers[1].GetDisplayName(m_active_guild) + " are typing..."); } else if (typers.size() > 2 && typers.size() <= MaxUsersInIndicator) { Glib::ustring str; for (size_t i = 0; i < typers.size() - 1; i++) - str += typers[i].Username + ", "; - SetTypingString(str + "and " + typers[typers.size() - 1].Username + " are typing..."); + str += typers[i].GetDisplayName(m_active_guild) + ", "; + SetTypingString(str + "and " + typers[typers.size() - 1].GetDisplayName(m_active_guild) + " are typing..."); } else { // size() > MaxUsersInIndicator SetTypingString("Several people are typing..."); } diff --git a/src/components/chatinputindicator.hpp b/src/components/chatinputindicator.hpp index 40c966e..5688393 100644 --- a/src/components/chatinputindicator.hpp +++ b/src/components/chatinputindicator.hpp @@ -23,5 +23,6 @@ private: Glib::ustring m_custom_markup; Snowflake m_active_channel; + std::optional m_active_guild; std::unordered_map> m_typers; // channel id -> [user id -> connection] }; diff --git a/src/discord/user.cpp b/src/discord/user.cpp index 0f89fe2..f43284f 100644 --- a/src/discord/user.cpp +++ b/src/discord/user.cpp @@ -97,6 +97,13 @@ std::string UserData::GetDisplayName(Snowflake guild_id) const { return GetDisplayName(); } +std::string UserData::GetDisplayName(const std::optional &guild_id) const { + if (guild_id.has_value()) { + return GetDisplayName(*guild_id); + } + return GetDisplayName(); +} + std::string UserData::GetDisplayNameEscaped() const { return Glib::Markup::escape_text(GetDisplayName()); } diff --git a/src/discord/user.hpp b/src/discord/user.hpp index 29de62a..8b2a2c4 100644 --- a/src/discord/user.hpp +++ b/src/discord/user.hpp @@ -81,6 +81,7 @@ struct UserData { [[nodiscard]] std::string GetMention() const; [[nodiscard]] std::string GetDisplayName() const; [[nodiscard]] std::string GetDisplayName(Snowflake guild_id) const; + [[nodiscard]] std::string GetDisplayName(const std::optional &guild_id) const; [[nodiscard]] std::string GetDisplayNameEscaped() const; [[nodiscard]] std::string GetDisplayNameEscaped(Snowflake guild_id) const; [[nodiscard]] std::string GetDisplayNameEscapedBold() const; -- cgit v1.2.3 From 00dddf410e8aa9df64d323211e9dcdf4309f06a1 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Wed, 14 Jun 2023 02:04:39 -0400 Subject: convert a bunch of .Username accesses to proper access --- src/abaddon.cpp | 4 ++-- src/components/chatmessage.cpp | 6 +++--- src/components/completer.cpp | 3 ++- src/components/friendslist.cpp | 10 +++++----- src/windows/guildsettings/banspane.cpp | 6 +++--- src/windows/guildsettings/emojispane.cpp | 2 +- src/windows/guildsettings/invitespane.cpp | 2 +- src/windows/guildsettings/memberspane.cpp | 2 +- src/windows/voicewindow.cpp | 2 +- 9 files changed, 19 insertions(+), 18 deletions(-) (limited to 'src/components') diff --git a/src/abaddon.cpp b/src/abaddon.cpp index a1ed343..e22afde 100644 --- a/src/abaddon.cpp +++ b/src/abaddon.cpp @@ -952,7 +952,7 @@ void Abaddon::ActionKickMember(Snowflake user_id, Snowflake guild_id) { ConfirmDialog dlg(*m_main_window); const auto user = m_discord.GetUser(user_id); if (user.has_value()) - dlg.SetConfirmText("Are you sure you want to kick " + user->Username + "#" + user->Discriminator + "?"); + dlg.SetConfirmText("Are you sure you want to kick " + user->GetUsername() + "?"); auto response = dlg.run(); if (response == Gtk::RESPONSE_OK) m_discord.KickUser(user_id, guild_id); @@ -962,7 +962,7 @@ void Abaddon::ActionBanMember(Snowflake user_id, Snowflake guild_id) { ConfirmDialog dlg(*m_main_window); const auto user = m_discord.GetUser(user_id); if (user.has_value()) - dlg.SetConfirmText("Are you sure you want to ban " + user->Username + "#" + user->Discriminator + "?"); + dlg.SetConfirmText("Are you sure you want to ban " + user->GetUsername() + "?"); auto response = dlg.run(); if (response == Gtk::RESPONSE_OK) m_discord.BanUser(user_id, guild_id); diff --git a/src/components/chatmessage.cpp b/src/components/chatmessage.cpp index 12f8c33..4fde039 100644 --- a/src/components/chatmessage.cpp +++ b/src/components/chatmessage.cpp @@ -221,16 +221,16 @@ void ChatMessageItemContainer::UpdateTextComponent(Gtk::TextView *tv) { if (data->Mentions.empty()) break; const auto &adder = Abaddon::Get().GetDiscordClient().GetUser(data->Author.ID); const auto &added = data->Mentions[0]; - b->insert_markup(s, "" + adder->Username + " added " + added.Username + ""); + b->insert_markup(s, "" + adder->GetUsername() + " added " + added.GetUsername() + ""); } break; case MessageType::RECIPIENT_REMOVE: { if (data->Mentions.empty()) break; const auto &adder = Abaddon::Get().GetDiscordClient().GetUser(data->Author.ID); const auto &added = data->Mentions[0]; if (adder->ID == added.ID) - b->insert_markup(s, "" + adder->Username + " left"); + b->insert_markup(s, "" + adder->GetUsername() + " left"); else - b->insert_markup(s, "" + adder->Username + " removed " + added.Username + ""); + b->insert_markup(s, "" + adder->GetUsername() + " removed " + added.GetUsername() + ""); } break; case MessageType::CHANNEL_NAME_CHANGE: { const auto author = Abaddon::Get().GetDiscordClient().GetUser(data->Author.ID); diff --git a/src/components/completer.cpp b/src/components/completer.cpp index c6a5a08..f6f0906 100644 --- a/src/components/completer.cpp +++ b/src/components/completer.cpp @@ -117,12 +117,13 @@ void Completer::CompleteMentions(const Glib::ustring &term) { if (id == me) continue; const auto author = discord.GetUser(id); if (!author.has_value()) continue; + // todo improve the predicate here if (!StringContainsCaseless(author->Username, term)) continue; if (i++ > 15) break; auto entry = CreateEntry(author->GetMention()); - entry->SetText(author->Username + "#" + author->Discriminator); + entry->SetText(author->GetUsername()); if (channel_id.IsValid()) { const auto chan = discord.GetChannel(channel_id); diff --git a/src/components/friendslist.cpp b/src/components/friendslist.cpp index 5839b65..99fbafa 100644 --- a/src/components/friendslist.cpp +++ b/src/components/friendslist.cpp @@ -117,16 +117,16 @@ void FriendsList::OnActionRemove(Snowflake id) { Glib::ustring str; switch (*discord.GetRelationship(id)) { case RelationshipType::Blocked: - str = "Are you sure you want to unblock " + user->Username + "#" + user->Discriminator + "?"; + str = "Are you sure you want to unblock " + user->GetUsername() + "?"; break; case RelationshipType::Friend: - str = "Are you sure you want to remove " + user->Username + "#" + user->Discriminator + "?"; + str = "Are you sure you want to remove " + user->GetUsername() + "?"; break; case RelationshipType::PendingIncoming: - str = "Are you sure you want to ignore " + user->Username + "#" + user->Discriminator + "?"; + str = "Are you sure you want to ignore " + user->GetUsername() + "?"; break; case RelationshipType::PendingOutgoing: - str = "Are you sure you want to cancel your request to " + user->Username + "#" + user->Discriminator + "?"; + str = "Are you sure you want to cancel your request to " + user->GetUsername() + "?"; break; default: break; @@ -244,7 +244,7 @@ bool FriendsListAddComponent::OnKeyPress(GdkEventKey *e) { FriendsListFriendRow::FriendsListFriendRow(RelationshipType type, const UserData &data) : ID(data.ID) , Type(type) - , Name(data.Username + "#" + data.Discriminator) + , Name(data.GetUsername()) , Status(Abaddon::Get().GetDiscordClient().GetUserStatus(data.ID)) , m_accept("Accept") { auto *ev = Gtk::manage(new Gtk::EventBox); diff --git a/src/windows/guildsettings/banspane.cpp b/src/windows/guildsettings/banspane.cpp index bfc7331..68a232d 100644 --- a/src/windows/guildsettings/banspane.cpp +++ b/src/windows/guildsettings/banspane.cpp @@ -72,7 +72,7 @@ void GuildSettingsBansPane::OnGuildBanFetch(const BanData &ban) { auto row = *m_model->append(); row[m_columns.m_col_id] = ban.User.ID; if (user.has_value()) - row[m_columns.m_col_user] = user->Username + "#" + user->Discriminator; + row[m_columns.m_col_user] = user->GetUsername(); else row[m_columns.m_col_user] = "<@" + std::to_string(ban.User.ID) + ">"; @@ -84,7 +84,7 @@ void GuildSettingsBansPane::OnGuildBansFetch(const std::vector &bans) { const auto user = Abaddon::Get().GetDiscordClient().GetUser(ban.User.ID); auto row = *m_model->append(); row[m_columns.m_col_id] = user->ID; - row[m_columns.m_col_user] = user->Username + "#" + user->Discriminator; + row[m_columns.m_col_user] = user->GetUsername(); row[m_columns.m_col_reason] = ban.Reason; } } @@ -148,7 +148,7 @@ void GuildSettingsBansPane::OnBanAdd(Snowflake guild_id, Snowflake user_id) { auto user = *discord.GetUser(user_id); auto row = *m_model->append(); row[m_columns.m_col_id] = user_id; - row[m_columns.m_col_user] = user.Username + "#" + user.Discriminator; + row[m_columns.m_col_user] = user.GetUsername(); row[m_columns.m_col_reason] = ""; } } diff --git a/src/windows/guildsettings/emojispane.cpp b/src/windows/guildsettings/emojispane.cpp index c86ea64..702432f 100644 --- a/src/windows/guildsettings/emojispane.cpp +++ b/src/windows/guildsettings/emojispane.cpp @@ -119,7 +119,7 @@ void GuildSettingsEmojisPane::AddEmojiRow(const EmojiData &emoji) { row[m_columns.m_col_pixbuf] = img.GetPlaceholder(32); row[m_columns.m_col_name] = emoji.Name; if (emoji.Creator.has_value()) - row[m_columns.m_col_creator] = emoji.Creator->Username + "#" + emoji.Creator->Discriminator; + row[m_columns.m_col_creator] = emoji.Creator->GetUsername(); if (emoji.IsAnimated.has_value()) row[m_columns.m_col_animated] = *emoji.IsAnimated ? "Yes" : "No"; else diff --git a/src/windows/guildsettings/invitespane.cpp b/src/windows/guildsettings/invitespane.cpp index 4426f6a..a76b3f2 100644 --- a/src/windows/guildsettings/invitespane.cpp +++ b/src/windows/guildsettings/invitespane.cpp @@ -51,7 +51,7 @@ void GuildSettingsInvitesPane::AppendInvite(const InviteData &invite) { auto row = *m_model->append(); row[m_columns.m_col_code] = invite.Code; if (invite.Inviter.has_value()) - row[m_columns.m_col_inviter] = invite.Inviter->Username + "#" + invite.Inviter->Discriminator; + row[m_columns.m_col_inviter] = invite.Inviter->GetUsername(); if (invite.MaxAge.has_value()) { if (*invite.MaxAge == 0) diff --git a/src/windows/guildsettings/memberspane.cpp b/src/windows/guildsettings/memberspane.cpp index c6fb7c2..8c613d0 100644 --- a/src/windows/guildsettings/memberspane.cpp +++ b/src/windows/guildsettings/memberspane.cpp @@ -103,7 +103,7 @@ GuildSettingsMembersListItem::GuildSettingsMembersListItem(const GuildData &guil else m_avatar.SetURL(member.User->GetAvatarURL("png", "32")); - DisplayTerm = member.User->Username + "#" + member.User->Discriminator; + DisplayTerm = member.User->GetUsername(); const auto member_update_cb = [this](Snowflake guild_id, Snowflake user_id) { if (user_id == UserID) diff --git a/src/windows/voicewindow.cpp b/src/windows/voicewindow.cpp index 9e2efee..35ba8c7 100644 --- a/src/windows/voicewindow.cpp +++ b/src/windows/voicewindow.cpp @@ -39,7 +39,7 @@ public: auto &discord = Abaddon::Get().GetDiscordClient(); const auto user = discord.GetUser(id); if (user.has_value()) { - m_name.set_text(user->Username); + m_name.set_text(user->GetUsername()); m_avatar.SetURL(user->GetAvatarURL("png", "32")); } else { m_name.set_text("Unknown user"); -- cgit v1.2.3 From 2381eb47535bc9aa74e3886a15222dd13a92a370 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Thu, 15 Jun 2023 01:42:25 -0400 Subject: use default group dm icons if none set --- src/components/channels.cpp | 72 +++++++++++++++++++++++++++++++++------------ src/components/channels.hpp | 1 + src/discord/snowflake.cpp | 4 +++ src/discord/snowflake.hpp | 1 + 4 files changed, 59 insertions(+), 19 deletions(-) (limited to 'src/components') diff --git a/src/components/channels.cpp b/src/components/channels.cpp index 0e97837..39dd799 100644 --- a/src/components/channels.cpp +++ b/src/components/channels.cpp @@ -1016,19 +1016,7 @@ void ChannelList::AddPrivateChannels() { row[m_columns.m_sort] = static_cast(-(dm->LastMessageID.has_value() ? *dm->LastMessageID : dm_id)); row[m_columns.m_icon] = img.GetPlaceholder(DMIconSize); - if (dm->HasIcon()) { - const auto cb = [this, iter](const Glib::RefPtr &pb) { - if (iter) - (*iter)[m_columns.m_icon] = pb->scale_simple(DMIconSize, DMIconSize, Gdk::INTERP_BILINEAR); - }; - img.LoadFromURL(dm->GetIconURL(), sigc::track_obj(cb, *this)); - } else if (top_recipient.has_value()) { - const auto cb = [this, iter](const Glib::RefPtr &pb) { - if (iter) - (*iter)[m_columns.m_icon] = pb->scale_simple(DMIconSize, DMIconSize, Gdk::INTERP_BILINEAR); - }; - img.LoadFromURL(top_recipient->GetAvatarURL("png", "32"), sigc::track_obj(cb, *this)); - } + SetDMChannelIcon(iter, *dm); } } @@ -1036,11 +1024,6 @@ void ChannelList::UpdateCreateDMChannel(const ChannelData &dm) { auto header_row = m_model->get_iter(m_dm_header); auto &img = Abaddon::Get().GetImageManager(); - std::optional top_recipient; - const auto recipients = dm.GetDMRecipients(); - if (!recipients.empty()) - top_recipient = recipients[0]; - auto iter = m_model->append(header_row->children()); auto row = *iter; row[m_columns.m_type] = RenderType::DM; @@ -1049,12 +1032,63 @@ void ChannelList::UpdateCreateDMChannel(const ChannelData &dm) { row[m_columns.m_sort] = static_cast(-(dm.LastMessageID.has_value() ? *dm.LastMessageID : dm.ID)); row[m_columns.m_icon] = img.GetPlaceholder(DMIconSize); - if (top_recipient.has_value()) { + SetDMChannelIcon(iter, dm); +} + +void ChannelList::SetDMChannelIcon(Gtk::TreeIter iter, const ChannelData &dm) { + auto &img = Abaddon::Get().GetImageManager(); + + std::optional top_recipient; + const auto recipients = dm.GetDMRecipients(); + if (!recipients.empty()) + top_recipient = recipients[0]; + + if (dm.HasIcon()) { + const auto cb = [this, iter](const Glib::RefPtr &pb) { + if (iter) + (*iter)[m_columns.m_icon] = pb->scale_simple(DMIconSize, DMIconSize, Gdk::INTERP_BILINEAR); + }; + img.LoadFromURL(dm.GetIconURL(), sigc::track_obj(cb, *this)); + } else if (dm.Type == ChannelType::DM && top_recipient.has_value()) { const auto cb = [this, iter](const Glib::RefPtr &pb) { if (iter) (*iter)[m_columns.m_icon] = pb->scale_simple(DMIconSize, DMIconSize, Gdk::INTERP_BILINEAR); }; img.LoadFromURL(top_recipient->GetAvatarURL("png", "32"), sigc::track_obj(cb, *this)); + } else { // GROUP_DM + std::string hash; + switch (dm.ID.GetUnixMilliseconds() % 8) { + case 0: + hash = "ee9275c5a437f7dc7f9430ba95f12ebd"; + break; + case 1: + hash = "9baf45aac2a0ec2e2dab288333acb9d9"; + break; + case 2: + hash = "7ba11ffb1900fa2b088cb31324242047"; + break; + case 3: + hash = "f90fca70610c4898bc57b58bce92f587"; + break; + case 4: + hash = "e2779af34b8d9126b77420e5f09213ce"; + break; + case 5: + hash = "c6851bd0b03f1cca5a8c1e720ea6ea17"; + break; + case 6: + hash = "f7e38ac976a2a696161c923502a8345b"; + break; + case 7: + default: + hash = "3cb840d03313467838d658bbec801fcd"; + break; + } + const auto cb = [this, iter](const Glib::RefPtr &pb) { + if (iter) + (*iter)[m_columns.m_icon] = pb->scale_simple(DMIconSize, DMIconSize, Gdk::INTERP_BILINEAR); + }; + img.LoadFromURL("https://discord.com/assets/" + hash + ".png", sigc::track_obj(cb, *this)); } } diff --git a/src/components/channels.hpp b/src/components/channels.hpp index 7a23b3d..d561737 100644 --- a/src/components/channels.hpp +++ b/src/components/channels.hpp @@ -114,6 +114,7 @@ protected: void AddPrivateChannels(); void UpdateCreateDMChannel(const ChannelData &channel); + void SetDMChannelIcon(Gtk::TreeIter iter, const ChannelData &dm); void OnMessageAck(const MessageAckData &data); diff --git a/src/discord/snowflake.cpp b/src/discord/snowflake.cpp index 15dacae..680d4da 100644 --- a/src/discord/snowflake.cpp +++ b/src/discord/snowflake.cpp @@ -60,6 +60,10 @@ Glib::ustring Snowflake::GetLocalTimestamp() const { return tmp.data(); } +uint64_t Snowflake::GetUnixMilliseconds() const noexcept { + return (m_num >> 22) + DiscordEpochSeconds * 1000; +} + void from_json(const nlohmann::json &j, Snowflake &s) { if (j.is_string()) { std::string tmp; diff --git a/src/discord/snowflake.hpp b/src/discord/snowflake.hpp index 2ced46b..68cb5ea 100644 --- a/src/discord/snowflake.hpp +++ b/src/discord/snowflake.hpp @@ -16,6 +16,7 @@ struct Snowflake { [[nodiscard]] bool IsValid() const; [[nodiscard]] Glib::ustring GetLocalTimestamp() const; + [[nodiscard]] uint64_t GetUnixMilliseconds() const noexcept; bool operator==(const Snowflake &s) const noexcept { return m_num == s.m_num; -- cgit v1.2.3 From 5b9a9bbc9ab2796074b38378f9d98d10c422c6d4 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Thu, 15 Jun 2023 22:20:14 -0400 Subject: show voice participants in private channels --- src/components/channels.cpp | 12 ++++++++- src/discord/discord.cpp | 61 +++++++++++++++++++++++++++------------------ src/discord/discord.hpp | 3 +++ src/discord/objects.cpp | 5 ++++ src/discord/objects.hpp | 42 ++++++++++++++++++++----------- 5 files changed, 83 insertions(+), 40 deletions(-) (limited to 'src/components') diff --git a/src/components/channels.cpp b/src/components/channels.cpp index 39dd799..6a5c8cc 100644 --- a/src/components/channels.cpp +++ b/src/components/channels.cpp @@ -42,7 +42,7 @@ ChannelList::ChannelList() const auto type = row[m_columns.m_type]; // text channels should not be allowed to be collapsed // maybe they should be but it seems a little difficult to handle expansion to permit this - if (type != RenderType::TextChannel) { + if (type != RenderType::TextChannel && type != RenderType::DM) { if (row[m_columns.m_expanded]) { m_view.collapse_row(path); row[m_columns.m_expanded] = false; @@ -527,6 +527,7 @@ void ChannelList::OnThreadListSync(const ThreadListSyncData &data) { #ifdef WITH_VOICE void ChannelList::OnVoiceUserConnect(Snowflake user_id, Snowflake channel_id) { auto parent_iter = GetIteratorForRowFromIDOfType(channel_id, RenderType::VoiceChannel); + if (!parent_iter) parent_iter = GetIteratorForRowFromIDOfType(channel_id, RenderType::DM); if (!parent_iter) return; const auto user = Abaddon::Get().GetDiscordClient().GetUser(user_id); if (!user.has_value()) return; @@ -1015,6 +1016,15 @@ void ChannelList::AddPrivateChannels() { row[m_columns.m_name] = Glib::Markup::escape_text(dm->GetDisplayName()); row[m_columns.m_sort] = static_cast(-(dm->LastMessageID.has_value() ? *dm->LastMessageID : dm_id)); row[m_columns.m_icon] = img.GetPlaceholder(DMIconSize); + row[m_columns.m_expanded] = true; + +#ifdef WITH_VOICE + for (auto user_id : discord.GetUsersInVoiceChannel(dm_id)) { + if (const auto user = discord.GetUser(user_id); user.has_value()) { + CreateVoiceParticipantRow(*user, row->children()); + } + } +#endif SetDMChannelIcon(iter, *dm); } diff --git a/src/discord/discord.cpp b/src/discord/discord.cpp index 2a25a26..e0a26e8 100644 --- a/src/discord/discord.cpp +++ b/src/discord/discord.cpp @@ -1579,6 +1579,9 @@ void DiscordClient::HandleGatewayMessage(std::string str) { case GatewayEvent::VOICE_SERVER_UPDATE: { HandleGatewayVoiceServerUpdate(m); } break; + case GatewayEvent::CALL_CREATE: { + HandleGatewayCallCreate(m); + } break; #endif } } break; @@ -2253,8 +2256,39 @@ void DiscordClient::HandleGatewayGuildMembersChunk(const GatewayMessage &msg) { void DiscordClient::HandleGatewayVoiceStateUpdate(const GatewayMessage &msg) { spdlog::get("discord")->trace("VOICE_STATE_UPDATE"); - VoiceState data = msg.Data; + CheckVoiceState(msg.Data); +} + +void DiscordClient::HandleGatewayVoiceServerUpdate(const GatewayMessage &msg) { + spdlog::get("discord")->trace("VOICE_SERVER_UPDATE"); + + VoiceServerUpdateData data = msg.Data; + spdlog::get("discord")->debug("Voice server endpoint: {}", data.Endpoint); + spdlog::get("discord")->debug("Voice token: {}", data.Token); + m_voice.SetEndpoint(data.Endpoint); + m_voice.SetToken(data.Token); + if (data.GuildID.has_value()) { + m_voice.SetServerID(*data.GuildID); + } else if (data.ChannelID.has_value()) { + m_voice.SetServerID(*data.ChannelID); + } else { + spdlog::get("discord")->error("No guild or channel ID in voice server?"); + } + m_voice.SetUserID(m_user_data.ID); + m_voice.Start(); +} + +void DiscordClient::HandleGatewayCallCreate(const GatewayMessage &msg) { + CallCreateData data = msg.Data; + + spdlog::get("discord")->debug("CALL_CREATE: {}", data.ChannelID); + for (const auto &state : data.VoiceStates) { + CheckVoiceState(state); + } +} + +void DiscordClient::CheckVoiceState(const VoiceState &data) { if (data.UserID == m_user_data.ID) { spdlog::get("discord")->debug("Voice session ID: {}", data.SessionID); m_voice.SetSessionID(data.SessionID); @@ -2292,25 +2326,6 @@ void DiscordClient::HandleGatewayVoiceStateUpdate(const GatewayMessage &msg) { } } } - -void DiscordClient::HandleGatewayVoiceServerUpdate(const GatewayMessage &msg) { - spdlog::get("discord")->trace("VOICE_SERVER_UPDATE"); - - VoiceServerUpdateData data = msg.Data; - spdlog::get("discord")->debug("Voice server endpoint: {}", data.Endpoint); - spdlog::get("discord")->debug("Voice token: {}", data.Token); - m_voice.SetEndpoint(data.Endpoint); - m_voice.SetToken(data.Token); - if (data.GuildID.has_value()) { - m_voice.SetServerID(*data.GuildID); - } else if (data.ChannelID.has_value()) { - m_voice.SetServerID(*data.ChannelID); - } else { - spdlog::get("discord")->error("No guild or channel ID in voice server?"); - } - m_voice.SetUserID(m_user_data.ID); - m_voice.Start(); -} #endif void DiscordClient::HandleGatewayReadySupplemental(const GatewayMessage &msg) { @@ -2556,7 +2571,7 @@ void DiscordClient::HeartbeatThread() { void DiscordClient::SendIdentify() { IdentifyMessage msg; msg.Token = m_token; - msg.Capabilities = 509; // no idea what this is + msg.Capabilities = 4605; // bit 12 is necessary for CALL_CREATE... apparently? need to get this in sync with official client msg.Properties.OS = "Windows"; msg.Properties.Browser = "Chrome"; msg.Properties.Device = ""; @@ -2575,9 +2590,6 @@ void DiscordClient::SendIdentify() { msg.Presence.Since = 0; msg.Presence.IsAFK = false; msg.DoesSupportCompression = false; - msg.ClientState.HighestLastMessageID = "0"; - msg.ClientState.ReadStateVersion = 0; - msg.ClientState.UserGuildSettingsVersion = -1; SetSuperPropertiesFromIdentity(msg); const bool b = m_websocket.GetPrintMessages(); m_websocket.SetPrintMessages(false); @@ -2893,6 +2905,7 @@ void DiscordClient::LoadEventMap() { m_event_map["GUILD_MEMBERS_CHUNK"] = GatewayEvent::GUILD_MEMBERS_CHUNK; m_event_map["VOICE_STATE_UPDATE"] = GatewayEvent::VOICE_STATE_UPDATE; m_event_map["VOICE_SERVER_UPDATE"] = GatewayEvent::VOICE_SERVER_UPDATE; + m_event_map["CALL_CREATE"] = GatewayEvent::CALL_CREATE; } DiscordClient::type_signal_gateway_ready DiscordClient::signal_gateway_ready() { diff --git a/src/discord/discord.hpp b/src/discord/discord.hpp index 7f7518c..d2435dd 100644 --- a/src/discord/discord.hpp +++ b/src/discord/discord.hpp @@ -291,6 +291,9 @@ private: #ifdef WITH_VOICE void HandleGatewayVoiceStateUpdate(const GatewayMessage &msg); void HandleGatewayVoiceServerUpdate(const GatewayMessage &msg); + void HandleGatewayCallCreate(const GatewayMessage &msg); + + void CheckVoiceState(const VoiceState &data); #endif void HeartbeatThread(); diff --git a/src/discord/objects.cpp b/src/discord/objects.cpp index 86264cc..645a693 100644 --- a/src/discord/objects.cpp +++ b/src/discord/objects.cpp @@ -686,6 +686,11 @@ void from_json(const nlohmann::json &j, VoiceServerUpdateData &m) { JS_ON("guild_id", m.GuildID); JS_ON("channel_id", m.ChannelID); } + +void from_json(const nlohmann::json &j, CallCreateData &m) { + JS_D("channel_id", m.ChannelID); + JS_D("voice_states", m.VoiceStates); +} #endif void from_json(const nlohmann::json &j, VoiceState &m) { diff --git a/src/discord/objects.hpp b/src/discord/objects.hpp index 3ad4037..cad37f1 100644 --- a/src/discord/objects.hpp +++ b/src/discord/objects.hpp @@ -102,6 +102,7 @@ enum class GatewayEvent : int { GUILD_MEMBERS_CHUNK, VOICE_STATE_UPDATE, VOICE_SERVER_UPDATE, + CALL_CREATE, }; enum class GatewayCloseCode : uint16_t { @@ -886,6 +887,23 @@ struct GuildMembersChunkData { friend void from_json(const nlohmann::json &j, GuildMembersChunkData &m); }; +struct VoiceState { + std::optional ChannelID; + bool IsDeafened; + bool IsMuted; + std::optional GuildID; + std::optional Member; + bool IsSelfDeafened; + bool IsSelfMuted; + bool IsSelfVideo; + bool IsSelfStream = false; + std::string SessionID; + bool IsSuppressed; + Snowflake UserID; + + friend void from_json(const nlohmann::json &j, VoiceState &m); +}; + #ifdef WITH_VOICE struct VoiceStateUpdateMessage { std::optional GuildID; @@ -906,21 +924,15 @@ struct VoiceServerUpdateData { friend void from_json(const nlohmann::json &j, VoiceServerUpdateData &m); }; -#endif -struct VoiceState { - std::optional ChannelID; - bool IsDeafened; - bool IsMuted; - std::optional GuildID; - std::optional Member; - bool IsSelfDeafened; - bool IsSelfMuted; - bool IsSelfVideo; - bool IsSelfStream = false; - std::string SessionID; - bool IsSuppressed; - Snowflake UserID; +struct CallCreateData { + Snowflake ChannelID; + std::vector VoiceStates; + // Snowflake MessageID; + // std::string Region; + // std::vector Ringing; + // std::vector EmbeddedActivities; - friend void from_json(const nlohmann::json &j, VoiceState &m); + friend void from_json(const nlohmann::json &j, CallCreateData &m); }; +#endif -- cgit v1.2.3 From a7b1523b455bf7b9c3bc06e03ed5051498db8082 Mon Sep 17 00:00:00 2001 From: Morc - Richard Gráčik Date: Sat, 17 Jun 2023 10:02:13 +0200 Subject: fix clipboard pasting on macOS just checks for __APPLE__ definition and changes the mask accordingly --- src/components/chatinput.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/components') diff --git a/src/components/chatinput.cpp b/src/components/chatinput.cpp index d19ac4b..28ed1ea 100644 --- a/src/components/chatinput.cpp +++ b/src/components/chatinput.cpp @@ -41,9 +41,15 @@ bool ChatInputText::ProcessKeyPress(GdkEventKey *event) { return true; } +#ifdef __APPLE__ + if ((event->state & GDK_MOD2_MASK) && event->keyval == GDK_KEY_v) { + return CheckHandleClipboardPaste(); + } +#else if ((event->state & GDK_CONTROL_MASK) && event->keyval == GDK_KEY_v) { return CheckHandleClipboardPaste(); } +#endif if (event->keyval == GDK_KEY_Return) { if (event->state & GDK_SHIFT_MASK) -- cgit v1.2.3 From 3f6be457b121b0388874f8263ec0ab0be9a0c46e Mon Sep 17 00:00:00 2001 From: Jerzy Kozera <120114+jkozera@users.noreply.github.com> Date: Tue, 4 Jul 2023 01:15:05 +0200 Subject: Show unread indicators next to categories containing unread channels --- src/components/channelscellrenderer.cpp | 27 ++++++++++++++++++--------- src/discord/discord.cpp | 10 ++++++++++ src/discord/discord.hpp | 1 + 3 files changed, 29 insertions(+), 9 deletions(-) (limited to 'src/components') diff --git a/src/components/channelscellrenderer.cpp b/src/components/channelscellrenderer.cpp index 6de7a00..ac98512 100644 --- a/src/components/channelscellrenderer.cpp +++ b/src/components/channelscellrenderer.cpp @@ -410,6 +410,17 @@ void CellRendererChannels::get_preferred_height_for_width_vfunc_category(Gtk::Wi m_renderer_text.get_preferred_height_for_width(widget, width, minimum_height, natural_height); } +void AddUnreadIndicator(const Cairo::RefPtr &cr, const Gdk::Rectangle &background_area) { + static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().UnreadIndicatorColor); + cr->set_source_rgb(color.get_red(), color.get_green(), color.get_blue()); + const auto x = background_area.get_x(); + const auto y = background_area.get_y(); + const auto w = background_area.get_width(); + const auto h = background_area.get_height(); + cr->rectangle(x, y, 3, h); + cr->fill(); +} + void CellRendererChannels::render_vfunc_category(const Cairo::RefPtr &cr, Gtk::Widget &widget, const Gdk::Rectangle &background_area, const Gdk::Rectangle &cell_area, Gtk::CellRendererState flags) { // todo: figure out how Gtk::Arrow is rendered because i like it better :^) constexpr static int len = 5; @@ -447,13 +458,18 @@ void CellRendererChannels::render_vfunc_category(const Cairo::RefPtr 0) { + AddUnreadIndicator(cr, background_area); + } m_renderer_text.property_foreground_rgba() = color; } m_renderer_text.render(cr, widget, background_area, text_cell_area, flags); @@ -519,14 +535,7 @@ void CellRendererChannels::render_vfunc_channel(const Cairo::RefPtrset_source_rgb(color.get_red(), color.get_green(), color.get_blue()); - const auto x = background_area.get_x(); - const auto y = background_area.get_y(); - const auto w = background_area.get_width(); - const auto h = background_area.get_height(); - cr->rectangle(x, y, 3, h); - cr->fill(); + AddUnreadIndicator(cr, background_area); } if (unread_state < 1) return; diff --git a/src/discord/discord.cpp b/src/discord/discord.cpp index 817aca8..1f54c7e 100644 --- a/src/discord/discord.cpp +++ b/src/discord/discord.cpp @@ -1317,6 +1317,16 @@ int DiscordClient::GetUnreadStateForChannel(Snowflake id) const noexcept { return iter->second; } +int DiscordClient::GetUnreadChannelsCountForCategory(Snowflake id) const noexcept { + int result = 0; + for (Snowflake channel_id : m_store.GetChannelIDsWithParentID(id)) { + const auto iter = m_unread.find(channel_id); + if (iter == m_unread.end()) continue; + result += 1; + } + return result; +} + bool DiscordClient::GetUnreadStateForGuild(Snowflake id, int &total_mentions) const noexcept { total_mentions = 0; bool has_any_unread = false; diff --git a/src/discord/discord.hpp b/src/discord/discord.hpp index d2435dd..29ac00c 100644 --- a/src/discord/discord.hpp +++ b/src/discord/discord.hpp @@ -214,6 +214,7 @@ public: bool IsChannelMuted(Snowflake id) const noexcept; bool IsGuildMuted(Snowflake id) const noexcept; int GetUnreadStateForChannel(Snowflake id) const noexcept; + int GetUnreadChannelsCountForCategory(Snowflake id) const noexcept; bool GetUnreadStateForGuild(Snowflake id, int &total_mentions) const noexcept; int GetUnreadDMsCount() const; -- cgit v1.2.3 From bdad178c5d6c5d4cdd9cc80fadb7f75e2bc6aa80 Mon Sep 17 00:00:00 2001 From: Jerzy Kozera <120114+jkozera@users.noreply.github.com> Date: Tue, 4 Jul 2023 22:00:22 +0200 Subject: Redraw unread indicator after message status for category changes --- src/components/channels.cpp | 20 ++++++++++++++------ src/components/channels.hpp | 3 ++- 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'src/components') diff --git a/src/components/channels.cpp b/src/components/channels.cpp index 26f3259..9fd4abd 100644 --- a/src/components/channels.cpp +++ b/src/components/channels.cpp @@ -1102,15 +1102,25 @@ void ChannelList::SetDMChannelIcon(Gtk::TreeIter iter, const ChannelData &dm) { } } +void ChannelList::RedrawUnreadIndicatorsForChannel(const ChannelData &channel) { + if (channel.GuildID.has_value()) { + auto iter = GetIteratorForGuildFromID(*channel.GuildID); + if (iter) m_model->row_changed(m_model->get_path(iter), iter); + } + if (channel.ParentID.has_value()) { + auto iter = GetIteratorForRowFromIDOfType(*channel.ParentID, RenderType::Category); + if (iter) m_model->row_changed(m_model->get_path(iter), iter); + } +} + void ChannelList::OnMessageAck(const MessageAckData &data) { // trick renderer into redrawing m_model->row_changed(Gtk::TreeModel::Path("0"), m_model->get_iter("0")); // 0 is always path for dm header auto iter = GetIteratorForRowFromID(data.ChannelID); if (iter) m_model->row_changed(m_model->get_path(iter), iter); auto channel = Abaddon::Get().GetDiscordClient().GetChannel(data.ChannelID); - if (channel.has_value() && channel->GuildID.has_value()) { - iter = GetIteratorForGuildFromID(*channel->GuildID); - if (iter) m_model->row_changed(m_model->get_path(iter), iter); + if (channel.has_value()) { + RedrawUnreadIndicatorsForChannel(*channel); } } @@ -1123,9 +1133,7 @@ void ChannelList::OnMessageCreate(const Message &msg) { if (iter) (*iter)[m_columns.m_sort] = static_cast(-msg.ID); } - if (channel->GuildID.has_value()) - if ((iter = GetIteratorForGuildFromID(*channel->GuildID))) - m_model->row_changed(m_model->get_path(iter), iter); + RedrawUnreadIndicatorsForChannel(*channel); } bool ChannelList::OnButtonPressEvent(GdkEventButton *ev) { diff --git a/src/components/channels.hpp b/src/components/channels.hpp index d561737..9d449e4 100644 --- a/src/components/channels.hpp +++ b/src/components/channels.hpp @@ -116,9 +116,10 @@ protected: void UpdateCreateDMChannel(const ChannelData &channel); void SetDMChannelIcon(Gtk::TreeIter iter, const ChannelData &dm); + void RedrawUnreadIndicatorsForChannel(const ChannelData& channel); void OnMessageAck(const MessageAckData &data); - void OnMessageCreate(const Message &msg); + Gtk::TreeModel::Path m_path_for_menu; // cant be recovered through selection -- cgit v1.2.3 From 52a340e3666e4081b5f284c320404d06ac37b2f3 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Thu, 13 Jul 2023 18:53:47 -0400 Subject: fix attachments and replies breaking when loading message history --- src/components/chatmessage.cpp | 3 +- src/discord/store.cpp | 71 +++++++++++++++++++----------------------- 2 files changed, 34 insertions(+), 40 deletions(-) (limited to 'src/components') diff --git a/src/components/chatmessage.cpp b/src/components/chatmessage.cpp index 4fde039..23ee36f 100644 --- a/src/components/chatmessage.cpp +++ b/src/components/chatmessage.cpp @@ -674,8 +674,9 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data) std::optional> referenced_message = data.ReferencedMessage; if (data.MessageReference.has_value() && data.MessageReference->MessageID.has_value() && !referenced_message.has_value()) { auto refd = discord.GetMessage(*data.MessageReference->MessageID); - if (refd.has_value()) + if (refd.has_value()) { referenced_message = std::make_shared(std::move(*refd)); + } } if (data.Interaction.has_value()) { diff --git a/src/discord/store.cpp b/src/discord/store.cpp index 24b686a..7ee4d87 100644 --- a/src/discord/store.cpp +++ b/src/discord/store.cpp @@ -559,8 +559,9 @@ std::vector Store::GetMessagesBefore(Snowflake channel_id, Snowflake me for (auto &msg : msgs) { if (msg.MessageReference.has_value() && msg.MessageReference->MessageID.has_value()) { auto ref = GetMessage(*msg.MessageReference->MessageID); - if (ref.has_value()) + if (ref.has_value()) { msg.ReferencedMessage = std::make_shared(std::move(*ref)); + } } } @@ -2060,26 +2061,22 @@ bool Store::CreateStatements() { message_interactions.name, message_interactions.type, message_interactions.user_id, - attachments.id, - attachments.filename, - attachments.size, - attachments.url, - attachments.proxy, - attachments.height, - attachments.width, - message_references.message + message_references.message, + message_references.channel, + message_references.guild, + COUNT(attachments.id) FROM messages LEFT OUTER JOIN message_interactions ON messages.id = message_interactions.message_id - LEFT OUTER JOIN - attachments - ON messages.id = attachments.message LEFT OUTER JOIN message_references ON messages.id = message_references.id + LEFT OUTER JOIN + attachments + ON messages.id = attachments.message WHERE channel_id = ? AND pending = 0 AND messages.id < ? ORDER BY id DESC LIMIT ? - ) ORDER BY id ASC + ) WHERE id IS NOT NULL ORDER BY id ASC )"); if (!m_stmt_get_messages_before->OK()) { fprintf(stderr, "failed to prepare get messages before statement: %s\n", m_db.ErrStr()); @@ -2087,32 +2084,28 @@ bool Store::CreateStatements() { } m_stmt_get_pins = std::make_unique(m_db, R"( - SELECT messages.*, - message_interactions.interaction_id, - message_interactions.name, - message_interactions.type, - message_interactions.user_id, - attachments.id, - attachments.filename, - attachments.size, - attachments.url, - attachments.proxy, - attachments.height, - attachments.width, - message_references.message, - message_references.channel, - message_references.guild - FROM messages - LEFT OUTER JOIN - message_interactions - ON messages.id = message_interactions.message_id - LEFT OUTER JOIN - attachments - ON messages.id = attachments.message - LEFT OUTER JOIN - message_references - ON messages.id = message_references.id - WHERE channel_id = ? AND pinned = 1 ORDER BY id ASC + SELECT * FROM ( + SELECT messages.*, + message_interactions.interaction_id, + message_interactions.name, + message_interactions.type, + message_interactions.user_id, + message_references.message, + message_references.channel, + message_references.guild, + COUNT(attachments.id) + FROM messages + LEFT OUTER JOIN + message_interactions + ON messages.id = message_interactions.message_id + LEFT OUTER JOIN + message_references + ON messages.id = message_references.id + LEFT OUTER JOIN + attachments + ON messages.id = attachments.message + WHERE channel_id = ? AND pinned = 1 ORDER BY id ASC + ) WHERE id IS NOT NULL )"); if (!m_stmt_get_pins->OK()) { fprintf(stderr, "failed to prepare get pins statement: %s\n", m_db.ErrStr()); -- cgit v1.2.3 From 00524cefa29e80f0a9a80fd77bb6e1f4da024f65 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sat, 15 Jul 2023 01:02:35 -0400 Subject: make editing inline, add up arrow shortcut --- res/css/main.css | 4 +++ src/abaddon.cpp | 18 +++++-------- src/components/chatinput.cpp | 10 ++++++++ src/components/chatinput.hpp | 3 +++ src/components/chatlist.cpp | 17 +++++++++++++ src/components/chatlist.hpp | 1 + src/components/chatwindow.cpp | 55 ++++++++++++++++++++++++++++++++++------ src/components/chatwindow.hpp | 7 +++++ src/dialogs/editmessage.cpp | 45 -------------------------------- src/dialogs/editmessage.hpp | 20 --------------- src/discord/chatsubmitparams.hpp | 1 + src/windows/mainwindow.cpp | 4 +++ src/windows/mainwindow.hpp | 1 + 13 files changed, 102 insertions(+), 84 deletions(-) delete mode 100644 src/dialogs/editmessage.cpp delete mode 100644 src/dialogs/editmessage.hpp (limited to 'src/components') diff --git a/res/css/main.css b/res/css/main.css index 1b70301..b84b502 100644 --- a/res/css/main.css +++ b/res/css/main.css @@ -114,6 +114,10 @@ border: 1px solid #026FB9; } +.message-input.editing { + border: 1px solid #b9026f; +} + .message-input.bad-input { border: 1px solid #dd3300; } diff --git a/src/abaddon.cpp b/src/abaddon.cpp index 921549b..2be54ba 100644 --- a/src/abaddon.cpp +++ b/src/abaddon.cpp @@ -8,7 +8,6 @@ #include "audio/manager.hpp" #include "discord/discord.hpp" #include "dialogs/token.hpp" -#include "dialogs/editmessage.hpp" #include "dialogs/confirm.hpp" #include "dialogs/setstatus.hpp" #include "dialogs/friendpicker.hpp" @@ -948,19 +947,15 @@ void Abaddon::ActionChatInputSubmit(ChatSubmitParams data) { if (!m_discord.HasChannelPermission(m_discord.GetUserData().ID, data.ChannelID, Permission::VIEW_CHANNEL)) return; - m_discord.SendChatMessage(data, NOOP_CALLBACK); + if (data.EditingID.IsValid()) { + m_discord.EditMessage(data.ChannelID, data.EditingID, data.Message); + } else { + m_discord.SendChatMessage(data, NOOP_CALLBACK); + } } void Abaddon::ActionChatEditMessage(Snowflake channel_id, Snowflake id) { - const auto msg = m_discord.GetMessage(id); - if (!msg.has_value()) return; - EditMessageDialog dlg(*m_main_window); - dlg.SetContent(msg->Content); - auto response = dlg.run(); - if (response == Gtk::RESPONSE_OK) { - auto new_content = dlg.GetContent(); - m_discord.EditMessage(channel_id, id, new_content); - } + m_main_window->EditMessage(id); } void Abaddon::ActionInsertMention(Snowflake id) { @@ -1156,6 +1151,7 @@ int main(int argc, char **argv) { #endif spdlog::cfg::load_env_levels(); + auto log_ui = spdlog::stdout_color_mt("ui"); auto log_audio = spdlog::stdout_color_mt("audio"); auto log_voice = spdlog::stdout_color_mt("voice"); auto log_discord = spdlog::stdout_color_mt("discord"); diff --git a/src/components/chatinput.cpp b/src/components/chatinput.cpp index 28ed1ea..8ad0c3f 100644 --- a/src/components/chatinput.cpp +++ b/src/components/chatinput.cpp @@ -565,6 +565,16 @@ void ChatInput::StopReplying() { m_input.Get().get_style_context()->remove_class("replying"); } +void ChatInput::StartEditing(const Message &message) { + m_input.Get().grab_focus(); + m_input.Get().get_style_context()->add_class("editing"); + GetBuffer()->set_text(message.Content); +} + +void ChatInput::StopEditing() { + m_input.Get().get_style_context()->remove_class("editing"); +} + bool ChatInput::AddFileAsImageAttachment(const Glib::RefPtr &file) { try { const auto read_stream = file->read(); diff --git a/src/components/chatinput.hpp b/src/components/chatinput.hpp index bc6a45d..a7ee27f 100644 --- a/src/components/chatinput.hpp +++ b/src/components/chatinput.hpp @@ -139,6 +139,9 @@ public: void StartReplying(); void StopReplying(); + void StartEditing(const Message &message); + void StopEditing(); + private: bool AddFileAsImageAttachment(const Glib::RefPtr &file); bool CanAttachFiles(); diff --git a/src/components/chatlist.cpp b/src/components/chatlist.cpp index 93fb46f..28981b2 100644 --- a/src/components/chatlist.cpp +++ b/src/components/chatlist.cpp @@ -253,6 +253,23 @@ void ChatList::ActuallyRemoveMessage(Snowflake id) { RemoveMessageAndHeader(it->second); } +std::optional ChatList::GetLastSentMessage() { + const auto &discord = Abaddon::Get().GetDiscordClient(); + const auto self_id = discord.GetUserData().ID; + + std::map ordered(m_id_to_widget.begin(), m_id_to_widget.end()); + + for (auto it = ordered.crbegin(); it != ordered.crend(); it++) { + const auto *widget = dynamic_cast(it->second); + if (widget == nullptr) continue; + const auto msg = discord.GetMessage(widget->ID); + if (!msg.has_value()) continue; + if (msg->Author.ID == self_id) return msg->ID; + } + + return std::nullopt; +} + void ChatList::SetupMenu() { m_menu_copy_id = Gtk::manage(new Gtk::MenuItem("Copy ID")); m_menu_copy_id->signal_activate().connect([this] { diff --git a/src/components/chatlist.hpp b/src/components/chatlist.hpp index 0248d7f..5d4ec4a 100644 --- a/src/components/chatlist.hpp +++ b/src/components/chatlist.hpp @@ -23,6 +23,7 @@ public: void SetSeparateAll(bool separate); void SetUsePinnedMenu(); // i think i need a better way to do menus void ActuallyRemoveMessage(Snowflake id); // perhaps not the best method name + std::optional GetLastSentMessage(); private: void SetupMenu(); diff --git a/src/components/chatwindow.cpp b/src/components/chatwindow.cpp index e51d491..864d0c9 100644 --- a/src/components/chatwindow.cpp +++ b/src/components/chatwindow.cpp @@ -50,8 +50,8 @@ ChatWindow::ChatWindow() { m_input->signal_submit().connect(sigc::mem_fun(*this, &ChatWindow::OnInputSubmit)); m_input->signal_escape().connect([this]() { - if (m_is_replying) - StopReplying(); + if (m_is_replying) StopReplying(); + if (m_is_editing) StopEditing(); }); m_input->signal_key_press_event().connect(sigc::mem_fun(*this, &ChatWindow::OnKeyPressEvent), false); m_input->show(); @@ -132,8 +132,8 @@ void ChatWindow::SetActiveChannel(Snowflake id) { m_input->SetActiveChannel(id); m_input_indicator->SetActiveChannel(id); m_rate_limit_indicator->SetActiveChannel(id); - if (m_is_replying) - StopReplying(); + if (m_is_replying) StopReplying(); + if (m_is_editing) StopEditing(); #ifdef WITH_LIBHANDY m_tab_switcher->ReplaceActiveTab(id); @@ -274,15 +274,31 @@ bool ChatWindow::OnInputSubmit(ChatSubmitParams data) { data.ChannelID = m_active_channel; data.InReplyToID = m_replying_to; + data.EditingID = m_editing_id; if (m_active_channel.IsValid()) m_signal_action_chat_submit.emit(data); // m_replying_to is checked for invalid in the handler - if (m_is_replying) - StopReplying(); + + if (m_is_replying) StopReplying(); + if (m_is_editing) StopEditing(); return true; } +bool ChatWindow::ProcessKeyEvent(GdkEventKey *e) { + if (e->type != GDK_KEY_PRESS) return false; + if (e->keyval == GDK_KEY_Up) { + const auto edit_id = m_chat->GetLastSentMessage(); + if (edit_id.has_value()) { + StartEditing(*edit_id); + } + + return true; + } + + return false; +} + bool ChatWindow::OnKeyPressEvent(GdkEventKey *e) { if (m_completer.ProcessKeyPress(e)) return true; @@ -290,6 +306,9 @@ bool ChatWindow::OnKeyPressEvent(GdkEventKey *e) { if (m_input->ProcessKeyPress(e)) return true; + if (ProcessKeyEvent(e)) + return true; + return false; } @@ -300,10 +319,11 @@ void ChatWindow::StartReplying(Snowflake message_id) { m_replying_to = message_id; m_is_replying = true; m_input->StartReplying(); - if (author.has_value()) + if (author.has_value()) { m_input_indicator->SetCustomMarkup("Replying to " + author->GetUsernameEscapedBold()); - else + } else { m_input_indicator->SetCustomMarkup("Replying..."); + } } void ChatWindow::StopReplying() { @@ -313,6 +333,25 @@ void ChatWindow::StopReplying() { m_input_indicator->ClearCustom(); } +void ChatWindow::StartEditing(Snowflake message_id) { + const auto message = Abaddon::Get().GetDiscordClient().GetMessage(message_id); + if (!message.has_value()) { + spdlog::get("ui")->warn("ChatWindow::StartEditing message is nullopt"); + return; + } + m_is_editing = true; + m_editing_id = message_id; + m_input->StartEditing(*message); + m_input_indicator->SetCustomMarkup("Editing..."); +} + +void ChatWindow::StopEditing() { + m_is_editing = false; + m_editing_id = Snowflake::Invalid; + m_input->StopEditing(); + m_input_indicator->ClearCustom(); +} + void ChatWindow::OnScrollEdgeOvershot(Gtk::PositionType pos) { if (pos == Gtk::POS_TOP) m_signal_action_chat_load_history.emit(m_active_channel); diff --git a/src/components/chatwindow.hpp b/src/components/chatwindow.hpp index e1bb57a..b3c9d41 100644 --- a/src/components/chatwindow.hpp +++ b/src/components/chatwindow.hpp @@ -37,6 +37,9 @@ public: void SetTopic(const std::string &text); void AddAttachment(const Glib::RefPtr &file); + void StartEditing(Snowflake message_id); + void StopEditing(); + #ifdef WITH_LIBHANDY void OpenNewTab(Snowflake id); TabsState GetTabsState(); @@ -55,10 +58,14 @@ protected: void StartReplying(Snowflake message_id); void StopReplying(); + bool m_is_editing = false; + Snowflake m_editing_id; + Snowflake m_active_channel; bool OnInputSubmit(ChatSubmitParams data); + bool ProcessKeyEvent(GdkEventKey *e); bool OnKeyPressEvent(GdkEventKey *e); void OnScrollEdgeOvershot(Gtk::PositionType pos); diff --git a/src/dialogs/editmessage.cpp b/src/dialogs/editmessage.cpp deleted file mode 100644 index b4308a0..0000000 --- a/src/dialogs/editmessage.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "editmessage.hpp" - -EditMessageDialog::EditMessageDialog(Gtk::Window &parent) - : Gtk::Dialog("Edit Message", parent, true) - , m_layout(Gtk::ORIENTATION_VERTICAL) - , m_ok("OK") - , m_cancel("Cancel") - , m_bbox(Gtk::ORIENTATION_HORIZONTAL) { - set_default_size(300, 50); - get_style_context()->add_class("app-window"); - get_style_context()->add_class("app-popup"); - - m_ok.signal_clicked().connect([&]() { - m_content = m_text.get_buffer()->get_text(); - response(Gtk::RESPONSE_OK); - }); - - m_cancel.signal_clicked().connect([&]() { - response(Gtk::RESPONSE_CANCEL); - }); - - m_bbox.pack_start(m_ok, Gtk::PACK_SHRINK); - m_bbox.pack_start(m_cancel, Gtk::PACK_SHRINK); - m_bbox.set_layout(Gtk::BUTTONBOX_END); - - m_text.set_hexpand(true); - - m_scroll.set_hexpand(true); - m_scroll.set_vexpand(true); - m_scroll.add(m_text); - - m_layout.add(m_scroll); - m_layout.add(m_bbox); - get_content_area()->add(m_layout); - - show_all_children(); -} - -Glib::ustring EditMessageDialog::GetContent() { - return m_content; -} - -void EditMessageDialog::SetContent(const Glib::ustring &str) { - m_text.get_buffer()->set_text(str); -} diff --git a/src/dialogs/editmessage.hpp b/src/dialogs/editmessage.hpp deleted file mode 100644 index 38ebedb..0000000 --- a/src/dialogs/editmessage.hpp +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once -#include - -class EditMessageDialog : public Gtk::Dialog { -public: - EditMessageDialog(Gtk::Window &parent); - Glib::ustring GetContent(); - void SetContent(const Glib::ustring &str); - -protected: - Gtk::Box m_layout; - Gtk::Button m_ok; - Gtk::Button m_cancel; - Gtk::ButtonBox m_bbox; - Gtk::ScrolledWindow m_scroll; - Gtk::TextView m_text; - -private: - Glib::ustring m_content; -}; diff --git a/src/discord/chatsubmitparams.hpp b/src/discord/chatsubmitparams.hpp index 24c6f50..e195189 100644 --- a/src/discord/chatsubmitparams.hpp +++ b/src/discord/chatsubmitparams.hpp @@ -20,6 +20,7 @@ struct ChatSubmitParams { bool Silent = false; Snowflake ChannelID; Snowflake InReplyToID; + Snowflake EditingID; Glib::ustring Message; std::vector Attachments; }; diff --git a/src/windows/mainwindow.cpp b/src/windows/mainwindow.cpp index 0b21567..8e030ed 100644 --- a/src/windows/mainwindow.cpp +++ b/src/windows/mainwindow.cpp @@ -168,6 +168,10 @@ void MainWindow::ToggleMenuVisibility() { m_menu_bar.set_visible(!m_menu_bar.get_visible()); } +void MainWindow::EditMessage(Snowflake message_id) { + m_chat.StartEditing(message_id); +} + #ifdef WITH_LIBHANDY void MainWindow::GoBack() { m_chat.GoBack(); diff --git a/src/windows/mainwindow.hpp b/src/windows/mainwindow.hpp index 604043c..ce2e636 100644 --- a/src/windows/mainwindow.hpp +++ b/src/windows/mainwindow.hpp @@ -29,6 +29,7 @@ public: void UpdateChatReactionRemove(Snowflake id, const Glib::ustring ¶m); void UpdateMenus(); void ToggleMenuVisibility(); + void EditMessage(Snowflake message_id); #ifdef WITH_LIBHANDY void GoBack(); -- cgit v1.2.3 From f941ad1befc0049bb2c4be08cf76df0c09dc1016 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sat, 15 Jul 2023 15:49:35 -0400 Subject: clear input when exiting editing --- src/components/chatinput.cpp | 4 ++++ src/components/chatinput.hpp | 1 + src/components/chatwindow.cpp | 1 + 3 files changed, 6 insertions(+) (limited to 'src/components') diff --git a/src/components/chatinput.cpp b/src/components/chatinput.cpp index 8ad0c3f..c88de49 100644 --- a/src/components/chatinput.cpp +++ b/src/components/chatinput.cpp @@ -497,6 +497,10 @@ void ChatInput::InsertText(const Glib::ustring &text) { m_input.Get().InsertText(text); } +void ChatInput::Clear() { + GetBuffer()->set_text(""); +} + Glib::RefPtr ChatInput::GetBuffer() { return m_input.Get().GetBuffer(); } diff --git a/src/components/chatinput.hpp b/src/components/chatinput.hpp index a7ee27f..c98d935 100644 --- a/src/components/chatinput.hpp +++ b/src/components/chatinput.hpp @@ -129,6 +129,7 @@ public: ChatInput(); void InsertText(const Glib::ustring &text); + void Clear(); Glib::RefPtr GetBuffer(); bool ProcessKeyPress(GdkEventKey *event); void AddAttachment(const Glib::RefPtr &file); diff --git a/src/components/chatwindow.cpp b/src/components/chatwindow.cpp index 864d0c9..dcff656 100644 --- a/src/components/chatwindow.cpp +++ b/src/components/chatwindow.cpp @@ -349,6 +349,7 @@ void ChatWindow::StopEditing() { m_is_editing = false; m_editing_id = Snowflake::Invalid; m_input->StopEditing(); + m_input->Clear(); m_input_indicator->ClearCustom(); } -- cgit v1.2.3 From 03e617a146666ad95f8cf9ff144f1cec4ae4c6cd Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sat, 15 Jul 2023 16:03:33 -0400 Subject: only start editing if input is empty --- src/components/chatinput.cpp | 4 ++++ src/components/chatinput.hpp | 2 ++ src/components/chatwindow.cpp | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/components') diff --git a/src/components/chatinput.cpp b/src/components/chatinput.cpp index c88de49..f53c6fe 100644 --- a/src/components/chatinput.cpp +++ b/src/components/chatinput.cpp @@ -579,6 +579,10 @@ void ChatInput::StopEditing() { m_input.Get().get_style_context()->remove_class("editing"); } +bool ChatInput::IsEmpty() { + return GetBuffer()->get_char_count() == 0; +} + bool ChatInput::AddFileAsImageAttachment(const Glib::RefPtr &file) { try { const auto read_stream = file->read(); diff --git a/src/components/chatinput.hpp b/src/components/chatinput.hpp index c98d935..393a9aa 100644 --- a/src/components/chatinput.hpp +++ b/src/components/chatinput.hpp @@ -143,6 +143,8 @@ public: void StartEditing(const Message &message); void StopEditing(); + bool IsEmpty(); + private: bool AddFileAsImageAttachment(const Glib::RefPtr &file); bool CanAttachFiles(); diff --git a/src/components/chatwindow.cpp b/src/components/chatwindow.cpp index dcff656..17f5601 100644 --- a/src/components/chatwindow.cpp +++ b/src/components/chatwindow.cpp @@ -287,7 +287,7 @@ bool ChatWindow::OnInputSubmit(ChatSubmitParams data) { bool ChatWindow::ProcessKeyEvent(GdkEventKey *e) { if (e->type != GDK_KEY_PRESS) return false; - if (e->keyval == GDK_KEY_Up) { + if (e->keyval == GDK_KEY_Up && !(e->state & GDK_SHIFT_MASK) && m_input->IsEmpty()) { const auto edit_id = m_chat->GetLastSentMessage(); if (edit_id.has_value()) { StartEditing(*edit_id); -- cgit v1.2.3 From add48af094ec9111727862d3f2ee1916474a2471 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sat, 15 Jul 2023 17:18:04 -0400 Subject: restrict attachments when editing --- src/components/chatinput.cpp | 6 +++++- src/components/chatinput.hpp | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/components') diff --git a/src/components/chatinput.cpp b/src/components/chatinput.cpp index f53c6fe..1133302 100644 --- a/src/components/chatinput.cpp +++ b/src/components/chatinput.cpp @@ -570,12 +570,16 @@ void ChatInput::StopReplying() { } void ChatInput::StartEditing(const Message &message) { + m_is_editing = true; m_input.Get().grab_focus(); m_input.Get().get_style_context()->add_class("editing"); GetBuffer()->set_text(message.Content); + m_attachments.Clear(); + m_attachments_revealer.set_reveal_child(false); } void ChatInput::StopEditing() { + m_is_editing = false; m_input.Get().get_style_context()->remove_class("editing"); } @@ -595,7 +599,7 @@ bool ChatInput::AddFileAsImageAttachment(const Glib::RefPtr &file) { } bool ChatInput::CanAttachFiles() { - return Abaddon::Get().GetDiscordClient().HasSelfChannelPermission(m_active_channel, Permission::ATTACH_FILES | Permission::SEND_MESSAGES); + return !m_is_editing && Abaddon::Get().GetDiscordClient().HasSelfChannelPermission(m_active_channel, Permission::ATTACH_FILES | Permission::SEND_MESSAGES); } ChatInput::type_signal_submit ChatInput::signal_submit() { diff --git a/src/components/chatinput.hpp b/src/components/chatinput.hpp index 393a9aa..a3c9742 100644 --- a/src/components/chatinput.hpp +++ b/src/components/chatinput.hpp @@ -155,6 +155,8 @@ private: Snowflake m_active_channel; + bool m_is_editing = false; + public: using type_signal_submit = sigc::signal; using type_signal_escape = sigc::signal; -- cgit v1.2.3 From 52b52eb489caa64e6cea978f2c6917a55fa70979 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sat, 15 Jul 2023 21:14:39 -0400 Subject: check if message is editable --- src/components/chatlist.cpp | 13 +++++++------ src/components/chatlist.hpp | 2 +- src/components/chatwindow.cpp | 2 +- src/discord/message.cpp | 4 ++++ src/discord/message.hpp | 10 ++++++---- 5 files changed, 19 insertions(+), 12 deletions(-) (limited to 'src/components') diff --git a/src/components/chatlist.cpp b/src/components/chatlist.cpp index 28981b2..ba18c0a 100644 --- a/src/components/chatlist.cpp +++ b/src/components/chatlist.cpp @@ -133,10 +133,9 @@ void ChatList::ProcessNewMessage(const Message &data, bool prepend) { m_menu_delete_message->set_sensitive(false); m_menu_edit_message->set_sensitive(false); } else { - const bool can_edit = client.GetUserData().ID == data->Author.ID; - const bool can_delete = can_edit || has_manage; + const bool can_delete = (client.GetUserData().ID == data->Author.ID) || has_manage; m_menu_delete_message->set_sensitive(can_delete); - m_menu_edit_message->set_sensitive(can_edit); + m_menu_edit_message->set_sensitive(data->IsEditable()); } m_menu.popup_at_pointer(reinterpret_cast(ev)); @@ -253,18 +252,20 @@ void ChatList::ActuallyRemoveMessage(Snowflake id) { RemoveMessageAndHeader(it->second); } -std::optional ChatList::GetLastSentMessage() { +std::optional ChatList::GetLastSentEditableMessage() { const auto &discord = Abaddon::Get().GetDiscordClient(); const auto self_id = discord.GetUserData().ID; std::map ordered(m_id_to_widget.begin(), m_id_to_widget.end()); for (auto it = ordered.crbegin(); it != ordered.crend(); it++) { - const auto *widget = dynamic_cast(it->second); + const auto *widget = dynamic_cast(it->second); if (widget == nullptr) continue; const auto msg = discord.GetMessage(widget->ID); if (!msg.has_value()) continue; - if (msg->Author.ID == self_id) return msg->ID; + if (msg->Author.ID != self_id) continue; + if (!msg->IsEditable()) continue; + return msg->ID; } return std::nullopt; diff --git a/src/components/chatlist.hpp b/src/components/chatlist.hpp index 5d4ec4a..9f12df9 100644 --- a/src/components/chatlist.hpp +++ b/src/components/chatlist.hpp @@ -23,7 +23,7 @@ public: void SetSeparateAll(bool separate); void SetUsePinnedMenu(); // i think i need a better way to do menus void ActuallyRemoveMessage(Snowflake id); // perhaps not the best method name - std::optional GetLastSentMessage(); + std::optional GetLastSentEditableMessage(); private: void SetupMenu(); diff --git a/src/components/chatwindow.cpp b/src/components/chatwindow.cpp index 17f5601..aeed4ed 100644 --- a/src/components/chatwindow.cpp +++ b/src/components/chatwindow.cpp @@ -288,7 +288,7 @@ bool ChatWindow::OnInputSubmit(ChatSubmitParams data) { bool ChatWindow::ProcessKeyEvent(GdkEventKey *e) { if (e->type != GDK_KEY_PRESS) return false; if (e->keyval == GDK_KEY_Up && !(e->state & GDK_SHIFT_MASK) && m_input->IsEmpty()) { - const auto edit_id = m_chat->GetLastSentMessage(); + const auto edit_id = m_chat->GetLastSentEditableMessage(); if (edit_id.has_value()) { StartEditing(*edit_id); } diff --git a/src/discord/message.cpp b/src/discord/message.cpp index f5d8ad8..9adc7e6 100644 --- a/src/discord/message.cpp +++ b/src/discord/message.cpp @@ -265,6 +265,10 @@ bool Message::IsEdited() const { return m_edited; } +bool Message::IsEditable() const noexcept { + return (Abaddon::Get().GetDiscordClient().GetUserData().ID == Author.ID) && !IsDeleted() && !IsPending && (Type == MessageType::DEFAULT || Type == MessageType::INLINE_REPLY); +} + bool Message::DoesMentionEveryoneOrUser(Snowflake id) const noexcept { if (DoesMentionEveryone) return true; return std::any_of(Mentions.begin(), Mentions.end(), [id](const UserData &user) { diff --git a/src/discord/message.hpp b/src/discord/message.hpp index 5028104..fb11604 100644 --- a/src/discord/message.hpp +++ b/src/discord/message.hpp @@ -219,11 +219,13 @@ struct Message { void SetDeleted(); void SetEdited(); - [[nodiscard]] bool IsDeleted() const; - [[nodiscard]] bool IsEdited() const; + bool IsDeleted() const; + bool IsEdited() const; - [[nodiscard]] bool DoesMentionEveryoneOrUser(Snowflake id) const noexcept; - [[nodiscard]] bool DoesMention(Snowflake id) const noexcept; + bool IsEditable() const noexcept; + + bool DoesMentionEveryoneOrUser(Snowflake id) const noexcept; + bool DoesMention(Snowflake id) const noexcept; private: bool m_deleted = false; -- cgit v1.2.3