diff options
author | ouwou <26526779+ouwou@users.noreply.github.com> | 2020-11-01 17:15:34 -0500 |
---|---|---|
committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2020-11-01 17:15:34 -0500 |
commit | 8efa2024582b0a2aeda72f3e6865a4562717eabc (patch) | |
tree | 7629c0502bd06a377513424e9ddf7b068e3e43eb | |
parent | 77b187bd643fcf05f77a1a2524a9aadc8a4c2e03 (diff) | |
download | abaddon-portaudio-8efa2024582b0a2aeda72f3e6865a4562717eabc.tar.gz abaddon-portaudio-8efa2024582b0a2aeda72f3e6865a4562717eabc.zip |
show news channels
-rw-r--r-- | abaddon.cpp | 2 | ||||
-rw-r--r-- | components/channels.cpp | 4 | ||||
-rw-r--r-- | discord/guild.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/abaddon.cpp b/abaddon.cpp index eea68ce..4ac1780 100644 --- a/abaddon.cpp +++ b/abaddon.cpp @@ -264,7 +264,7 @@ void Abaddon::ActionChannelOpened(Snowflake id) { if (channel->Type != ChannelType::DM && channel->Type != ChannelType::GROUP_DM) m_discord.SendLazyLoad(id); - if (channel->Type == ChannelType::GUILD_TEXT) + if (channel->Type == ChannelType::GUILD_TEXT || channel->Type == ChannelType::GUILD_NEWS) m_main_window->set_title(std::string(APP_TITLE) + " - #" + channel->Name); else { std::string display; diff --git a/components/channels.cpp b/components/channels.cpp index a8f2f66..629ca28 100644 --- a/components/channels.cpp +++ b/components/channels.cpp @@ -369,7 +369,7 @@ void ChannelList::UpdateCreateChannel(Snowflake id) { } ChannelListRow *row; - if (data->Type == ChannelType::GUILD_TEXT) { + if (data->Type == ChannelType::GUILD_TEXT || data->Type == ChannelType::GUILD_NEWS) { row = Gtk::manage(new ChannelListRowChannel(data)); } else if (data->Type == ChannelType::GUILD_CATEGORY) { row = Gtk::manage(new ChannelListRowCategory(data)); @@ -478,7 +478,7 @@ void ChannelList::InsertGuildAt(Snowflake id, int pos) { std::map<int, const Channel *> orphan_channels; std::unordered_map<Snowflake, std::vector<const Channel *>> cat_to_channels; for (const auto &channel : guild_data->Channels) { - if (channel.Type != ChannelType::GUILD_TEXT) continue; + if (channel.Type != ChannelType::GUILD_TEXT && channel.Type != ChannelType::GUILD_NEWS) continue; if (channel.ParentID.IsValid()) cat_to_channels[channel.ParentID].push_back(&channel); diff --git a/discord/guild.cpp b/discord/guild.cpp index eaaedc8..94268d8 100644 --- a/discord/guild.cpp +++ b/discord/guild.cpp @@ -134,9 +134,9 @@ std::vector<Snowflake> Guild::GetSortedChannels(Snowflake ignore) const { for (const auto &channel_id : channels) { const auto *data = discord.GetChannel(channel_id); if (data == nullptr) continue; - if (!data->ParentID.IsValid() && data->Type == ChannelType::GUILD_TEXT) + if (!data->ParentID.IsValid() && (data->Type == ChannelType::GUILD_TEXT || data->Type == ChannelType::GUILD_NEWS)) orphan_channels[data->Position].push_back(data); - else if (data->ParentID.IsValid() && data->Type == ChannelType::GUILD_TEXT) + else if (data->ParentID.IsValid() && (data->Type == ChannelType::GUILD_TEXT || data->Type == ChannelType::GUILD_NEWS)) category_to_channels[data->ParentID].push_back(data); else if (data->Type == ChannelType::GUILD_CATEGORY) position_to_categories[data->Position].push_back(data); |