Merge pull request #172 from sapphonie/general-ban-msgs

Generalized ban msgs

scripting/stac.sp

@@ -21,7 +21,9 @@
     #define MAXPLAYERS 101
 #endif
 
+#if !defined (AUTOLOAD_EXTENSIONS)
 #define AUTOLOAD_EXTENSIONS
+#endif
 // REQUIRED extensions:
 // SteamWorks for being able to make webrequests: https://forums.alliedmods.net/showthread.php?t=229556
 // Get latest version from here: https://github.com/KyleSanderson/SteamWorks/releases
@@ -53,7 +55,7 @@
 #pragma semicolon 1
 #pragma newdecls required
 
-#define PLUGIN_VERSION  "6.1.1"
+#define PLUGIN_VERSION  "6.1.2"
 
 #define UPDATE_URL      "https://raw.githubusercontent.com/sapphonie/StAC-tf2/master/updatefile.txt"
 

scripting/stac/stac_cvars.sp

@@ -109,6 +109,25 @@ void initCvars()
     );
     HookConVarChange(stac_ban_for_misccheats, setStacVars);
 
+
+
+    stac_generic_ban_msgs =
+    AutoExecConfig_CreateConVar
+    (
+        "stac_generic_ban_msgs",
+        "1",
+        "[StAC] Use a generic message when banning clients - this goes in SourceBans, chat, and other public places, but it does NOT change your logs.\n\
+        You should almost always leave this alone.\n\
+        (recommended 1)",
+        FCVAR_NONE,
+        true,
+        0.0,
+        true,
+        1.0
+    );
+
+
+
     // cheatvars ban bool
     if (optimizeCvars)
     {

scripting/stac/stac_globals.sp

@@ -11,6 +11,7 @@ ConVar stac_ban_duration;
 ConVar stac_verbose_info;
 ConVar stac_max_allowed_turn_secs;
 ConVar stac_ban_for_misccheats;
+ConVar stac_generic_ban_msgs;
 ConVar stac_optimize_cvars;
 ConVar stac_max_aimsnap_detections;
 ConVar stac_max_psilent_detections;

scripting/stac/stac_stocks.sp

@@ -25,8 +25,11 @@ void OpenStacLog()
     if (!DirExists(path, false))
     {
         LogMessage("[StAC] StAC directory not extant! Creating...");
-        // 511 = unix 775 ?
-        if (!CreateDirectory(path, 511, false))
+        // chmod perms - rwxrwxr-x . it needs to be octal.
+        // yes I could use the FPERM flags but pawn doesn't have constexpr and i don't want to make a mess
+        // with a bunch of ORs and not being able to check it in my IDE
+        static int perms = 0o775;
+        if (!CreateDirectory(path, perms, false))
         {
             LogMessage("[StAC] StAC directory could not be created!");
         }
@@ -47,6 +50,10 @@ void CloseStacLog()
 }
 
 // log to StAC log file
+// This strips color strings, e.g.
+// {color}test{color2}
+// will become
+// test
 void StacLog(const char[] format, any ...)
 {
     // crutch for reloading the plugin and still printing to our log file
@@ -80,6 +87,8 @@ void StacLog(const char[] format, any ...)
     char colored_buffer[254];
     strcopy(colored_buffer, sizeof(colored_buffer), buffer);
 
+    // strip out any instances of "[StAC] " at the front of the string so we don't get double instances of it later
+    ReplaceStringEx(colored_buffer, sizeof(colored_buffer), "[StAC] ", "", 7, -1, true);
 
     if (StrEqual(os, "linux"))
     {
@@ -393,18 +402,30 @@ bool IsValidSrcTV(int client)
 
 /********** MISC FUNCS **********/
 
-void BanUser(int userid, char[] reason, char[] pubreason)
+void BanUser(int userid, char reason[128], char pubreason[256])
 {
     int cl = GetClientOfUserId(userid);
 
     // prevent double bans
     if (userBanQueued[cl])
     {
-        KickClient(cl, "Banned by StAC");
+        KickClient(cl, "Banned from server");
         return;
     }
 
     StacNotify(userid, reason);
+
+    char cleaned_pubreason[256];
+    if ( stac_generic_ban_msgs.BoolValue )
+    {
+        Format(reason,              sizeof(reason),             "%t", "GenericBanMsg", cl);
+        Format(cleaned_pubreason,   sizeof(cleaned_pubreason),  "%t", "GenericBanAllChat", cl);
+    }
+    else
+    {
+        strcopy(cleaned_pubreason, sizeof(cleaned_pubreason), pubreason);
+    }
+
     // make sure we dont detect on already banned players
     userBanQueued[cl] = true;
 
@@ -466,7 +487,7 @@ void BanUser(int userid, char[] reason, char[] pubreason)
         // KickClient(cl, "%s", reason);
     }
 
-    MC_PrintToChatAll("%s", pubreason);
+    MC_PrintToChatAll("%s", cleaned_pubreason);
     StacLog("%s", pubreason);
 }
 

translations/stac.phrases.txt

@@ -4,7 +4,15 @@
         - kick and ban messages already have a period at the end of them in TF2, so don't add one
         - ban messages get printed to banned client as the kick reason if not using sourcebans and posted to sourcebans as the "ban reason" if you have it installed
     */
-
+    "GenericBanAllChat"
+    {
+        "#format"    "{1:N}"
+        "en"         "{hotpink}[StAC]{white} Player {1} was {palegreen}BANNED{white} for {mediumpurple}cheating{white}!"
+    }
+    "GenericBanMsg"
+    {
+        "en"         "[StAC] Banned for cheating"
+    }
     /*
 
             ____  __      _                _