Fixed the unix timestamp functions.

AnalogFeelings · Oct 31, 2021 · db8143e · db8143e
1 parent c58ea67
commit db8143e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/Blitzcord.h b/Blitzcord.h
@@ -2,18 +2,13 @@
 
 #include "discord/discord.h"
 #include <string>
-#include <fstream>
-#include <iostream>
 #include <stdlib.h>
 #include <chrono>
 
 #define uint64 unsigned long long
 #define uint32 unsigned int
 #define cchar const char*
 
-discord::Core* core{};
-discord::Activity activity{};
-
 #define BLITZ3D(x) extern "C" __declspec(dllexport) x _stdcall
 
 //CORE FUNCTIONS

diff --git a/Blitzcord.vcxproj b/Blitzcord.vcxproj
@@ -86,7 +86,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;BLITZCORD_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;BLITZCORD_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>
@@ -108,7 +108,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;BLITZCORD_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;BLITZCORD_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>

diff --git a/Blitzcord.zip b/Blitzcord.zip
diff --git a/Main.cpp b/Main.cpp
@@ -1,5 +1,8 @@
 #include "Blitzcord.h"
 
+discord::Core* core{};
+discord::Activity activity{};
+
 //CORE FUNCTIONS
 //--------------
 BLITZ3D(void) BlitzcordCreateCore(cchar id)
@@ -9,9 +12,7 @@ BLITZ3D(void) BlitzcordCreateCore(cchar id)
 	int lowerID = longLower(convertedLong);
 
 	auto result = discord::Core::Create(mergeLong(upperID, lowerID), DiscordCreateFlags_NoRequireDiscord, &core);
-	core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {
-
-	});
+	core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {});
 }
 
 BLITZ3D(void) BlitzcordRunCallbacks()
@@ -38,16 +39,12 @@ BLITZ3D(void) BlitzcordSetActivityType(int type)
 
 BLITZ3D(void) BlitzcordClearActivity()
 {
-	core->ActivityManager().ClearActivity([](discord::Result result) {
-
-	});
+	core->ActivityManager().ClearActivity([](discord::Result result) {});
 }
 
 BLITZ3D(void) BlitzcordUpdateActivity()
 {
-	core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {
-
-	});
+	core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {});
 }
 
 //SMALL IMAGE FUNCTIONS
@@ -135,28 +132,32 @@ BLITZ3D(int) BlitzcordGetTimestampEndLower()
 }
 
 //UNIX TIMESTAMP FUNCTIONS
+//------------------------
 BLITZ3D(cchar) BlitzcordGetCurrentTimestamp()
 {
-	return std::to_string(std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count()).c_str();
+	auto clockNow = std::chrono::system_clock::now();
+
+	return _strdup(std::to_string(std::chrono::duration_cast<std::chrono::seconds>(clockNow.time_since_epoch()).count()).c_str());
 }
 
 BLITZ3D(cchar) BlitzcordGetTimestampPlus(int hours, int minutes, int seconds)
 {
 	auto clockNow = std::chrono::system_clock::now();
 	auto clockAdded = clockNow + std::chrono::hours(hours) + std::chrono::minutes(minutes) + std::chrono::seconds(seconds);
 
-	return std::to_string(std::chrono::duration_cast<std::chrono::seconds>(clockAdded.time_since_epoch()).count()).c_str();
+	return _strdup(std::to_string(std::chrono::duration_cast<std::chrono::seconds>(clockAdded.time_since_epoch()).count()).c_str());
 }
 
 BLITZ3D(cchar) BlitzcordGetTimestampMinus(int hours, int minutes, int seconds)
 {
 	auto clockNow = std::chrono::system_clock::now();
 	auto clockSubstracted = clockNow - std::chrono::hours(hours) - std::chrono::minutes(minutes) - std::chrono::seconds(seconds);
 
-	return std::to_string(std::chrono::duration_cast<std::chrono::seconds>(clockSubstracted.time_since_epoch()).count()).c_str();
+	return _strdup(std::to_string(std::chrono::duration_cast<std::chrono::seconds>(clockSubstracted.time_since_epoch()).count()).c_str());
 }
 
 //LONG SPLITTING
+//--------------
 BLITZ3D(int) StringToUpperLong(cchar stringLong)
 {
 	return longUpper(atoll(stringLong));
@@ -169,7 +170,7 @@ BLITZ3D(int) StringToLowerLong(cchar stringLong)
 
 BLITZ3D(cchar) LongToString(int upperLong, int lowerLong)
 {
-	return std::to_string(mergeLong(upperLong, lowerLong)).c_str();
+	return _strdup(std::to_string(mergeLong(upperLong, lowerLong)).c_str());
 }
 
 int longUpper(uint64 value)