Implemented HLKZ to Service communication for Discord webhook

Author: fireblizzard

README.md

@@ -20,5 +20,12 @@ Doing `cd` into your _ag/maps_ folder and executing `ls *.bsp >> ../addons/amxmo
 
 speclist provides a command to toggle a list of spectators watching you
 
+## hl_kreedz_discord
+
+hl_kreedz_discord can send info about new WRs to a service (not directly to the webhook as this AMXX cURL doesn't support SSL yet), in the format of a JSON that a Discord webhook can understand so that a Discord bot posts that info to a chat. Requires setting the URL of the service with this cvar:
+kz_discord_service "http://example.domain/whatever/some_service_name.php"
+And the Discord webhook token with this cvar:
+kz_discord_webhook "https://ptb.discordapp.com/api/webhooks/some_number/some_token"
+
 
 TODO: explain all the available commands for admins and players

data/lang/q_jumpstats.txt

@@ -1,13 +1,13 @@
 [en]
-Q_JS_GODLIKE = [LJStats] [GODLIKE] %s did a %s of %.2f!
-Q_JS_PERFECT = [LJStats] [Perfect] %s did a %s of %.2f!
-Q_JS_IMPRESSIVE = [LJStats] [Impressive] %s did a %s of %.2f!
-Q_JS_LEET = [LJStats] [Leet] %s did a %s of %.2f!
-Q_JS_PRO = [LJStats] [Pro] %s did a %s of %.2f!
+Q_JS_GODLIKE = [LJStats] [GODLIKE] %s^0 did a %s of %.2f!
+Q_JS_PERFECT = [LJStats] [Perfect] %s^0 did a %s of %.2f!
+Q_JS_IMPRESSIVE = [LJStats] [Impressive] %s^0 did a %s of %.2f!
+Q_JS_LEET = [LJStats] [Leet] %s^0 did a %s of %.2f!
+Q_JS_PRO = [LJStats] [Pro] %s^0 did a %s of %.2f!
 
 [es]
-Q_JS_GODLIKE = [LJStats] [ALUCINANTE] %s hizo un %s de %.2f!
-Q_JS_PERFECT = [LJStats] [Perfecto] %s hizo un %s de %.2f!
-Q_JS_IMPRESSIVE = [LJStats] [Impresionante] %s hizo un %s de %.2f!
-Q_JS_LEET = [LJStats] [Leet] %s hizo un %s de %.2f!
-Q_JS_PRO = [LJStats] [Pro] %s hizo un %s de %.2f!
+Q_JS_GODLIKE = [LJStats] [ALUCINANTE] %s^0 hizo un %s de %.2f!
+Q_JS_PERFECT = [LJStats] [Perfecto] %s^0 hizo un %s de %.2f!
+Q_JS_IMPRESSIVE = [LJStats] [Impresionante] %s^0 hizo un %s de %.2f!
+Q_JS_LEET = [LJStats] [Leet] %s^0 hizo un %s de %.2f!
+Q_JS_PRO = [LJStats] [Pro] %s^0 hizo un %s de %.2f!

modules/curl_amxx.dll

@@ -108,16 +108,6 @@ enum _:COUNTERS
 	COUNTER_SP,
 }
 
-enum _:STATS
-{
-	STATS_ID[32],
-	STATS_NAME[32],
-	STATS_CP,
-	STATS_TP,
-	Float:STATS_TIME,	// Timer value
-	STATS_TIMESTAMP,	// Date
-}
-
 enum BUTTON_TYPE
 {
 	BUTTON_START,
@@ -225,14 +215,13 @@ new g_FwLightStyle;
 new pcvar_sv_ag_match_running;
 
 new mfwd_hlkz_cheating;
+new mfwd_hlkz_worldrecord;
 
 new Array:g_ArrayStatsNub;
 new Array:g_ArrayStatsPro;
 new Array:g_ArrayStatsPure;
 
 
-
-
 public plugin_precache()
 {
 	g_FwLightStyle = register_forward(FM_LightStyle, "Fw_FmLightStyle");
@@ -337,7 +326,8 @@ public plugin_init()
 	register_touch("trigger_push", "player", "Fw_FmPlayerTouchPush");
 	register_touch("trigger_multiple", "player", "Fw_FmPlayerTouchHealthBooster");
 
-	mfwd_hlkz_cheating = CreateMultiForward( "hlkz_cheating", ET_IGNORE, FP_CELL );
+	mfwd_hlkz_cheating = CreateMultiForward("hlkz_cheating", ET_IGNORE, FP_CELL);
+	mfwd_hlkz_worldrecord = CreateMultiForward("hlkz_worldrecord", ET_IGNORE, FP_CELL, FP_FLOAT, FP_CELL, FP_CELL);
 
 	register_message(get_user_msgid("Health"), "Fw_MsgHealth");
 	register_message(SVC_TEMPENTITY, "Fw_MsgTempEntity");
@@ -1685,10 +1675,10 @@ FinishTimer(id)
 		{
 			if (get_bit(g_baIsPureRunning, id))
 			{
-				log_amx(" ----- Checking records after Pure Run end ------");
-				log_amx("Checking Pure top... ");
+				//log_amx(" ----- Checking records after Pure Run end ------");
+				//log_amx("Checking Pure top... ");
 				UpdateRecords(id, kztime, g_szTops[0]);
-				log_amx("Checking Pro top... ");
+				//log_amx("Checking Pro top... ");
 				UpdateRecords(id, kztime, g_szTops[1]);
 			}
 			else
@@ -2865,7 +2855,7 @@ LoadRecords(szTopType[])
 
 	new data[1024], stats[STATS], uniqueid[32], name[32], cp[24], tp[24];
 	new kztime[24], timestamp[24];
-	//new current_time = get_systime();
+
 	new Array:arr;
 	if (equali(szTopType, g_szTops[0]))
 		arr = g_ArrayStatsPure;
@@ -2886,21 +2876,13 @@ LoadRecords(szTopType[])
 
 		stats[STATS_TIMESTAMP] = str_to_num(timestamp);
 
-		/*
-		// Stale old records that are below specified amount, otherwise we use them to inform player about better/worse time and position
-		if (current_time - stats[STATS_TIMESTAMP] > staleStatTime &&
-			i > keepStatPlayers)
-			continue;
-		*/
-
 		copy(stats[STATS_ID], charsmax(stats[STATS_ID]), uniqueid);
 		copy(stats[STATS_NAME], charsmax(stats[STATS_NAME]), name);
 		stats[STATS_CP] = str_to_num(cp);
 		stats[STATS_TP] = str_to_num(tp);
 		stats[STATS_TIME] = _:str_to_float(kztime);
 
 		ArrayPushArray(arr, stats);
-		//i++;
 	}
 
 	fclose(file);
@@ -2952,51 +2934,65 @@ UpdateRecords(id, Float:kztime, szTopType[])
 	new minutes, Float:seconds, Float:slower, Float:faster;
 	LoadRecords(szTopType);
 
-	new Array:arr;
+	new Array:arr, type;
 	if (equali(szTopType, g_szTops[0]))
+	{
 		arr = g_ArrayStatsPure;
+		type = 0;
+	}
 	else if (equali(szTopType, g_szTops[1]))
+	{
 		arr = g_ArrayStatsPro;
+		type = 1;
+	}
 	else
+	{
 		arr = g_ArrayStatsNub;
+		type = 2;
+	}
 
 	GetUserUniqueId(id, uniqueid, charsmax(uniqueid));
 	GetColorlessName(id, name, charsmax(name));
 
-	new result, bool:skipResult = false;
+	new result;
 
-	log_amx("uniqueid = %s, name = %s", uniqueid, name);
+	//log_amx("uniqueid = %s, name = %s", uniqueid, name);
 
-	log_amx("-- Entering records loop. Array size: %d", ArraySize(arr));
+	//log_amx("-- Entering records loop. Array size: %d", ArraySize(arr));
 	for (new i = 0; i < ArraySize(arr); i++)
 	{
 		ArrayGetArray(arr, i, stats);
 		result = floatcmp(kztime, stats[STATS_TIME]);
-		log_amx("comparing current run's time (%.2f) to best #%d time (%.2f); result = %d", kztime, i+1, stats[STATS_TIME], result);
+		//log_amx("comparing current run's time (%.2f) to best #%d time (%.2f); result = %d", kztime, i+1, stats[STATS_TIME], result);
 
 		if (result == -1 && insertItemId == -1)
 		{
 			insertItemId = i;
-			log_amx("insertItemId = %d", insertItemId);
+			//log_amx("insertItemId = %d", insertItemId);
 		}
 
-		log_amx("comparing %s to current runner ID (%s)", stats[STATS_ID], uniqueid);
+		//log_amx("comparing %s to current runner ID (%s)", stats[STATS_ID], uniqueid);
 		if (!equal(stats[STATS_ID], uniqueid))
 		{
-			log_amx("not equal, continue finding the current runner's position...");
+			//log_amx("not equal, continue finding the current runner's position...");
 			continue;
 		}
-		log_amx("equal, this is the record that we want to check...");
+		//log_amx("equal, this is the record that we want to check...");
 
 		if (result != -1)
 		{
 			slower = kztime - stats[STATS_TIME];
 			minutes = floatround(slower, floatround_floor) / 60;
 			seconds = slower - (60 * minutes);
-			client_print(id, print_chat, GetVariableDecimalMessage(id, "[%s] You failed your %s time by %02d:%"),
-				PLUGIN_TAG, szTopType, minutes, seconds);
+			if (get_bit(g_baIsPureRunning, id))
+			{
+				client_print(id, print_chat, GetVariableDecimalMessage(id, "[%s] You failed your %s time by %02d:%"),
+					PLUGIN_TAG, szTopType, minutes, seconds);
+			}
+			/*
 			log_amx(GetVariableDecimalMessage(id, "%s failed their %s time by %02d:%", ", nothing to update here!"),
 				name, szTopType, minutes, seconds);
+			*/
 
 			return;
 		}
@@ -3006,20 +3002,22 @@ UpdateRecords(id, Float:kztime, szTopType[])
 		seconds = faster - (60 * minutes);
 		client_print(id, print_chat, GetVariableDecimalMessage(id, "[%s] You improved your %s time by %02d:%"),
 			PLUGIN_TAG, szTopType, minutes, seconds);
+		/*
 		log_amx(GetVariableDecimalMessage(id, "%s improved their %s time by %02d:%"),
 			name, szTopType, minutes, seconds);
+		*/
 
 		deleteItemId = i;
-		log_amx("deleteItemId = %d", deleteItemId);
+		//log_amx("deleteItemId = %d", deleteItemId);
 
 		break;
 	}
-	log_amx("-- Records loop finished. State of variables:");
-	log_amx("uniqueid = %s, name = %s", uniqueid, name);
-	log_amx("current run's time = %.2f", kztime);
-	log_amx("result = %d", result);
-	log_amx("insertItemId = %d", insertItemId);
-	log_amx("deleteItemId = %d", deleteItemId);
+	//log_amx("-- Records loop finished. State of variables:");
+	//log_amx("uniqueid = %s, name = %s", uniqueid, name);
+	//log_amx("current run's time = %.2f", kztime);
+	//log_amx("result = %d", result);
+	//log_amx("insertItemId = %d", insertItemId);
+	//log_amx("deleteItemId = %d", deleteItemId);
 
 	copy(stats[STATS_ID], charsmax(stats[STATS_ID]), uniqueid);
 	copy(stats[STATS_NAME], charsmax(stats[STATS_NAME]), name);
@@ -3043,7 +3041,7 @@ UpdateRecords(id, Float:kztime, szTopType[])
 		ArrayDeleteItem(arr, insertItemId != -1 ? deleteItemId + 1 : deleteItemId);
 
 	rank++;
-	log_amx("checking rank... rank = %d", rank);
+	//log_amx("checking rank... rank = %d", rank);
 	if (rank <= get_pcvar_num(pcvar_kz_top_records))
 	{
 		client_cmd(0, "spk woop");
@@ -3054,6 +3052,12 @@ UpdateRecords(id, Float:kztime, szTopType[])
 
 	SaveRecords(szTopType);
 
+	if (rank == 1)
+	{
+		new ret;
+		//new iArrayPass = PrepareArray(arr, ArraySize(arr));
+		ExecuteForward(mfwd_hlkz_worldrecord, ret, id, kztime, type, arr);
+	}
 }
 
 ShowTopClimbers(id, szTopType[])

modules/curl_amxx_i386.so

@@ -0,0 +1,104 @@
+#include <amxmodx>
+#include <curl>
+#include <json>
+#include <hl_kreedz_util>
+
+#define PLUGIN "HLKZ Discord WR Notifier"
+#define PLUGIN_TAG "HLKZ"
+#define VERSION "0.1.0"
+#define AUTHOR "naz"
+
+new Handle:curl;
+new Handle:header;
+new pcvar_kz_discord_webhook;
+new pcvar_kz_discord_service;
+
+
+public plugin_init() 
+{ 
+    register_plugin(PLUGIN, VERSION, AUTHOR);
+    pcvar_kz_discord_webhook = register_cvar("kz_discord_webhook", "");
+    pcvar_kz_discord_service = register_cvar("kz_discord_service", "");
+
+    header = curl_create_slist();
+    curl_slist_append(header, "Content-Type: application/json"); 
+}
+
+public hlkz_worldrecord(id, Float:flTime, type, Array:arr)
+{
+	if (ArraySize(arr) < 5)
+		return;
+
+    static szName[32], szPostdata[640], szTime[12], szType[5], szMap[64], szWebhook[160], szURL[256];
+	new minutes, Float:seconds, stats[STATS];
+	new szRecDate[32], szRecTime[32];
+    GetColorlessName(id, szName, charsmax(szName));
+	minutes = floatround(flTime, floatround_floor) / 60;
+	seconds = flTime - (60 * minutes);
+	get_mapname(szMap, charsmax(szMap));
+	get_pcvar_string(pcvar_kz_discord_webhook, szWebhook, charsmax(szWebhook));
+	get_pcvar_string(pcvar_kz_discord_service, szURL, charsmax(szURL));
+
+	if (equal(szWebhook, "") || equal(szURL, ""))
+		return;
+
+	switch (type)
+	{
+		case 0: szType = "pure";
+		case 1: szType = "pro";
+		case 2: szType = "noob";
+	}
+	formatex(szTime, charsmax(szTime), "%02d:%06.3f", minutes, seconds);
+
+	new JSON:root = json_init_object();
+	json_object_set_string(root, "holder", szName);
+	json_object_set_string(root, "time", szTime);
+	json_object_set_string(root, "type", szType);
+	json_object_set_string(root, "map", szMap);
+	json_object_set_string(root, "webhook", szWebhook);
+
+	new JSONArray:records = json_init_array();
+	for (new i = 0; i < 5; i++)
+	{
+		ArrayGetArray(arr, i, stats);
+
+		// TODO: Solve UTF halfcut at the end
+		stats[STATS_NAME][17] = EOS;
+
+		minutes = floatround(stats[STATS_TIME], floatround_floor) / 60;
+		seconds = stats[STATS_TIME] - (60 * minutes);
+
+		formatex(szRecTime, charsmax(szRecTime), "%02d:%06.3f", minutes, seconds);
+		format_time(szRecDate, charsmax(szRecDate), "%d/%m/%Y", stats[STATS_TIMESTAMP]);
+		
+		new JSON:record = json_init_object();
+		json_object_set_string(record, "name", stats[STATS_NAME]);
+		json_object_set_string(record, "time", szRecTime);
+		json_object_set_string(record, "date", szRecDate);
+		json_array_append_value(records, record);
+	}
+	json_object_set_value(root, "records", records);
+	json_serial_to_string(root, szPostdata, charsmax(szPostdata));
+    json_free(records);
+    json_free(root);
+
+    curl = curl_init();
+    curl_setopt_string(curl, CURLOPT_URL, szURL);
+	curl_setopt_cell(curl, CURLOPT_FAILONERROR, 1);
+    curl_setopt_cell(curl, CURLOPT_FOLLOWLOCATION, 0);
+    curl_setopt_cell(curl, CURLOPT_FORBID_REUSE, 1);
+    curl_setopt_cell(curl, CURLOPT_FRESH_CONNECT, 1);
+    curl_setopt_cell(curl, CURLOPT_CONNECTTIMEOUT, 10);
+    curl_setopt_cell(curl, CURLOPT_TIMEOUT, 10);
+    curl_setopt_handle(curl, CURLOPT_HTTPHEADER, header);
+    curl_setopt_cell(curl, CURLOPT_POST, 1);
+    curl_setopt_string(curl, CURLOPT_POSTFIELDS, szPostdata);
+    //curl_thread_exec(curl, "OnExecComplete");
+    curl_thread_exec(curl, "OnExecComplete");
+}
+
+public OnExecComplete(Handle:curl, CURLcode:code, const response[], any:eventType)
+{
+    curl_close(curl);
+    //curl_destroy_slist(header);
+}