diff options
Diffstat (limited to 'discord')
| -rw-r--r-- | discord/discord.cpp | 10 | ||||
| -rw-r--r-- | discord/discord.hpp | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/discord/discord.cpp b/discord/discord.cpp index ecfd0a3..acb98aa 100644 --- a/discord/discord.cpp +++ b/discord/discord.cpp @@ -330,13 +330,11 @@ Permission DiscordClient::ComputeOverwrites(Permission base, Snowflake member_id return perms; } -bool DiscordClient::CanManageMember(Snowflake channel_id, Snowflake actor, Snowflake target) const { - const auto *channel = GetChannel(channel_id); - if (channel == nullptr) return false; - const auto *guild = GetGuild(channel->GuildID); +bool DiscordClient::CanManageMember(Snowflake guild_id, Snowflake actor, Snowflake target) const { + const auto *guild = GetGuild(guild_id); if (guild != nullptr && guild->OwnerID == target) return false; - const auto actor_highest_id = GetMemberHighestRole(channel->GuildID, actor); - const auto target_highest_id = GetMemberHighestRole(channel->GuildID, target); + const auto actor_highest_id = GetMemberHighestRole(guild_id, actor); + const auto target_highest_id = GetMemberHighestRole(guild_id, target); const auto *actor_highest = GetRole(actor_highest_id); const auto *target_highest = GetRole(target_highest_id); if (actor_highest == nullptr) return false; diff --git a/discord/discord.hpp b/discord/discord.hpp index de0ef27..0ab1529 100644 --- a/discord/discord.hpp +++ b/discord/discord.hpp @@ -93,7 +93,7 @@ public: bool HasChannelPermission(Snowflake user_id, Snowflake channel_id, Permission perm) const; Permission ComputePermissions(Snowflake member_id, Snowflake guild_id) const; Permission ComputeOverwrites(Permission base, Snowflake member_id, Snowflake channel_id) const; - bool CanManageMember(Snowflake channel_id, Snowflake actor, Snowflake target) const; // kick, ban, edit nickname (cant think of a better name) + bool CanManageMember(Snowflake guild_id, Snowflake actor, Snowflake target) const; // kick, ban, edit nickname (cant think of a better name) void SendChatMessage(std::string content, Snowflake channel); void DeleteMessage(Snowflake channel_id, Snowflake id); |