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

fix categories of same positions not being shown

Browse Source
This commit is contained in:
ouwou
2020-09-14 03:26:46 -04:00
parent e5a90b9461
commit f0ca473f6a
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/channels.cpp
View File

@@ -301,19 +301,21 @@ void ChannelList::SetListingFromGuildsInternal() {
}
}
std::map<int, const Channel *> sorted_categories;
std::map<int, std::vector<const Channel *>> sorted_categories;
for (const auto &channel : guild.Channels) {
if (channel.Type == ChannelType::GUILD_CATEGORY) {
assert(channel.Position != -1);
sorted_categories[channel.Position] = &channel;
sorted_categories[channel.Position].push_back(&channel);
}
}
for (const auto &[pos, channel] : sorted_categories) {
if (channel->Type == ChannelType::GUILD_CATEGORY) {
auto category_row = add_category(channel->ID, *channel);
info.Children.insert(category_row);
for (auto &[pos, channelvec] : sorted_categories) {
std::sort(channelvec.begin(), channelvec.end(), [](const Channel *a, const Channel *b) { return a->ID < b->ID; });
for (const auto channel : channelvec) {
if (channel->Type == ChannelType::GUILD_CATEGORY) {
auto category_row = add_category(channel->ID, *channel);
info.Children.insert(category_row);
}
}
}