Gag fixes (#68)

* 🏡 add default gag reasons templates

* 🧃 fix gag reasons length from config

* ☕ load configs before gag plugin init

* 🎶 FIX error on config loading (#49)

* 🖥️ add new publish script

* 🍂 Get reason flags from template (#42)

* 🦠 FIX non block /chat cmds for other plugins (#41)

Author: wopox1337

.gitignore

@@ -1,3 +1,5 @@
 *.amxx
 .vscode/*
-publish/
+*publish/
+/.temp
+/.compiler

cstrike/addons/amxmodx/configs/ChatAdditions/gag_reasons.cfg

@@ -1,6 +1,7 @@
-ca_gag_add_reason "Reason #1" "bc" "30"
-ca_gag_add_reason "Reason #2" "bc" "30"
-ca_gag_add_reason "Reason #3" "bc" "30"
-ca_gag_add_reason "Reason #4" "bc" "30"
+ca_gag_add_reason "Маты / оскорбления" "abc" "5"
+ca_gag_add_reason "Флуд" "abc" "10"
+ca_gag_add_reason "Мониторинг" "abc" "30"
+ca_gag_add_reason "Реклама" "abc" "60"
+ca_gag_add_reason "Неадекватное поведение" "abc" "1440"
 
 ca_gag_times "1, 5, 30, 60, 1440, 10080"

cstrike/addons/amxmodx/scripting/CA_Gag.sma

@@ -46,6 +46,9 @@ public plugin_precache() {
 	register_dictionary("common.txt");
 	register_dictionary("time.txt");
 
+	g_aReasons = ArrayCreate(gag_s);
+	g_aGagTimes = ArrayCreate();
+
 	bind_pcvar_num(get_cvar_pointer("ca_log_type"), ca_log_type);
 	hook_cvar_change(get_cvar_pointer("ca_log_level"), "Hook_CVar_LogLevel");
 	GetLogsFilePath(g_sLogsFile, .sDir = LOG_DIR_NAME);
@@ -57,9 +60,6 @@ public plugin_precache() {
 
 	bind_pcvar_num(create_cvar("ca_gag_menu_type", "1"), ca_gag_menu_type);
 
-	g_aReasons = ArrayCreate(gag_s);
-	g_aGagTimes = ArrayCreate();
-
 	register_srvcmd("ca_gag_add_reason", "SrvCmd_AddReason");
 	register_srvcmd("ca_gag_show_templates", "SrvCmd_ShowTemplates"); // debug
 	register_srvcmd("ca_gag_reload_config", "SrvCmd_ReloadConfig");
@@ -83,6 +83,9 @@ public plugin_init() {
 	new sLogLevel[MAX_LOGLEVEL_LEN];
 	get_cvar_string("ca_log_level", sLogLevel, charsmax(sLogLevel));
 	ca_log_level = ParseLogLevel(sLogLevel);
+	
+	_LoadConfig();
+	_ParseTimes();
 
 	CA_Log(_Info, "[CA]: Gag initialized!")
 }
@@ -91,11 +94,6 @@ public Hook_CVar_LogLevel(pcvar, const old_value[], const new_value[]) {
 	ca_log_level = ParseLogLevel(new_value);
 }
 
-public OnConfigsExecuted() {
-	_LoadConfig();
-	_ParseTimes();
-}
-
 public plugin_natives() {
 	register_library("ChatAdditions_GAG_API");
 	set_native_filter("native_filter");
@@ -520,13 +518,11 @@ public Menu_Handler_SelectReason(id, menu, item) {
 	new aReason[gag_s];
 	ArrayGetArray(g_aReasons, iReason, aReason);
 
+	// Get predefined reason params
 	copy(g_aGags_AdminEditor[id][_Reason], charsmax(g_aGags_AdminEditor[][_Reason]), aReason[_Reason]);
-
-	// IF NEED OFC
+	g_aGags_AdminEditor[id][_bitFlags] = aReason[_bitFlags];
 	g_aGags_AdminEditor[id][_Time] = aReason[_Time];
 
-	// CA_Log("aReason[_Time]=%i, aReason[_Reason]=%s", aReason[_Time], aReason[_Reason])
-
 	if(ca_gag_menu_type == _MenuType_Custom) {
 		Menu_Show_GagProperties(id);
 	} else if(ca_gag_menu_type == _MenuType_Sequential) {
@@ -701,7 +697,7 @@ Get_GagStringReason(const id, const target) {
 public SrvCmd_AddReason() {
 	enum any: args_s { arg0, arg1, arg2, arg3 };
 
-	new szArgs[args_s][32];
+	new szArgs[args_s][256];
 	for(new iArg = arg0; iArg < sizeof szArgs; iArg++)
 		read_argv(iArg, szArgs[iArg], charsmax(szArgs[]));
 
@@ -721,7 +717,7 @@ public SrvCmd_AddReason() {
 	ArrayPushArray(g_aReasons, aReason);
 	g_iArraySize_Reasons = ArraySize(g_aReasons);
 
-	CA_Log(_Warnings, "ADD: Reason[#%i]: '%s' (Flags:'%s', Time:'%i s.')",\
+	CA_Log(_Debug, "ADD: Reason[#%i]: '%s' (Flags:'%s', Time:'%i s.')",\
 		g_iArraySize_Reasons, aReason[_Reason], bits_to_flags(aReason[_bitFlags]), aReason[_Time]\
 	)
 }
@@ -735,7 +731,7 @@ public SrvCmd_ShowTemplates() {
 			new aReason[gag_s];
 			ArrayGetArray(g_aReasons, i, aReason);
 
-			CA_Log(_Warnings, "Reason[#%i]: '%s' (Flags:'%s', Time:'%i')",\
+			CA_Log(_Info, "Reason[#%i]: '%s' (Flags:'%s', Time:'%i')",\
 				i, aReason[_Reason], bits_to_flags(aReason[_bitFlags]), aReason[_Time]\
 			)
 		}
@@ -761,7 +757,12 @@ public Hook_CVar_Times(pcvar, const old_value[], const new_value[]) {
 }
 
 static _LoadConfig() {
-	ArrayClear(g_aReasons);
+	if(!g_aReasons) {
+		ArrayCreate(g_aReasons);
+	} else if(ArraySize(g_aReasons) > 0) {
+		ArrayClear(g_aReasons);
+	}
+
 	new sConfigsDir[PLATFORM_MAX_PATH];
 	get_configsdir(sConfigsDir, charsmax(sConfigsDir));
 	server_cmd("exec %s/ChatAdditions/gag_reasons.cfg", sConfigsDir);

cstrike/addons/amxmodx/scripting/ChatAdditions_Core.sma

@@ -58,14 +58,14 @@ public ClCmd_Hook_Say(id) {
 	static retVal;
 	ExecuteForward(g_pFwd_Client_Say, retVal, id);
 
-	return (retVal == CA_SUPERCEDE) ? PLUGIN_HANDLED : PLUGIN_CONTINUE;
+	return (retVal == CA_SUPERCEDE) ? PLUGIN_HANDLED_MAIN : PLUGIN_CONTINUE;
 }
 
 public ClCmd_Hook_SayTeam(id) {
 	static retVal;
 	ExecuteForward(g_pFwd_Client_SayTeam, retVal, id);
 
-	return (retVal == CA_SUPERCEDE) ? PLUGIN_HANDLED : PLUGIN_CONTINUE;
+	return (retVal == CA_SUPERCEDE) ? PLUGIN_HANDLED_MAIN : PLUGIN_CONTINUE;
 }
 
 public CSGameRules_CanPlayerHearPlayer(const listener, const sender) {

publish.sh

@@ -0,0 +1,77 @@
+#!/bin/bash          
+
+########################
+AMXX_SCRIPTING_PATH=""
+OUTPUT_DIR="_PUBLISH"
+RELEASE_NAME="ChatAdditions_publish"
+AMXMODX="1.9"
+########################
+COMPILER_PATH=".compiler"
+
+if [ ! -d ${COMPILER_PATH} ]; then
+    TEMPDIR="./.temp"
+
+    mkdir ${TEMPDIR}
+    AMXX_FILENAME=$(curl https://www.amxmodx.org/amxxdrop/${AMXMODX}/amxmodx-latest-base-linux)
+    curl -s https://www.amxmodx.org/amxxdrop/${AMXMODX}/${AMXX_FILENAME} | tar -xz -C ${TEMPDIR}
+
+    AMXX_FILENAME=$(curl https://www.amxmodx.org/amxxdrop/${AMXMODX}/amxmodx-latest-base-windows)
+    curl https://www.amxmodx.org/amxxdrop/${AMXMODX}/${AMXX_FILENAME} -o amxmodx.zip
+    unzip -o amxmodx.zip -d ${TEMPDIR}
+    rm amxmodx.zip
+
+    curl -OL https://github.com/s1lentq/reapi/releases/download/5.19.0.211/reapi_5.19.0.211-dev.zip
+    unzip -o reapi_*-dev.zip -d ${TEMPDIR}
+    rm reapi_*-dev.zip
+
+    rm -rf ${TEMPDIR}/addons/amxmodx/scripting/testsuite/
+    rm -rf ${TEMPDIR}/addons/amxmodx/scripting/*.sma
+    rm -rf ${TEMPDIR}/addons/amxmodx/plugins/*.amxx
+
+    mkdir -p ${COMPILER_PATH}
+    mv -f ${TEMPDIR}/addons/amxmodx/scripting/* ${COMPILER_PATH}
+
+    rm -rf ${TEMPDIR}
+
+    echo -e "\n=========================\n > Compiler ${AMXX_FILENAME} and ReAPI succefully downloaded!"
+else
+    echo -e "\n=========================\n > Compiler found at: ${COMPILER_PATH} path"
+fi
+
+AMXX_SCRIPTING_PATH=${COMPILER_PATH}
+amxxpc="${AMXX_SCRIPTING_PATH}/amxxpc"
+
+case "$OSTYPE" in
+  msys*)    amxxpc="${amxxpc}.exe" ;;
+  *)        echo "unknown: $OSTYPE" ;;
+esac
+
+function realpath {
+    echo $(cd $(dirname $1); pwd)/$(basename $1);
+}
+amxxpc=$(realpath ${amxxpc})
+
+# Create dir
+rm -rf ${OUTPUT_DIR} && mkdir ${OUTPUT_DIR}
+mkdir -p ${OUTPUT_DIR}/addons/amxmodx/plugins/
+
+scripting_dir=${OUTPUT_DIR}/addons/amxmodx/scripting
+cp -rp cstrike/addons/amxmodx/*    ${OUTPUT_DIR}/addons/amxmodx/
+cp -rp cstrike/addons/amxmodx/scripting/    ${scripting_dir}
+# cp -rp extra/*           ${OUTPUT_DIR}
+
+# Compile
+cd ${scripting_dir}
+echo " > Current dir=${scripting_dir}"
+echo " > amxxpc path=${amxxpc}"
+
+find * -name "*.sma" \
+    -exec echo -e "\n\n> Compile {} <" \;\
+    -exec ${amxxpc} {} \
+        -iinclude \
+        -o../plugins/{} \
+    \;
+
+# Pack to release
+cd ../../../
+tar -czpf ${RELEASE_NAME}.tar.gz *