celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-13 20:18:50 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug moment

Browse Source
This commit is contained in:
ouwou
2020-09-05 01:04:28 -04:00
parent 8941d5f204
commit aa288d27f6
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
abaddon.cpp
View File

@@ -177,7 +177,9 @@ void Abaddon::ActionCopyGuildID(Snowflake id) {
void Abaddon::ActionListChannelItemClick(Snowflake id) {
auto *channel = m_discord.GetChannel(id);
m_discord.SendLazyLoad(id);
if (channel->Type != ChannelType::DM && channel->Type != ChannelType::GROUP_DM)
m_discord.SendLazyLoad(id);
if (channel->Type == ChannelType::GUILD_TEXT)
m_main_window->set_title(std::string(APP_TITLE) + " - #" + channel->Name);
else {

7
components/memberlist.cpp
View File

@@ -40,7 +40,7 @@ void MemberList::UpdateMemberListInternal() {
auto &discord = m_abaddon->GetDiscordClient();
auto *chan = discord.GetChannel(m_chan_id);
std::unordered_set<Snowflake> ids;
if (chan->Type == ChannelType::DM) {
if (chan->Type == ChannelType::DM || chan->Type == ChannelType::GROUP_DM) {
for (const auto &user : chan->Recipients)
ids.insert(user.ID);
} else {
@@ -53,7 +53,10 @@ void MemberList::UpdateMemberListInternal() {
auto *label = Gtk::manage(new Gtk::Label);
label->set_single_line_mode(true);
label->set_ellipsize(Pango::ELLIPSIZE_END);
label->set_text(user->Username + "#" + user->Discriminator);
if (user == nullptr)
label->set_text("[unknown user]");
else
label->set_text(user->Username + "#" + user->Discriminator);
label->set_halign(Gtk::ALIGN_START);
row->add(*label);
row->show_all();