feat: Proper test command (#4)

* feat: Add proper test command

* refactor: Add periods and proper logs with test

* chore(docs): Edit readme to include recent changes

* chore(release): Rebuild binary

Author: c43721

README.md

@@ -25,10 +25,10 @@ SourceMod plugin to allow sending logs.tf previews to a Discord channel through
 2. Restart the server or type `sm plugins load payload-webhook` in the console to load the plugin.
 3. The config file will be automatically generated in cfg/sourcemod/
 4. [Grab your webhook token](https://payload.tf/settings)
-5. Set the convar `payload_webhook_token` to the token gained above
+5. Set the convar `sm_payload_token` to the token gained above
    You're set! You should now recieve logs.tf previews when logs.tf uploads a log successfully.
 
-If you wish to disable the previews, you can set the `payload_send` convar to `0`.
+If you wish to disable the previews, you can set the `sm_payload_send` convar to `0`.
 
 # Issues, Questions
 

compiled/payload-webhook.smx

@@ -6,7 +6,7 @@
 #pragma newdecls required
 #pragma semicolon 1
 
-#define VERSION "1.0.1"
+#define VERSION "1.1.0"
 
 char g_sWebhookToken[128];
 
@@ -25,20 +25,48 @@ public Plugin myinfo =
 
 public void OnPluginStart()
 {
-	g_hCvarWebhookToken = CreateConVar("payload_webhook_token", "", "Channel to post rendered logs to", FCVAR_PROTECTED);
-	g_hCvarApiUrl = CreateConVar("payload_apiurl", "https://api.payload.tf/api", "Payload API url", FCVAR_PROTECTED);
+	g_hCvarWebhookToken = CreateConVar("sm_payload_token", "", "Channel to post rendered logs to", FCVAR_PROTECTED);
+	g_hCvarApiUrl = CreateConVar("sm_payload_apiurl", "https://api.payload.tf/api", "Payload API url", FCVAR_PROTECTED);
 
-	g_hCvarSendLogs = CreateConVar("payload_send", "1", "Send the logs or not", FCVAR_NOTIFY);
+	g_hCvarSendLogs = CreateConVar("sm_payload_send", "1", "Send the logs or not", FCVAR_NOTIFY);
 
-	RegConsoleCmd("payload_testupload", testUpload, "Debug function to simulate an uploaded log");
+	RegConsoleCmd("sm_payload_test", TestUpload, "Debug function to simulate an uploaded log");
 
 	PrintToChatAll("[Payload] Plugin loaded.");
 	PrintToServer("[Payload] Plugin loaded.");
 }
 
-public Action testUpload(int client, int args)
+public Action TestUpload(int client, int args)
 {
-	LogUploaded(true, "2961236", "https://logs.tf/2961236");
+	bool sendRequest = GetConVarBool(g_hCvarSendLogs);
+	if (sendRequest == false) 
+	{
+		PrintToChatAll("[Payload] sm_payload_send is 0, not sending requests.");
+		PrintToServer("[Payload] sm_payload_send is 0, not sending requests.");
+		
+		return Plugin_Handled;
+	}
+
+	// Make sure we update the string value of the token
+	GetConVarString(g_hCvarWebhookToken, g_sWebhookToken, sizeof(g_sWebhookToken));
+
+	if (strlen(g_sWebhookToken) == 0) 
+		return Plugin_Handled;
+
+	char BaseUrl[64];
+	char FullUrl[128];
+
+	// Store convar for the api Url in BaseUrl
+	GetConVarString(g_hCvarApiUrl, BaseUrl, sizeof(BaseUrl));
+
+	// Complete the baseUrl
+	Format(FullUrl, sizeof(FullUrl), "%s/webhooks/v1/internal/test", BaseUrl);
+
+	PrintToServer("[Payload] Testing webhook...");
+	PrintToChatAll("[Payload] Testing webhook...");
+
+	SendTestRequest(FullUrl);
+		
 	return Plugin_Handled;
 }
 
@@ -88,18 +116,47 @@ public void SendRequest(const char[] logid, const char[] fullApiUrl)
 	SteamWorks_SendHTTPRequest(hRequest);
 }
 
+public void SendTestRequest(const char[] fullApiUrl)
+{
+	Handle hRequest = SteamWorks_CreateHTTPRequest(k_EHTTPMethodPOST, fullApiUrl);
+
+	// Headers
+	SteamWorks_SetHTTPRequestHeaderValue(hRequest, "Content-Type", "x-www-form-urlencoded");
+	SteamWorks_SetHTTPRequestHeaderValue(hRequest, "Authorization", g_sWebhookToken);
+
+	SteamWorks_SetHTTPCallbacks(hRequest, TestWebhookComplete);
+	SteamWorks_SendHTTPRequest(hRequest);
+}
+
 public int OnSteamWorksHTTPComplete(Handle hRequest, bool bFailure, bool bRequestSuccessful, EHTTPStatusCode eStatusCode, any data) 
 {
 	if (bFailure) 
 	{
-		PrintToChatAll("[Payload] Unable to post logs preview");
-		PrintToServer("[Payload] Unable to post logs preview");
+		PrintToChatAll("[Payload] Unable to post logs preview.");
+		PrintToServer("[Payload] Unable to post logs preview.");
+		PrintToServer("Status Code: %i", eStatusCode);
+	}
+	else
+	{
+		PrintToChatAll("[Payload] Log preview uploaded.");
+		PrintToServer("[Payload] Log preview uploaded.");
+	}
+	
+	delete hRequest;
+}
+
+public int TestWebhookComplete(Handle hRequest, bool bFailure, bool bRequestSuccessful, EHTTPStatusCode eStatusCode, any data) 
+{
+	if (bFailure) 
+	{
+		PrintToChatAll("[Payload] Unable to test webhook.");
+		PrintToServer("[Payload] Unable to test preview.");
 		PrintToServer("Status Code: %i", eStatusCode);
 	}
 	else
 	{
-		PrintToChatAll("[Payload] Log preview uploaded");
-		PrintToServer("[Payload] Log preview uploaded");
+		PrintToChatAll("[Payload] Webhook test successful.");
+		PrintToServer("[Payload] Webhook test successful.");
 	}
 
 	delete hRequest;