Merge pull request #12 from Harshfeudal-Projects/development

[Update]: time format

Author: harshfeudal

README.md

@@ -28,7 +28,7 @@ These are libraries that we're using in this project:
 - [Base64](https://gist.github.com/tomykaira/f0fd86b6c73063283afe550bc5d77594)
 
 Bot current version: 
-- BETA version - `0.1.6.10` (`x64` Release) [Not official BETA released]
+- BETA version - `0.1.6` (`x64` Release) [Not official BETA released]
 - Stable version - `Unknown` (Will be officially released on late December if possible, or at final BETA version - `v0.1.9.0`)
 
  For downloading **latest version**, please click [here](https://github.com/Harshfeudal-Projects/Raiden-Shogun/releases).

Raiden Shogun.rc

@@ -1,11 +1,11 @@
 #include <Winver.h>
 
-#define FILEVERSION_STR "0.1.6.10"
-#define PRODUCTVERSION_STR "0.1.6.10"
+#define FILEVERSION_STR "0.1.6.38"
+#define PRODUCTVERSION_STR "0.1.6.38"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,6,10
- PRODUCTVERSION 0,1,6,10
+ FILEVERSION 0,1,6,38
+ PRODUCTVERSION 0,1,6,38
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG

commands/moderation/timeout.h

@@ -18,4 +18,13 @@
 
 #include <dpp/dpp.h>
 
+inline bool isNumber(const std::string& s)
+{
+    for (char const &ch : s) {
+        if (std::isdigit(ch) == 0)
+            return false;
+    }
+    return true;
+}
+
 void timeout(dpp::cluster& cluster, const dpp::slashcommand_t& event);

handler/builder.h

@@ -94,7 +94,7 @@ inline std::map<std::string, commandDef> commands
 				"Timeout member", timeout,
 				{
 					dpp::command_option(dpp::co_user,    "member",   "Mention a member to timeout", true),
-					dpp::command_option(dpp::co_integer, "duration", "Timeout duration",            true),
+					dpp::command_option(dpp::co_string,  "duration", "Timeout duration",            true),
 					dpp::command_option(dpp::co_string,  "reason",   "Reason why they got timeout", false)
 				}
 			}

src/information/userInfo.cpp

@@ -49,7 +49,7 @@ void userInfo(dpp::cluster& client, const dpp::slashcommand_t& event)
     const auto HypesquadBalance      = "<:BadgeBalance:1043797533060767835>";
     const auto HypesquadBrilliance   = "<:BadgeBrilliance:1043798261137408060>";
 
-    const auto ActiveDeveloper       = "<:BadgeActiveDeveloper:1043797591487426600>";
+    const auto ActiveDeveloper       = "<:BadgeActiveDeveloper:1047528637013962792>";
 
     auto       hasStaffBadge         = "";
     auto       hasPartnerBadge       = "";

src/main.cpp

@@ -87,7 +87,7 @@ int main()
 		});
 
 	// Console log prettier
-	SetConsoleTitle(TEXT("[BETA] v0.1.6.0 - Raiden Shogun Discord Bot - The Harshfeudal Projects"));
+	SetConsoleTitle(TEXT("[BETA] v0.1.6 - Raiden Shogun Discord Bot - The Harshfeudal Projects"));
 
 	// Use this logger to check why the code is error (remove when done)
 	client.on_log(dpp::utility::cout_logger());

src/moderation/move.cpp

@@ -148,8 +148,8 @@ void move(dpp::cluster& client, const dpp::slashcommand_t& event)
 			if (std::holds_alternative<std::string>(tgtReason))
                 m_Reason = std::get<std::string>(tgtReason);
 
-            // This audit log will be reported as a bug
-			client.set_audit_reason(m_Reason);
+            // Note: this is Discord Bug!
+			// client.set_audit_reason(m_Reason);
 
             // Move the target user
             client.guild_member_move(NewChannel, tgtGuild, usr);

src/moderation/timeout.cpp

@@ -18,7 +18,6 @@
 #include <dpp/dpp.h>
 
 #include "../../handler/handler.h"
-#include "../../handler/btnHandler.h"
 #include "../../commands/moderation/timeout.h"
 
 void timeout(dpp::cluster& client, const dpp::slashcommand_t& event)
@@ -29,7 +28,7 @@ void timeout(dpp::cluster& client, const dpp::slashcommand_t& event)
 	const auto successTitle     = "<:success:1036206685779398677> Success!";
 	const auto warnTitle        = "Warning message";
 
-	const auto duration         = std::get<int64_t>(event.get_parameter("duration"));
+	const auto duration         = std::get<std::string>(event.get_parameter("duration"));
 	const auto usr              = std::get<dpp::snowflake>(event.get_parameter("member"));
 	const auto tgtReason        = event.get_parameter("reason");
 
@@ -111,69 +110,95 @@ void timeout(dpp::cluster& client, const dpp::slashcommand_t& event)
 		return;
 	}
 
-	auto tout_Component = dpp::component();
-	auto cnl_Component  = dpp::component();
+	// Time format engine
+	// Working in progress ...
 
-	tout_Component.set_label("Timeout").set_type(dpp::cot_button).set_style(dpp::cos_danger).set_emoji("success", 1036206685779398677).set_id("tout_Id");
-	cnl_Component.set_label("Cancel").set_type(dpp::cot_button).set_style(dpp::cos_success).set_emoji("failed", 1036206712916553748).set_id("tout_cnl_Id");
+	// Making a function to input number string and automatically output as minute
 
-	// Button for muting user (timeout)
-	ButtonBind(tout_Component, [&client, tgtGuild, tgtReason, usr, source, duration](const dpp::button_click_t& event)
-		{
-			// If not the user who request that interaction
-			if (source != event.command.usr.id)
-				return false;
+	std::string   input   = duration;
 
-			const auto  toutContent = fmt::format("<@{}> has been timeout until <t:{}:f>!", usr, time(nullptr) + duration);
-            std::string tout_Reason = "No reason provided";
+    uint64_t sec     = 0;
+    uint64_t temp    = 0;
 
-			// If reason is provided
-			if (std::holds_alternative<std::string>(tgtReason))
-				tout_Reason = std::get<std::string>(tgtReason);
+    bool     bSyntax = 0;
+	bool     error   = 0;
 
-            client.set_audit_reason(tout_Reason);
-
-			// Timeout the user
-			client.guild_member_timeout(tgtGuild, usr, time(nullptr) + duration);
-
-			event.reply(
-				dpp::interaction_response_type::ir_update_message,
-				dpp::message().set_flags(dpp::m_ephemeral)
-				              .set_content(toutContent)
-			);
+	// Automatically convert if no day format
+	if (isNumber(input))
+	{
+		sec += temp * 60;
+        temp = 0;
+        bSyntax = 0;
+	}
 
-			return true;
-		});
+    for(int a : input)
+    {
+        a = tolower(a);
+
+        if('0' <= a && a <= '9')
+        {
+            temp = temp * 10 + (a - '0');
+            bSyntax = 1;
+        }
+        else if(a == 'd' && bSyntax)
+        {
+            sec += temp * 86400;
+            temp = 0;
+            bSyntax = 0;
+        }
+        else if(a == 'h' && bSyntax)
+        {
+            sec += temp * 3600;
+            temp = 0;
+            bSyntax = 0;
+        }
+        else if(a == 'm' && bSyntax)
+        {
+            sec += temp * 60;
+            temp = 0;
+            bSyntax = 0;
+        }
+        else if(a == 's' && bSyntax)
+        {
+            sec += temp;
+            temp = 0;
+            bSyntax = 0;
+        }
+		else
+			error = true;
+    }
+
+	// Check all error cases occur
+	if (std::isdigit(input[input.size() - 1]))
+		error = true;
+
+	if (error)
+	{
+		EmbedBuild(embed, 0xFF7578, errorTitle, warnTitle, "Wrong time format", event.command.usr);
+		event.reply(
+			dpp::message(event.command.channel_id, embed).set_flags(dpp::m_ephemeral)
+		);
 
-	// Button for cancelling
-	ButtonBind(cnl_Component, [source](const dpp::button_click_t& event)
-		{
-			// If not the user who request that interaction
-			if (source != event.command.usr.id)
-				return false;
+		return;
+	}
 
-			const auto cnlContent = "Cancelled request!";
+	auto        toutContent = fmt::format("<@{}> has been timeouted until <t:{}:F>!", usr, time(nullptr) + sec);
+    std::string tout_Reason = "No reason provided";
 
-			event.reply(
-				dpp::interaction_response_type::ir_update_message,
-				dpp::message().set_flags(dpp::m_ephemeral)
-				              .set_content(cnlContent)
-			);
+	if (sec == 0)
+		toutContent = fmt::format("<@{}> has been un-timeouted!", usr);
 
-			return true;
-		});
+	// If reason is provided
+	if (std::holds_alternative<std::string>(tgtReason))
+		tout_Reason = std::get<std::string>(tgtReason);
 
-	dpp::message tout_Confirm(
-		fmt::format("Do you want to timeout <@{}> until <t:{}:f>? Press the button below to confirm", usr, time(nullptr) + duration)
-	);
+    client.set_audit_reason(tout_Reason);
 
-	tout_Confirm.add_component(
-		dpp::component().add_component(tout_Component)
-		                .add_component(cnl_Component)
-	);
+	// Timeout the user
+	client.guild_member_timeout(tgtGuild, usr, time(nullptr) + sec);
 
 	event.reply(
-		tout_Confirm.set_flags(dpp::m_ephemeral)
-		            .set_channel_id(tgtChannel)
+		dpp::message().set_flags(dpp::m_ephemeral)
+		              .set_content(toutContent)
 	);
 }