Merge pull request #34 from brainboxdotcc/dev

Dev

CODE_OF_CONDUCT.md

@@ -1,74 +1,134 @@
-## Code of Conduct
 
-### Our Pledge
+# Contributor Covenant Code of Conduct
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
+## Our Pledge
 
-### Our Standards
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
 
-Examples of behavior that contributes to creating a positive environment
-include:
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+## Our Standards
 
-Examples of unacceptable behavior by participants include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
-### Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
-### Scope
+## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
-### Enforcement
+## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at support@brainbox.cc. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
+reported to the community leaders responsible for enforcement in the
+[Discord][discord] server.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
 
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
 
-### Attribution
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+[discord]: https://discord.gg/dpp
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

README.md

@@ -2,6 +2,7 @@
 <h3>An incredibly lightweight C++ Discord library</h3>
 <br />
 
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](code_of_conduct.md)
 [![Discord](https://img.shields.io/discord/825407338755653642?style=flat)](https://discord.gg/dpp) 
 ![Downloads](https://dl.dpp.dev/dlcount.php)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/39b054c38bba411d9b25b39524016c9e)](https://www.codacy.com/gh/brainboxdotcc/DPP/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=brainboxdotcc/DPP&amp;utm_campaign=Badge_Grade) 

docpages/example_programs/misc.md

@@ -2,6 +2,7 @@
 
 This section lists examples that do not fit neatly into any of the categories above.
 
+* \subpage making_a_http_request "Making arbitrary HTTP requests using D++"
 * \subpage spdlog "Integrating with spdlog"
 * \subpage caching-messages "Caching messages"
 * \subpage collecting-reactions "Collecting Reactions"

docpages/example_programs/misc/http_request.md

@@ -0,0 +1,33 @@
+\page making_a_http_request Making arbitrary HTTP requests using D++
+
+If you wish to make arbitrary HTTP(S) requests to websites and APIs, e.g. to update statistics on bot lists, you can use code similar to the code below. You may pass any arbitrary POST data:
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
+#include <dpp/dpp.h>
+
+int main() {
+	dpp::cluster bot("TOKEN GOES HERE");
+
+	bot.on_log(dpp::utility::cout_logger());
+
+	bot.on_ready([&bot](const dpp::ready_t& event) {
+		// Arbitrary post data as a string
+		std::string mypostdata = "{\"value\": 42}";
+		// Make a HTTP POST request. HTTP and HTTPS are supported here.
+		bot.request(
+			"http://www.somebotlist.com/api/servers", dpp::m_post, [](const dpp::http_request_completion_t & cc) {
+				// This callback is called when the HTTP request completes. See documentation of
+				// dpp::http_request_completion_t for information on the fields in the parameter.
+				std::cout << "I got reply: " << cc.body << " with HTTP status code: " << cc.status << "\n";
+			},
+			mypostdata,
+			"application/json",
+			{
+				{"Authorization", "Bearer tokengoeshere"}
+			}
+		);
+	});
+
+	bot.start(dpp::st_wait);
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

include/dpp/appcommand.h

@@ -517,6 +517,14 @@ struct DPP_EXPORT command_data_option {
 	std::vector<command_data_option> options;  //!< Optional: present if this option is a group or subcommand
 	bool focused;                              //!< Optional: true if this option is the currently focused option for autocomplete
 
+	/**
+	 * @brief Check if the value variant holds std::monostate and options vector is empty (i.e. the option wasn't supplied) 
+	 * @return bool true, if value variant holds std::monostate and options vector is empty
+	 */
+	bool empty() {
+	    return std::holds_alternative<std::monostate>(value) && options.empty();
+	}
+
 	/**
 	 * @brief Get an option value by index
 	 * 

include/dpp/channel.h

@@ -52,7 +52,7 @@ enum channel_type : uint8_t {
 	 */
 	CHANNEL_STORE		= 6,
 	CHANNEL_ANNOUNCEMENT_THREAD	= 10,	//!< a temporary sub-channel within a GUILD_ANNOUNCEMENT channel
-	CHANNEL_PUBLIC_THREAD	= 11,	//!< a temporary sub-channel within a GUILD_TEXT channel
+	CHANNEL_PUBLIC_THREAD	= 11,	//!< a temporary sub-channel within a GUILD_TEXT or GUILD_FORUM channel
 	CHANNEL_PRIVATE_THREAD	= 12,	//!< a temporary sub-channel within a GUILD_TEXT channel that is only viewable by those invited and those with the MANAGE_THREADS permission
 	CHANNEL_STAGE		= 13,	//!< a "stage" channel, like a voice channel with one authorised speaker
 	CHANNEL_DIRECTORY	= 14,   //!< the channel in a [hub](https://support.discord.com/hc/en-us/articles/4406046651927-Discord-Student-Hubs-FAQ) containing the listed servers

include/dpp/cluster.h

@@ -2873,7 +2873,7 @@ class DPP_EXPORT cluster {
 	 * @param callback Function to call when the API call completes.
 	 * On success the callback will contain a dpp::thread object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
 	 */
-	void thread_create_in_forum(const std::string& thread_name, snowflake channel_id, message& msg, auto_archive_duration_t auto_archive_duration, uint16_t rate_limit_per_user, std::vector<snowflake> applied_tags = {}, command_completion_event_t callback = utility::log_error());
+	void thread_create_in_forum(const std::string& thread_name, snowflake channel_id, const message& msg, auto_archive_duration_t auto_archive_duration, uint16_t rate_limit_per_user, std::vector<snowflake> applied_tags = {}, command_completion_event_t callback = utility::log_error());
 
 	/**
 	 * @brief Create a thread

include/dpp/cluster_sync_calls.h

@@ -2017,7 +2017,7 @@ thread_member_map thread_members_get_sync(snowflake thread_id);
  * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
  * Avoid direct use of this function inside an event handler.
  */
-thread thread_create_in_forum_sync(const std::string& thread_name, snowflake channel_id, message& msg, auto_archive_duration_t auto_archive_duration, uint16_t rate_limit_per_user, std::vector<snowflake> applied_tags = {});
+thread thread_create_in_forum_sync(const std::string& thread_name, snowflake channel_id, const message& msg, auto_archive_duration_t auto_archive_duration, uint16_t rate_limit_per_user, std::vector<snowflake> applied_tags = {});
 
 /**
  * @brief Create a thread

include/dpp/guild.h

@@ -140,6 +140,8 @@ enum guild_flags_extra : uint8_t {
 	g_auto_moderation =			0b00000100,
 	/** Guild has paused invites, preventing new users from joining */
 	g_invites_disabled =		0b00001000,
+	/** Guild has been set as support server of an app in the App Directory */
+	g_developer_support_server =	0b00010000,
 };
 
 /**
@@ -798,6 +800,12 @@ class DPP_EXPORT guild : public managed, public json_interface<guild>  {
 	 */
 	bool has_auto_moderation() const;
 
+	/**
+	 * @brief Guild has been set as a support server on the App Directory
+	 * @return bool has been set as a support server of an app in the app directory
+	 */
+	bool has_support_server() const;
+
 	/**
 	 * @brief Guild has access to set an animated guild icon
 	 * @return bool can have animated icon

include/dpp/user.h

@@ -74,6 +74,8 @@ enum user_flags : uint32_t {
 	u_certified_moderator =		0b00010000000000000000000,
 	/// User is a bot using HTTP interactions (shows online even when not connected to a websocket)
 	u_bot_http_interactions =	0b00100000000000000000000,
+	/// User has nitro basic
+	u_nitro_basic = 			0b01000000000000000000000,
 };
 
 /**
@@ -169,9 +171,16 @@ class DPP_EXPORT user : public managed, public json_interface<user>  {
 	 * @brief Return true if user has nitro classic.
 	 * This is mutually exclusive with nitro classic.
 	 *
-	 * @return true  if user has nitro classic
+	 * @return true if user has nitro classic
 	 */
 	bool has_nitro_classic() const;
+	/**
+	 * @brief Return true if user has nitro basic.
+	 * This is mutually exclusive with nitro basic.
+	 *
+	 * @return true if user has nitro basic
+	 */
+	bool has_nitro_basic() const;
 	/**
 	 * @brief Return true if user is a discord employee
 	 *

src/dpp/cluster/thread.cpp

@@ -67,7 +67,7 @@ void cluster::thread_members_get(snowflake thread_id, command_completion_event_t
 	rest_request_list<thread_member>(this, API_PATH "/channels", std::to_string(thread_id), "/threads-members", m_get, "", callback);
 }
 
-void cluster::thread_create_in_forum(const std::string& thread_name, snowflake channel_id, message& msg, auto_archive_duration_t auto_archive_duration, uint16_t rate_limit_per_user, std::vector<snowflake> applied_tags, command_completion_event_t callback)
+void cluster::thread_create_in_forum(const std::string& thread_name, snowflake channel_id, const message& msg, auto_archive_duration_t auto_archive_duration, uint16_t rate_limit_per_user, std::vector<snowflake> applied_tags, command_completion_event_t callback)
 {
 	json j({
 		{"name",                  thread_name},

src/dpp/cluster_sync_calls.cpp

@@ -557,7 +557,7 @@ thread_member_map cluster::thread_members_get_sync(snowflake thread_id) {
 	return dpp::sync<thread_member_map>(this, &cluster::thread_members_get, thread_id);
 }
 
-thread cluster::thread_create_in_forum_sync(const std::string& thread_name, snowflake channel_id, message& msg, auto_archive_duration_t auto_archive_duration, uint16_t rate_limit_per_user, std::vector<snowflake> applied_tags) {
+thread cluster::thread_create_in_forum_sync(const std::string& thread_name, snowflake channel_id, const message& msg, auto_archive_duration_t auto_archive_duration, uint16_t rate_limit_per_user, std::vector<snowflake> applied_tags) {
 	return dpp::sync<thread>(this, &cluster::thread_create_in_forum, thread_name, channel_id, msg, auto_archive_duration, rate_limit_per_user, applied_tags);
 }
 

src/dpp/guild.cpp

@@ -36,6 +36,7 @@ const std::map<std::string, std::variant<dpp::guild_flags, dpp::guild_flags_extr
 	{"VERIFIED", dpp::g_verified },
 	{"PARTNERED", dpp::g_partnered },
 	{"COMMUNITY", dpp::g_community },
+	{"DEVELOPER_SUPPORT_SERVER", dpp::g_developer_support_server },
 	{"COMMERCE", dpp::g_commerce },
 	{"NEWS", dpp::g_news },
 	{"DISCOVERABLE", dpp::g_discoverable },
@@ -306,6 +307,10 @@ bool guild::has_auto_moderation() const {
 	return this->flags_extra & g_auto_moderation;
 }
 
+bool guild::has_support_server() const {
+	return this->flags_extra & g_developer_support_server;
+}
+
 bool guild::has_animated_icon() const {
 	return this->flags & g_animated_icon;
 }