ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

chore: remove chat profanity bypass (#1688)

Browse Source 
Closes #1682
This commit is contained in:
Andreas Maerten 2023-07-11 23:14:46 +02:00 committed by GitHub
parent 098b15eca6
commit 17c8ab0e68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/settings.hpp
View File

@ -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

2
src/hooking.cpp
View File

@ -33,8 +33,6 @@ namespace big
detour_hook_helper::add<hooks::get_label_text>("GLT", g_pointers->m_gta.m_get_label_text);
detour_hook_helper::add<hooks::check_chat_profanity>("CCP", g_pointers->m_gta.m_check_chat_profanity);
detour_hook_helper::add<hooks::write_player_game_state_data_node>("WPGSDN", g_pointers->m_gta.m_write_player_game_state_data_node);
detour_hook_helper::add<hooks::gta_thread_start>("GTS", g_pointers->m_gta.m_gta_thread_start);

1
src/hooking.hpp
View File

@ -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);

23
src/hooks/misc/check_chat_profanity.cpp
View File

@ -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<int>(eProfanity::PROFANITY_CHAT_CLEAN);
}
return g_hooking->get_original<hooks::check_chat_profanity>()(chat_type, input, output);
}
}

3
src/views/network/view_network.cpp
View File

@ -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));