Dev

.cspell.json

@@ -83,7 +83,8 @@
 		"cplusplus",
 		"xmake",
 		"CORO",
-		"cback"
+		"cback",
+		"mentionables"
 	],
 	"flagWords": [
 		"hte"

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2021 Craig Edwards and D++ Contributors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -2,13 +2,12 @@
 <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) 
 ![Lines of code](https://img.shields.io/tokei/lines/github/brainboxdotcc/DPP) 
 [![D++ CI](https://github.com/brainboxdotcc/DPP/actions/workflows/ci.yml/badge.svg)](https://github.com/brainboxdotcc/DPP/actions/workflows/ci.yml)
-[![AUR version](https://img.shields.io/aur/version/dpp)](https://aur.archlinux.org/packages/dpp)
+[![AUR version](https://img.shields.io/aur/version/dpp)](https://aur.archlinux.org/packages/dpp) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md)
 
 </div>
 

buildtools/changelog.php

@@ -95,13 +95,13 @@
     // Match keywords against categories
     $matched = false;
     foreach ($categories as $cat => $header) {
-        // Purposefully ignored
-        if (preg_match("/^Merge (branch|pull request|remote-tracking branch) /", $change) or preg_match("/version bump/i", $change)) {
+        // Purposefully ignored: comments that are one word, merge commits, and version bumps
+        if (strpos($change, ' ') === false || preg_match("/^Merge (branch|pull request|remote-tracking branch) /", $change) || preg_match("/version bump/i", $change)) {
             $matched = true;
             continue;
         }
         // Groupings
-        if ((preg_match("/^" . $cat . ":/i", $change)) or (preg_match("/^\[" . $cat . "\//i", $change)) or (preg_match("/^\[" . $cat . "\]/i", $change)) or (preg_match("/^\[" . $cat . ":/i", $change)) or (preg_match("/^" . $cat . "\//i", $change)) or (preg_match("/^" . $cat . ":/i", $change))) {
+        if ((preg_match("/^" . $cat . ":/i", $change)) || (preg_match("/^\[" . $cat . "\//i", $change)) || (preg_match("/^\[" . $cat . "\]/i", $change)) || (preg_match("/^\[" . $cat . ":/i", $change)) || (preg_match("/^" . $cat . "\//i", $change)) || (preg_match("/^" . $cat . ":/i", $change))) {
             if (!isset($catgroup[$header])) {
                 $catgroup[$header] = [];
             }
@@ -124,7 +124,7 @@
     echo "\n" . ($githubstyle ? '## ' : '__**') . $cat . ($githubstyle ? '' : '**__') . "\n";
     foreach ($list as $item) {
         // Exclude bad commit messages like 'typo fix', 'test push' etc by pattern
-        if (!preg_match("/^(typo|test|fix)\s\w+$/", $item)) {
+        if (!preg_match("/^(typo|test|fix)\s\w+$/", $item) && strpos($item, ' ') !== false) {
             echo ($githubstyle ? '-' : '•') . ' ' . ucfirst(str_replace('@', '', $item)) . "\n";
         }
     }

cmake/FindSodium.cmake

@@ -46,7 +46,7 @@ endif()
 # UNIX
 if(UNIX)
   # import pkg-config
-  find_package(PkgConfig QUIET)
+  find_package(PkgConfig)
   if(PKG_CONFIG_FOUND)
     pkg_check_modules(sodium_PKG QUIET libsodium)
   endif()

docpages/02_building_a_bot.md

@@ -9,5 +9,6 @@ Click on a link below for a guide specifically for your system:
 * \subpage build-a-discord-bot-windows-wsl "Building a discord bot in Windows using WSL (Windows Subsystem for Linux)"
 * \subpage build-a-discord-bot-linux-clion "Building a discord bot in Linux using CLion"
 * \subpage buildcmake "Building a Discord Bot using CMake/UNIX"
+* \subpage buildmeson "Building a Discord Bot using Meson"
 * \subpage building-a-cpp-discord-bot-in-repl "Creating a Discord bot in Repl.it"
 

docpages/example_programs/interactions_and_components/modal_dialog_interactions.md

@@ -29,9 +29,21 @@ int main(int argc, char const *argv[])
 			/* Add a text component */
 			modal.add_component(
 				dpp::component().
-				set_label("Type rammel").
+				set_label("Short type rammel").
 				set_id("field_id").
 				set_type(dpp::cot_text).
+				set_placeholder("gumd").
+				set_min_length(5).
+				set_max_length(50).
+				set_text_style(dpp::text_short)
+			);
+			/* Add another text component in the next row, as required by Discord */
+			modal.add_row();
+			modal.add_component(
+				dpp::component().
+				set_label("Type rammel").
+				set_id("field_id2").
+				set_type(dpp::cot_text).
 				set_placeholder("gumf").
 				set_min_length(1).
 				set_max_length(2000).

docpages/example_programs/misc/eval.md

@@ -172,7 +172,7 @@ int main()
 					 * the shared object could not be loaded. The user probably
 					 * did something odd with the symbols inside their eval.
 					 */
-					std::string dl = std::string(getenv("PWD")) + std::to_string(event.msg.author.id) + "_" + std::to_string(event.msg.id) + ".so",
+					std::string dl = std::string(getenv("PWD")) + std::to_string(event.msg.author.id) + "_" + std::to_string(event.msg.id) + ".so";
 					auto shared_object_handle = dlopen(dl.c_str(), RTLD_NOW);
 					if (!shared_object_handle) {
 						const char *dlsym_error = dlerror();

docpages/make_a_bot/meson.md

@@ -0,0 +1,57 @@
+\page buildmeson Build a Discord Bot using Meson
+
+## 1. Toolchain
+
+Before compiling, you will need to install `meson` on your system.
+To be sure that `meson` is installed, you can type the following command:
+
+    $ meson --version
+    0.63.2
+
+## 2. Create a Meson project
+
+In an empty directory.
+
+    - your project/
+
+run the command 
+
+    $ meson init -l cpp
+
+## 3. Configuring your Meson project
+
+add the following line after the project() line in your meson.build file.
+
+    dpp = dependency('dpp')
+
+add the following line in the executable section of your meson.build file.
+
+    dependencies: [dpp]
+
+change the cpp_std value in the project() to c++17
+
+your meson.build should look like this.
+~~~~~~~~~~~~~~
+project('discord-bot', 'cpp',
+  version : '0.1',
+  default_options : ['warning_level=3',
+                     'cpp_std=c++14'])
+
+dpp = dependency('dpp')
+
+
+exe = executable('discord', 'discord_bot.cpp',
+  install : true, dependencies: [dpp])
+
+test('basic', exe)
+
+~~~~~~~~~~~~~~
+
+Meson automatically generates a cpp for your project. And a test suite.
+
+## 4. Building
+
+To build a meson project run
+
+    $ meson setup builddir
+    $ meson compile -C builddir

include/dpp/appcommand.h

@@ -552,7 +552,7 @@ void from_json(const nlohmann::json& j, command_data_option& cdo);
 enum interaction_type {
 	it_ping = 1,			//!< ping
 	it_application_command = 2,	//!< application command (slash command)
-	it_component_button = 3,	//!< button click (component interaction)
+	it_component_button = 3,	//!< button click or select menu chosen (component interaction)
 	it_autocomplete = 4,		//!< Autocomplete interaction
 	it_modal_submit = 5,		//!< Modal form submission
 };
@@ -609,26 +609,12 @@ struct DPP_EXPORT command_interaction {
  */
 void from_json(const nlohmann::json& j, command_interaction& ci);
 
-/**
- * @brief Component type, either button or select
- */
-enum component_type_t {
-	/**
-	 * @brief Button
-	 */
-	cotype_button = 2,
-	/**
-	 * @brief Option select list (drop-down)
-	 */
-	cotype_select = 3
-};
-
 /**
  * @brief A button click for a button component
  */
 struct DPP_EXPORT component_interaction {
 	/**
-	 * @brief Component type
+	 * @brief Component type (dpp::component_type)
 	 */
 	uint8_t component_type;
 	/**
@@ -695,7 +681,7 @@ class DPP_EXPORT interaction : public managed, public json_interface<interaction
 
 public:
 	snowflake application_id;                                   //!< id of the application this interaction is for
-	uint8_t	type;                                               //!< the type of interaction
+	uint8_t	type;                                               //!< the type of interaction (dpp::interaction_type)
 	std::variant<command_interaction, component_interaction, autocomplete_interaction> data; //!< Optional: the command data payload
 	snowflake guild_id;                                         //!< Optional: the guild it was sent from
 	snowflake channel_id;                                       //!< Optional: the channel it was sent from

include/dpp/auditlog.h

@@ -134,11 +134,11 @@ enum audit_type {
 	aut_automod_rule_update		=	141,
 	/// Auto moderation rule deletion
 	aut_automod_rule_delete		=	142,
-	/// Auto moderation block message
+	/// Message was blocked by Auto Moderation
 	aut_automod_block_message	=	143,
-	/// Message was flagged by AutoMod
+	/// Message was flagged by Auto Moderation
 	aut_automod_flag_to_channel =	144,
-	/// Member was timed out by AutoMod
+	/// Member was timed out by Auto Moderation
 	aut_automod_user_communication_disabled =	145,
 };
 

include/dpp/automod.h

@@ -107,9 +107,10 @@ enum automod_trigger_type : uint8_t {
  */
 struct DPP_EXPORT automod_metadata : public json_interface<automod_metadata> {
 	/**
-	 * @brief @brief Substrings which will be searched for in content.
+	 * @brief @brief Substrings which will be searched for in content (Maximum of 1000).
 	 *
-	 * Each keyword can be a phrase which contains multiple words. All keywords are case insensitive.
+	 * Each keyword can be a phrase which contains multiple words.
+	 * All keywords are case insensitive and can be up to 30 characters.
 	 *
 	 * Wildcard symbols (`*`) can be used to customize how each keyword will be matched.
 	 *
@@ -146,16 +147,58 @@ struct DPP_EXPORT automod_metadata : public json_interface<automod_metadata> {
 	 */
 	std::vector<std::string> keywords;
 
+	/**
+	 * @brief Regular expression patterns which will be matched against content (Maximum of 10).
+	 *
+	 * Only Rust flavored regex is currently supported, which can be tested in online editors such as [Rustexp](https://rustexp.lpil.uk/).
+	 * Each regex pattern can be up to 260 characters.
+	 */
+	std::vector<std::string> regex_patterns;
+
 	/**
 	 * @brief Preset keyword list types to moderate
 	 * @see automod_preset_type
 	 */
 	std::vector<automod_preset_type> presets;
 
 	/**
-	 * @brief Substrings which will be exempt from triggering the automod_metadata::presets trigger type.
+	 * @brief Substrings which should not trigger the rule.
+	 *
+	 * Each keyword can be a phrase which contains multiple words.
+	 * All keywords are case insensitive and can be up to 30 characters.
 	 *
-	 * Each keyword can be a phrase which contains multiple words. All keywords are case insensitive.
+	 * Wildcard symbols (`*`) can be used to customize how each keyword will be matched.
+	 *
+	 * **Examples for the `*` wildcard symbol:**
+	 *
+	 * Prefix - word must start with the keyword
+	 *
+	 * | keyword  | matches                             |
+     * |----------|-------------------------------------|
+     * | cat*     | <u><b>cat</b></u>ch, <u><b>Cat</b></u>apult, <u><b>CAt</b></u>tLE |
+     * | the mat* | <u><b>the mat</b></u>rix                      |
+     *
+     * Suffix - word must end with the keyword
+     *
+     * | keyword  | matches                  |
+     * |----------|--------------------------|
+     * | *cat     | wild<u><b>cat</b></u>, copy<u><b>Cat</b></u> |
+     * | *the mat | brea<u><b>the mat</b></u>          |
+     *
+     * Anywhere - keyword can appear anywhere in the content
+     *
+     * | keyword   | matches                     |
+     * |-----------|-----------------------------|
+     * | \*cat*     | lo<u><b>cat</b></u>ion, edu<u><b>Cat</b></u>ion |
+     * | \*the mat* | brea<u><b>the mat</b></u>ter          |
+     *
+     * Whole Word - keyword is a full word or phrase and must be surrounded by whitespace at the beginning and end
+     *
+     * | keyword | matches     |
+     * |---------|-------------|
+     * | cat     | <u><b>Cat</b></u>     |
+     * | the mat | <u><b>the mat</b></u> |
+     *
 	 */
 	std::vector<std::string> allow_list;