[3.3.5] ChatCommands, the other half: chat command resolution refactor (PR #25463)

(cherry picked from commit 1eca51b417678b9a48b28552925d5694105f82bb)

3 files changed, 50 insertions, 90 deletions

diff --git a/src/server/game/Accounts/BattlenetAccountMgr.cpp b/src/server/game/Accounts/BattlenetAccountMgr.cpp
index a726fdf5c7d..a204e99f337 100644
--- a/src/server/game/Accounts/BattlenetAccountMgr.cpp
+++ b/src/server/game/Accounts/BattlenetAccountMgr.cpp
@@ -90,7 +90,7 @@ bool Battlenet::AccountMgr::CheckPassword(uint32 accountId, std::string password
     return LoginDatabase.Query(stmt) != nullptr;
 }
 
-AccountOpResult Battlenet::AccountMgr::LinkWithGameAccount(std::string const& email, std::string const& gameAccountName)
+AccountOpResult Battlenet::AccountMgr::LinkWithGameAccount(std::string_view email, std::string_view gameAccountName)
 {
     uint32 bnetAccountId = GetId(email);
     if (!bnetAccountId)
@@ -111,7 +111,7 @@ AccountOpResult Battlenet::AccountMgr::LinkWithGameAccount(std::string const& em
     return AccountOpResult::AOR_OK;
 }
 
-AccountOpResult Battlenet::AccountMgr::UnlinkGameAccount(std::string const& gameAccountName)
+AccountOpResult Battlenet::AccountMgr::UnlinkGameAccount(std::string_view gameAccountName)
 {
     uint32 gameAccountId = GameAccountMgr::GetId(gameAccountName);
     if (!gameAccountId)
@@ -128,10 +128,10 @@ AccountOpResult Battlenet::AccountMgr::UnlinkGameAccount(std::string const& game
     return AccountOpResult::AOR_OK;
 }
 
-uint32 Battlenet::AccountMgr::GetId(std::string const& username)
+uint32 Battlenet::AccountMgr::GetId(std::string_view username)
 {
     LoginDatabasePreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_BNET_ACCOUNT_ID_BY_EMAIL);
-    stmt->setString(0, username);
+    stmt->setStringView(0, username);
     if (PreparedQueryResult result = LoginDatabase.Query(stmt))
         return (*result)[0].GetUInt32();
 
@@ -172,7 +172,7 @@ uint8 Battlenet::AccountMgr::GetMaxIndex(uint32 accountId)
     return 0;
 }
 
-std::string Battlenet::AccountMgr::CalculateShaPassHash(std::string const& name, std::string const& password)
+std::string Battlenet::AccountMgr::CalculateShaPassHash(std::string_view name, std::string_view password)
 {
     Trinity::Crypto::SHA256 email;
     email.UpdateData(name);
diff --git a/src/server/game/Accounts/BattlenetAccountMgr.h b/src/server/game/Accounts/BattlenetAccountMgr.h
index 8221896eb11..43c60c5b006 100644
--- a/src/server/game/Accounts/BattlenetAccountMgr.h
+++ b/src/server/game/Accounts/BattlenetAccountMgr.h
@@ -32,15 +32,15 @@ namespace Battlenet
         TC_GAME_API AccountOpResult CreateBattlenetAccount(std::string email, std::string password, bool withGameAccount, std::string* gameAccountName);
         TC_GAME_API AccountOpResult ChangePassword(uint32 accountId, std::string newPassword);
         TC_GAME_API bool CheckPassword(uint32 accountId, std::string password);
-        TC_GAME_API AccountOpResult LinkWithGameAccount(std::string const& email, std::string const& gameAccountName);
-        TC_GAME_API AccountOpResult UnlinkGameAccount(std::string const& gameAccountName);
+        TC_GAME_API AccountOpResult LinkWithGameAccount(std::string_view email, std::string_view gameAccountName);
+        TC_GAME_API AccountOpResult UnlinkGameAccount(std::string_view gameAccountName);
 
-        TC_GAME_API uint32 GetId(std::string const& username);
+        TC_GAME_API uint32 GetId(std::string_view username);
         TC_GAME_API bool GetName(uint32 accountId, std::string& name);
         TC_GAME_API uint32 GetIdByGameAccount(uint32 gameAccountId);
         TC_GAME_API uint8 GetMaxIndex(uint32 accountId);
 
-        TC_GAME_API std::string CalculateShaPassHash(std::string const& name, std::string const& password);
+        TC_GAME_API std::string CalculateShaPassHash(std::string_view name, std::string_view password);
     }
 }
 
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
index 95f1df06e1b..408da2515dc 100644
--- a/src/server/game/Accounts/RBAC.h
+++ b/src/server/game/Accounts/RBAC.h
@@ -105,6 +105,12 @@ enum RBACPermissions
 
     // Free space for core permissions (till 149)
     // Roles (Permissions with delegated permissions) use 199 and descending
+
+    RBAC_ROLE_ADMINISTRATOR                                  = 196,
+    RBAC_ROLE_GAMEMASTER                                     = 197,
+    RBAC_ROLE_MODERATOR                                      = 198,
+    RBAC_ROLE_PLAYER                                         = 199,
+
     RBAC_PERM_COMMAND_RBAC                                   = 200,
     RBAC_PERM_COMMAND_RBAC_ACC                               = 201,
     RBAC_PERM_COMMAND_RBAC_ACC_PERM_LIST                     = 202,
@@ -117,7 +123,7 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_BNET_ACCOUNT_LOCK_COUNTRY              = 209,
     RBAC_PERM_COMMAND_BNET_ACCOUNT_LOCK_IP                   = 210,
     RBAC_PERM_COMMAND_BNET_ACCOUNT_PASSWORD                  = 211,
-    RBAC_PERM_COMMAND_BNET_ACCOUNT_SET                       = 212,
+    // 212 previously used, do not reuse
     RBAC_PERM_COMMAND_BNET_ACCOUNT_SET_PASSWORD              = 213,
     RBAC_PERM_COMMAND_BNET_ACCOUNT_LINK                      = 214,
     RBAC_PERM_COMMAND_BNET_ACCOUNT_UNLINK                    = 215,
@@ -135,41 +141,41 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_ACCOUNT_SET_ADDON                      = 227,
     RBAC_PERM_COMMAND_ACCOUNT_SET_SECLEVEL                   = 228,
     RBAC_PERM_COMMAND_ACCOUNT_SET_PASSWORD                   = 229,
-    RBAC_PERM_COMMAND_ACHIEVEMENT                            = 230,
+    // 230 previously used, do not reuse
     RBAC_PERM_COMMAND_ACHIEVEMENT_ADD                        = 231,
-    RBAC_PERM_COMMAND_ARENA                                  = 232,
+    // 232 previously used, do not reuse
     RBAC_PERM_COMMAND_ARENA_CAPTAIN                          = 233,
     RBAC_PERM_COMMAND_ARENA_CREATE                           = 234,
     RBAC_PERM_COMMAND_ARENA_DISBAND                          = 235,
     RBAC_PERM_COMMAND_ARENA_INFO                             = 236,
     RBAC_PERM_COMMAND_ARENA_LOOKUP                           = 237,
     RBAC_PERM_COMMAND_ARENA_RENAME                           = 238,
-    RBAC_PERM_COMMAND_BAN                                    = 239,
+    // 239 previously used, do not reuse
     RBAC_PERM_COMMAND_BAN_ACCOUNT                            = 240,
     RBAC_PERM_COMMAND_BAN_CHARACTER                          = 241,
     RBAC_PERM_COMMAND_BAN_IP                                 = 242,
     RBAC_PERM_COMMAND_BAN_PLAYERACCOUNT                      = 243,
-    RBAC_PERM_COMMAND_BANINFO                                = 244,
+    // 244 previously used, do not reuse
     RBAC_PERM_COMMAND_BANINFO_ACCOUNT                        = 245,
     RBAC_PERM_COMMAND_BANINFO_CHARACTER                      = 246,
     RBAC_PERM_COMMAND_BANINFO_IP                             = 247,
-    RBAC_PERM_COMMAND_BANLIST                                = 248,
+    // 248 previously used, do not reuse
     RBAC_PERM_COMMAND_BANLIST_ACCOUNT                        = 249,
     RBAC_PERM_COMMAND_BANLIST_CHARACTER                      = 250,
     RBAC_PERM_COMMAND_BANLIST_IP                             = 251,
-    RBAC_PERM_COMMAND_UNBAN                                  = 252,
+    // 252 previously used, do not reuse
     RBAC_PERM_COMMAND_UNBAN_ACCOUNT                          = 253,
     RBAC_PERM_COMMAND_UNBAN_CHARACTER                        = 254,
     RBAC_PERM_COMMAND_UNBAN_IP                               = 255,
     RBAC_PERM_COMMAND_UNBAN_PLAYERACCOUNT                    = 256,
-    RBAC_PERM_COMMAND_BF                                     = 257,
+    // 257 previously used, do not reuse
     RBAC_PERM_COMMAND_BF_START                               = 258,
     RBAC_PERM_COMMAND_BF_STOP                                = 259,
     RBAC_PERM_COMMAND_BF_SWITCH                              = 260,
     RBAC_PERM_COMMAND_BF_TIMER                               = 261,
     RBAC_PERM_COMMAND_BF_ENABLE                              = 262,
     RBAC_PERM_COMMAND_ACCOUNT_EMAIL                          = 263,
-    RBAC_PERM_COMMAND_ACCOUNT_SET_SEC                        = 264,
+    // 264 previously used, do not reuse
     RBAC_PERM_COMMAND_ACCOUNT_SET_SEC_EMAIL                  = 265,
     RBAC_PERM_COMMAND_ACCOUNT_SET_SEC_REGMAIL                = 266,
     RBAC_PERM_COMMAND_CAST                                   = 267,
@@ -178,11 +184,11 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_CAST_SELF                              = 270,
     RBAC_PERM_COMMAND_CAST_TARGET                            = 271,
     RBAC_PERM_COMMAND_CAST_DEST                              = 272,
-    RBAC_PERM_COMMAND_CHARACTER                              = 273,
+    // 273 previously used, do not reuse
     RBAC_PERM_COMMAND_CHARACTER_CUSTOMIZE                    = 274,
     RBAC_PERM_COMMAND_CHARACTER_CHANGEFACTION                = 275,
     RBAC_PERM_COMMAND_CHARACTER_CHANGERACE                   = 276,
-    RBAC_PERM_COMMAND_CHARACTER_DELETED                      = 277,
+    // 277 previously used, do not reuse
     RBAC_PERM_COMMAND_CHARACTER_DELETED_DELETE               = 278,
     RBAC_PERM_COMMAND_CHARACTER_DELETED_LIST                 = 279,
     RBAC_PERM_COMMAND_CHARACTER_DELETED_RESTORE              = 280,
@@ -193,10 +199,10 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_CHARACTER_REPUTATION                   = 285,
     RBAC_PERM_COMMAND_CHARACTER_TITLES                       = 286,
     RBAC_PERM_COMMAND_LEVELUP                                = 287,
-    RBAC_PERM_COMMAND_PDUMP                                  = 288,
+    // 288 previously used, do not reuse
     RBAC_PERM_COMMAND_PDUMP_LOAD                             = 289,
     RBAC_PERM_COMMAND_PDUMP_WRITE                            = 290,
-    RBAC_PERM_COMMAND_CHEAT                                  = 291,
+    // 291 previously used, do not reuse
     RBAC_PERM_COMMAND_CHEAT_CASTTIME                         = 292,
     RBAC_PERM_COMMAND_CHEAT_COOLDOWN                         = 293,
     RBAC_PERM_COMMAND_CHEAT_EXPLORE                          = 294,
@@ -206,55 +212,13 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_CHEAT_TAXI                             = 298,
     RBAC_PERM_COMMAND_CHEAT_WATERWALK                        = 299,
     RBAC_PERM_COMMAND_DEBUG                                  = 300,
-    RBAC_PERM_COMMAND_DEBUG_ANIM                             = 301,
-    RBAC_PERM_COMMAND_DEBUG_AREATRIGGERS                     = 302,
-    RBAC_PERM_COMMAND_DEBUG_ARENA                            = 303,
-    RBAC_PERM_COMMAND_DEBUG_BG                               = 304,
-    RBAC_PERM_COMMAND_DEBUG_ENTERVEHICLE                     = 305,
-    RBAC_PERM_COMMAND_DEBUG_GETITEMSTATE                     = 306,
-    RBAC_PERM_COMMAND_DEBUG_GETITEMVALUE                     = 307, // DEPRECATED: DON'T REUSE
-    RBAC_PERM_COMMAND_DEBUG_GETVALUE                         = 308, // DEPRECATED: DON'T REUSE
-    RBAC_PERM_COMMAND_DEBUG_COMBAT                           = 309,
-    RBAC_PERM_COMMAND_DEBUG_ITEMEXPIRE                       = 310,
-    RBAC_PERM_COMMAND_DEBUG_LOOTRECIPIENT                    = 311,
-    RBAC_PERM_COMMAND_DEBUG_LOS                              = 312,
-    RBAC_PERM_COMMAND_DEBUG_MOD32VALUE                       = 313, // DEPRECATED: DON'T REUSE
-    RBAC_PERM_COMMAND_DEBUG_MOVEFLAGS                        = 314,
-    RBAC_PERM_COMMAND_DEBUG_PLAY                             = 315,
-    RBAC_PERM_COMMAND_DEBUG_PLAY_CINEMATIC                   = 316,
-    RBAC_PERM_COMMAND_DEBUG_PLAY_MOVIE                       = 317,
-    RBAC_PERM_COMMAND_DEBUG_PLAY_SOUND                       = 318,
-    RBAC_PERM_COMMAND_DEBUG_SEND                             = 319,
-    RBAC_PERM_COMMAND_DEBUG_SEND_BUYERROR                    = 320,
-    RBAC_PERM_COMMAND_DEBUG_SEND_CHANNELNOTIFY               = 321,
-    RBAC_PERM_COMMAND_DEBUG_SEND_CHATMESSAGE                 = 322,
-    RBAC_PERM_COMMAND_DEBUG_SEND_EQUIPERROR                  = 323,
-    RBAC_PERM_COMMAND_DEBUG_SEND_LARGEPACKET                 = 324,
-    RBAC_PERM_COMMAND_DEBUG_SEND_OPCODE                      = 325,
-    RBAC_PERM_COMMAND_DEBUG_SEND_QINVALIDMSG                 = 326,
-    RBAC_PERM_COMMAND_DEBUG_SEND_QPARTYMSG                   = 327,
-    RBAC_PERM_COMMAND_DEBUG_SEND_SELLERROR                   = 328,
-    RBAC_PERM_COMMAND_DEBUG_SEND_SETPHASESHIFT               = 329,
-    RBAC_PERM_COMMAND_DEBUG_SEND_SPELLFAIL                   = 330,
-    RBAC_PERM_COMMAND_DEBUG_SETAURASTATE                     = 331,
-    RBAC_PERM_COMMAND_DEBUG_SETBIT                           = 332, // DEPRECATED: DON'T REUSE
-    RBAC_PERM_COMMAND_DEBUG_SETITEMVALUE                     = 333, // DEPRECATED: DON'T REUSE
-    RBAC_PERM_COMMAND_DEBUG_SETVALUE                         = 334, // DEPRECATED: DON'T REUSE
-    RBAC_PERM_COMMAND_DEBUG_SETVID                           = 335,
-    RBAC_PERM_COMMAND_DEBUG_SPAWNVEHICLE                     = 336,
-    RBAC_PERM_COMMAND_DEBUG_THREAT                           = 337,
-    RBAC_PERM_COMMAND_DEBUG_UPDATE                           = 338, // DEPRECATED: DON'T REUSE
-    RBAC_PERM_COMMAND_DEBUG_WORLDSTATE                       = 339,
-    RBAC_PERM_COMMAND_WPGPS                                  = 340,
-    RBAC_PERM_COMMAND_DESERTER                               = 341,
-    RBAC_PERM_COMMAND_DESERTER_BG                            = 342,
+    // 301-342 previously used, do not reuse
     RBAC_PERM_COMMAND_DESERTER_BG_ADD                        = 343,
     RBAC_PERM_COMMAND_DESERTER_BG_REMOVE                     = 344,
-    RBAC_PERM_COMMAND_DESERTER_INSTANCE                      = 345,
+    // 345 previously used, do not reuse
     RBAC_PERM_COMMAND_DESERTER_INSTANCE_ADD                  = 346,
     RBAC_PERM_COMMAND_DESERTER_INSTANCE_REMOVE               = 347,
-    RBAC_PERM_COMMAND_DISABLE                                = 348,
-    RBAC_PERM_COMMAND_DISABLE_ADD                            = 349,
+    // 348-349 previously used, do not reuse
     RBAC_PERM_COMMAND_DISABLE_ADD_CRITERIA                   = 350,
     RBAC_PERM_COMMAND_DISABLE_ADD_BATTLEGROUND               = 351,
     RBAC_PERM_COMMAND_DISABLE_ADD_MAP                        = 352,
@@ -263,7 +227,7 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_DISABLE_ADD_QUEST                      = 355,
     RBAC_PERM_COMMAND_DISABLE_ADD_SPELL                      = 356,
     RBAC_PERM_COMMAND_DISABLE_ADD_VMAP                       = 357,
-    RBAC_PERM_COMMAND_DISABLE_REMOVE                         = 358,
+    // 358 previously used, do not reuse
     RBAC_PERM_COMMAND_DISABLE_REMOVE_CRITERIA                = 359,
     RBAC_PERM_COMMAND_DISABLE_REMOVE_BATTLEGROUND            = 360,
     RBAC_PERM_COMMAND_DISABLE_REMOVE_MAP                     = 361,
@@ -272,7 +236,7 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_DISABLE_REMOVE_QUEST                   = 364,
     RBAC_PERM_COMMAND_DISABLE_REMOVE_SPELL                   = 365,
     RBAC_PERM_COMMAND_DISABLE_REMOVE_VMAP                    = 366,
-    RBAC_PERM_COMMAND_EVENT                                  = 367,
+    RBAC_PERM_COMMAND_EVENT_INFO                             = 367,
     RBAC_PERM_COMMAND_EVENT_ACTIVELIST                       = 368,
     RBAC_PERM_COMMAND_EVENT_START                            = 369,
     RBAC_PERM_COMMAND_EVENT_STOP                             = 370,
@@ -292,7 +256,7 @@ enum RBACPermissions
     //                                                       = 384, // DEPRECATED: DON'T REUSE
     //                                                       = 385, // DEPRECATED: DON'T REUSE
     //                                                       = 386, // DEPRECATED: DON'T REUSE
-    RBAC_PERM_COMMAND_GOBJECT                                = 387,
+    // 387 previously used, do not reuse
     RBAC_PERM_COMMAND_GOBJECT_ACTIVATE                       = 388,
     RBAC_PERM_COMMAND_GOBJECT_ADD                            = 389,
     RBAC_PERM_COMMAND_GOBJECT_ADD_TEMP                       = 390,
@@ -300,12 +264,12 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_GOBJECT_INFO                           = 392,
     RBAC_PERM_COMMAND_GOBJECT_MOVE                           = 393,
     RBAC_PERM_COMMAND_GOBJECT_NEAR                           = 394,
-    RBAC_PERM_COMMAND_GOBJECT_SET                            = 395,
+    // 395 previously used, do not reuse
     RBAC_PERM_COMMAND_GOBJECT_SET_PHASE                      = 396,
     RBAC_PERM_COMMAND_GOBJECT_SET_STATE                      = 397,
     RBAC_PERM_COMMAND_GOBJECT_TARGET                         = 398,
     RBAC_PERM_COMMAND_GOBJECT_TURN                           = 399,
-    RBAC_PERM_COMMAND_DEBUG_TRANSPORT                        = 400,
+    // 400 previously used, do not reuse
     RBAC_PERM_COMMAND_GUILD                                  = 401,
     RBAC_PERM_COMMAND_GUILD_CREATE                           = 402,
     RBAC_PERM_COMMAND_GUILD_DELETE                           = 403,
@@ -323,7 +287,7 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_INSTANCE_STATS                         = 415,
     RBAC_PERM_COMMAND_INSTANCE_SAVEDATA                      = 416,
     RBAC_PERM_COMMAND_LEARN                                  = 417,
-    RBAC_PERM_COMMAND_LEARN_ALL                              = 418,
+    // 418 previously used, do not reuse
     RBAC_PERM_COMMAND_LEARN_ALL_MY                           = 419,
     RBAC_PERM_COMMAND_LEARN_ALL_MY_CLASS                     = 420,
     RBAC_PERM_COMMAND_LEARN_ALL_MY_PETTALENTS                = 421,
@@ -335,13 +299,13 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_LEARN_ALL_LANG                         = 427,
     RBAC_PERM_COMMAND_LEARN_ALL_RECIPES                      = 428,
     RBAC_PERM_COMMAND_UNLEARN                                = 429,
-    RBAC_PERM_COMMAND_LFG                                    = 430,
+    // 430 previously used, do not reuse
     RBAC_PERM_COMMAND_LFG_PLAYER                             = 431,
     RBAC_PERM_COMMAND_LFG_GROUP                              = 432,
     RBAC_PERM_COMMAND_LFG_QUEUE                              = 433,
     RBAC_PERM_COMMAND_LFG_CLEAN                              = 434,
     RBAC_PERM_COMMAND_LFG_OPTIONS                            = 435,
-    RBAC_PERM_COMMAND_LIST                                   = 436,
+    // 436 previously used, do not reuse
     RBAC_PERM_COMMAND_LIST_CREATURE                          = 437,
     RBAC_PERM_COMMAND_LIST_ITEM                              = 438,
     RBAC_PERM_COMMAND_LIST_OBJECT                            = 439,
@@ -475,7 +439,7 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_MODIFY_SPELL                           = 567,
     RBAC_PERM_COMMAND_MODIFY_STANDSTATE                      = 568,
     RBAC_PERM_COMMAND_MODIFY_TALENTPOINTS                    = 569,
-    RBAC_PERM_COMMAND_NPC                                    = 570,
+    // 570 previously used, do not reuse
     RBAC_PERM_COMMAND_NPC_ADD                                = 571,
     RBAC_PERM_COMMAND_NPC_ADD_FORMATION                      = 572,
     RBAC_PERM_COMMAND_NPC_ADD_ITEM                           = 573,
@@ -610,7 +574,7 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_RELOAD_SPELL_THREATS                   = 702,
     RBAC_PERM_COMMAND_RELOAD_SPELL_GROUP_STACK_RULES         = 703,
     RBAC_PERM_COMMAND_RELOAD_TRINITY_STRING                  = 704,
-    // 705 unused
+    // 705 previously used, do not reuse
     RBAC_PERM_COMMAND_RELOAD_WAYPOINT_SCRIPTS                = 706,
     RBAC_PERM_COMMAND_RELOAD_WAYPOINT_DATA                   = 707,
     RBAC_PERM_COMMAND_RELOAD_VEHICLE_ACCESORY                = 708,
@@ -681,9 +645,9 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_WP_RELOAD                              = 773,
     RBAC_PERM_COMMAND_WP_SHOW                                = 774,
     RBAC_PERM_COMMAND_MODIFY_CURRENCY                        = 775,
-    RBAC_PERM_COMMAND_DEBUG_PHASE                            = 776,
+    // 776 previously used, do not reuse
     RBAC_PERM_COMMAND_MAILBOX                                = 777,
-    RBAC_PERM_COMMAND_AHBOT                                  = 778,
+    // 778 previously used, do not reuse
     RBAC_PERM_COMMAND_AHBOT_ITEMS                            = 779,
     RBAC_PERM_COMMAND_AHBOT_ITEMS_GRAY                       = 780,
     RBAC_PERM_COMMAND_AHBOT_ITEMS_WHITE                      = 781,
@@ -740,8 +704,7 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_TICKET_RESET_COMPLAINT                 = 832,
     RBAC_PERM_COMMAND_TICKET_RESET_SUGGESTION                = 833,
     //                                                       = 834, // DEPRECATED: DON'T REUSE
-    RBAC_PERM_COMMAND_DEBUG_LOADCELLS                        = 835,
-    RBAC_PERM_COMMAND_DEBUG_BOUNDARY                         = 836,
+    // 835-836 previously used, do not reuse
     RBAC_PERM_COMMAND_NPC_EVADE                              = 837,
     RBAC_PERM_COMMAND_PET_LEVEL                              = 838,
     RBAC_PERM_COMMAND_SERVER_SHUTDOWN_FORCE                  = 839,
@@ -757,10 +720,9 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_LIST_SCENES                            = 849,
     RBAC_PERM_COMMAND_RELOAD_SCENE_TEMPLATE                  = 850,
     RBAC_PERM_COMMAND_RELOAD_AREATRIGGER_TEMPLATE            = 851,
-    RBAC_PERM_COMMAND_DEBUG_DUMMY                            = 852,
+    // 852 previously used, do not reuse
     RBAC_PERM_COMMAND_RELOAD_CONVERSATION_TEMPLATE           = 853,
-    RBAC_PERM_COMMAND_DEBUG_CONVERSATION                     = 854,
-    RBAC_PERM_COMMAND_DEBUG_PLAY_MUSIC                       = 855,
+    // 854-855 previously used, do not reuse
     RBAC_PERM_COMMAND_NPC_SPAWNGROUP                         = 856,
     RBAC_PERM_COMMAND_NPC_DESPAWNGROUP                       = 857,
     RBAC_PERM_COMMAND_GOBJECT_SPAWNGROUP                     = 858,
@@ -774,17 +736,15 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_LIST_SPAWNPOINTS                       = 866,
     RBAC_PERM_COMMAND_RELOAD_QUEST_GREETING_LOCALE           = 867, // reserved
     RBAC_PERM_COMMAND_MODIFY_POWER                           = 868,
-    RBAC_PERM_COMMAND_DEBUG_SEND_PLAYER_CHOICE               = 869,
-    RBAC_PERM_COMMAND_DEBUG_THREATINFO                       = 870,
-    RBAC_PERM_COMMAND_DEBUG_INSTANCESPAWN                    = 871,
+    // 869 previously used, do not reuse
+    // 870-871 previously used, do not reuse
     RBAC_PERM_COMMAND_SERVER_DEBUG                           = 872,
     RBAC_PERM_COMMAND_RELOAD_CREATURE_MOVEMENT_OVERRIDE      = 873,
-    RBAC_PERM_COMMAND_DEBUG_ASAN                             = 874,
+    // 874 previously used, do not reuse
     RBAC_PERM_COMMAND_LOOKUP_MAP_ID                          = 875,
     RBAC_PERM_COMMAND_LOOKUP_ITEM_ID                         = 876,
     RBAC_PERM_COMMAND_LOOKUP_QUEST_ID                        = 877,
-    RBAC_PERM_COMMAND_DEBUG_QUESTRESET                       = 878,
-    RBAC_PERM_COMMAND_DEBUG_POOLSTATUS                       = 879,
+    // 878-879 previously used, do not reuse
     RBAC_PERM_COMMAND_PDUMP_COPY                             = 880,
     RBAC_PERM_COMMAND_RELOAD_VEHICLE_TEMPLATE                = 881,
     RBAC_PERM_COMMAND_RELOAD_SPELL_SCRIPT_NAMES              = 882,