diff options
| author | ouwou <26526779+ouwou@users.noreply.github.com> | 2021-04-15 02:35:36 -0400 |
|---|---|---|
| committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2021-04-15 02:35:36 -0400 |
| commit | cd8cd97c9b1fb297f4bf455135d0e0e690358c53 (patch) | |
| tree | 1ae78c800072bb8154596566b1898ba232e9422c /discord/discord.hpp | |
| parent | 0aaebf9ea77eede8a347aa71b95e86686d04a854 (diff) | |
| parent | f5df43194e19be7995d753c5e9dd0a5a9365f24a (diff) | |
| download | abaddon-portaudio-cd8cd97c9b1fb297f4bf455135d0e0e690358c53.tar.gz abaddon-portaudio-cd8cd97c9b1fb297f4bf455135d0e0e690358c53.zip | |
Merge branch 'slowmode'
Diffstat (limited to 'discord/discord.hpp')
| -rw-r--r-- | discord/discord.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/discord/discord.hpp b/discord/discord.hpp index e39c49f..0234014 100644 --- a/discord/discord.hpp +++ b/discord/discord.hpp @@ -94,6 +94,8 @@ public: std::unordered_set<Snowflake> GetChannelsInGuild(Snowflake id) const; bool HasGuildPermission(Snowflake user_id, Snowflake guild_id, Permission perm) const; + + bool HasAnyChannelPermission(Snowflake user_id, Snowflake channel_id, Permission perm) const; 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; @@ -312,8 +314,8 @@ public: typedef sigc::signal<void, GuildJoinRequestUpdateData> type_signal_guild_join_request_update; typedef sigc::signal<void, GuildJoinRequestDeleteData> type_signal_guild_join_request_delete; typedef sigc::signal<void, Message> type_signal_message_sent; - typedef sigc::signal<void, std::string> type_signal_message_send_fail; - typedef sigc::signal<void, bool, GatewayCloseCode> type_signal_disconnected; // bool true if reconnecting + typedef sigc::signal<void, std::string /* nonce */, float /* retry_after */> type_signal_message_send_fail; // retry after param will be 0 if it failed for a reason that isnt slowmode + typedef sigc::signal<void, bool, GatewayCloseCode> type_signal_disconnected; // bool true if reconnecting typedef sigc::signal<void> type_signal_connected; type_signal_gateway_ready signal_gateway_ready(); |