summaryrefslogtreecommitdiff
path: root/discord
diff options
context:
space:
mode:
authorouwou <26526779+ouwou@users.noreply.github.com>2021-02-27 17:16:48 -0500
committerouwou <26526779+ouwou@users.noreply.github.com>2021-02-27 17:16:48 -0500
commite924394f9867e01267cce6c53129bef02b2ca404 (patch)
treec44c6d9a0f9303eecda796340e1e35fda6c59b0d /discord
parentc69ebaf35714febf50839e94b126eccfd236d3e4 (diff)
downloadabaddon-portaudio-e924394f9867e01267cce6c53129bef02b2ca404.tar.gz
abaddon-portaudio-e924394f9867e01267cce6c53129bef02b2ca404.zip
fix DiscordClient::GetMemberHighestRole
Diffstat (limited to 'discord')
-rw-r--r--discord/discord.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/discord/discord.cpp b/discord/discord.cpp
index b0d79e0..c688895 100644
--- a/discord/discord.cpp
+++ b/discord/discord.cpp
@@ -234,11 +234,8 @@ Snowflake DiscordClient::GetMemberHighestRole(Snowflake guild_id, Snowflake user
if (data->Roles.size() == 0) return Snowflake::Invalid;
if (data->Roles.size() == 1) return data->Roles[0];
- return *std::max(data->Roles.begin(), data->Roles.end(), [this](const auto &a, const auto &b) -> bool {
- const auto role_a = GetRole(*a);
- const auto role_b = GetRole(*b);
- if (!role_a.has_value() || !role_b.has_value()) return false; // for some reason a Snowflake(0) sneaks into here
- return role_a->Position < role_b->Position;
+ return *std::max_element(data->Roles.begin(), data->Roles.end(), [this](const auto &a, const auto &b) -> bool {
+ return GetRole(a)->Position < GetRole(b)->Position;
});
}