From 17c8ab0e68cd9190cd1342db15b0bd1cd713bd2d Mon Sep 17 00:00:00 2001 From: Andreas Maerten <24669514+Yimura@users.noreply.github.com> Date: Tue, 11 Jul 2023 23:14:46 +0200 Subject: [PATCH] chore: remove chat profanity bypass (#1688) Closes #1682 --- src/core/settings.hpp | 3 +-- src/hooking.cpp | 2 -- src/hooking.hpp | 1 - src/hooks/misc/check_chat_profanity.cpp | 23 ----------------------- src/views/network/view_network.cpp | 3 --- 5 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 src/hooks/misc/check_chat_profanity.cpp diff --git a/src/core/settings.hpp b/src/core/settings.hpp index 927fe797..0a0d35e1 100644 --- a/src/core/settings.hpp +++ b/src/core/settings.hpp @@ -343,7 +343,6 @@ namespace big struct session { - bool chat_force_clean = false; bool log_chat_messages = false; bool log_text_messages = false; bool decloak_players = false; @@ -393,7 +392,7 @@ namespace big bool fast_join = false; - NLOHMANN_DEFINE_TYPE_INTRUSIVE(session, chat_force_clean, log_chat_messages, log_text_messages, decloak_players, force_session_host, force_script_host, player_magnet_enabled, player_magnet_count, is_team, join_in_sctv_slots, kick_chat_spammers, kick_host_when_forcing_host, explosion_karma, damage_karma, disable_traffic, disable_peds, force_thunder, block_ceo_money, randomize_ceo_colors, block_jobs, block_muggers, block_ceo_raids, send_to_apartment_idx, send_to_warehouse_idx, chat_commands, chat_command_default_access_level, show_cheating_message, anonymous_bounty, lock_session, fast_join) + NLOHMANN_DEFINE_TYPE_INTRUSIVE(session, log_chat_messages, log_text_messages, decloak_players, force_session_host, force_script_host, player_magnet_enabled, player_magnet_count, is_team, join_in_sctv_slots, kick_chat_spammers, kick_host_when_forcing_host, explosion_karma, damage_karma, disable_traffic, disable_peds, force_thunder, block_ceo_money, randomize_ceo_colors, block_jobs, block_muggers, block_ceo_raids, send_to_apartment_idx, send_to_warehouse_idx, chat_commands, chat_command_default_access_level, show_cheating_message, anonymous_bounty, lock_session, fast_join) } session{}; struct settings diff --git a/src/hooking.cpp b/src/hooking.cpp index 135eaf6b..b556e303 100644 --- a/src/hooking.cpp +++ b/src/hooking.cpp @@ -33,8 +33,6 @@ namespace big detour_hook_helper::add("GLT", g_pointers->m_gta.m_get_label_text); - detour_hook_helper::add("CCP", g_pointers->m_gta.m_check_chat_profanity); - detour_hook_helper::add("WPGSDN", g_pointers->m_gta.m_write_player_game_state_data_node); detour_hook_helper::add("GTS", g_pointers->m_gta.m_gta_thread_start); diff --git a/src/hooking.hpp b/src/hooking.hpp index b7d425e7..0f7c8d20 100644 --- a/src/hooking.hpp +++ b/src/hooking.hpp @@ -65,7 +65,6 @@ namespace big static LRESULT wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); static const char* get_label_text(void* unk, const char* label); - static int check_chat_profanity(__int64 chat_type, const char* input, const char** output); static GtaThread* gta_thread_start(unsigned int** a1, unsigned int a2); static rage::eThreadState gta_thread_kill(GtaThread* thread); diff --git a/src/hooks/misc/check_chat_profanity.cpp b/src/hooks/misc/check_chat_profanity.cpp deleted file mode 100644 index c6f572ea..00000000 --- a/src/hooks/misc/check_chat_profanity.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#include "hooking.hpp" - -namespace big -{ - enum class eProfanity - { - PROFANITY_CHAT_CLEAN = -1, - PROFANITY_CLEAN, - PROFANITY_DIRTY, - PROFANITY_UNK, - PROFANITY_ERROR - }; - - int hooks::check_chat_profanity(__int64 chat_type, const char* input, const char** output) - { - if (g.session.chat_force_clean) - { - return static_cast(eProfanity::PROFANITY_CHAT_CLEAN); - } - return g_hooking->get_original()(chat_type, input, output); - } -} diff --git a/src/views/network/view_network.cpp b/src/views/network/view_network.cpp index 8474e1f7..98a1cb80 100644 --- a/src/views/network/view_network.cpp +++ b/src/views/network/view_network.cpp @@ -137,9 +137,6 @@ namespace big { static char msg[256]; ImGui::Checkbox("AUTO_KICK_CHAT_SPAMMERS"_T.data(), &g.session.kick_chat_spammers); - ImGui::Checkbox("DISABLE_FILTER"_T.data(), &g.session.chat_force_clean); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Your sent chat messages will not be censored to the receivers"); // TODO: add translation ImGui::Checkbox("LOG_CHAT_MSG"_T.data(), &g.session.log_chat_messages); ImGui::Checkbox("LOG_TXT_MSG"_T.data(), &g.session.log_text_messages); components::input_text_with_hint("##message", "Chat message", msg, sizeof(msg));