From dfd8f84cac452710144bef89c53da98c20d45cc3 Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Thu, 14 Jul 2022 02:10:52 -0500 Subject: [PATCH] [Strings] Refactor Strings Usage (#2305) * Initial commit checkpoint * More functions converted * Commify * More functions * Fin * Sort declarations * Split functions between files * Bots * Update strings.h * Split * Revert find replaces * Repository template * Money * Misc function * Update CMakeLists.txt * Saylink * Update strings.cpp * Swap Strings::Saylink for Saylink::Create since saylink is coupled to zone database * API casings --- client_files/export/main.cpp | 2 +- client_files/import/main.cpp | 14 +- common/CMakeLists.txt | 4 +- common/content/world_content_service.cpp | 8 +- common/database.cpp | 52 +- common/database/database_dump_service.cpp | 22 +- common/database_conversions.cpp | 190 +-- common/database_instances.cpp | 6 +- common/discord/discord.cpp | 6 +- common/discord_manager.cpp | 2 +- common/eq_stream.cpp | 14 +- common/eqemu_logsys.cpp | 4 +- common/expedition_lockout_timer.cpp | 2 +- common/guild_base.cpp | 6 +- common/inventory_profile.cpp | 22 +- common/inventory_slot.cpp | 10 +- common/item_instance.cpp | 2 +- common/md5.cpp | 2 +- common/net/console_server.cpp | 12 +- common/patches/rof.cpp | 24 +- common/patches/rof2.cpp | 36 +- common/patches/rof2_limits.cpp | 4 +- common/patches/rof_limits.cpp | 4 +- common/patches/sod.cpp | 18 +- common/patches/sod_limits.cpp | 4 +- common/patches/sof.cpp | 20 +- common/patches/sof_limits.cpp | 4 +- common/patches/titanium.cpp | 16 +- common/patches/titanium_limits.cpp | 4 +- common/patches/uf.cpp | 18 +- common/patches/uf_limits.cpp | 4 +- common/profanity_manager.cpp | 24 +- common/ptimer.cpp | 2 +- common/repositories/aa_ability_repository.h | 2 +- .../repositories/aa_rank_effects_repository.h | 2 +- .../repositories/aa_rank_prereqs_repository.h | 2 +- common/repositories/aa_ranks_repository.h | 2 +- .../repositories/account_flags_repository.h | 2 +- common/repositories/account_ip_repository.h | 2 +- common/repositories/account_repository.h | 2 +- .../repositories/account_rewards_repository.h | 2 +- .../adventure_details_repository.h | 2 +- .../adventure_members_repository.h | 2 +- .../repositories/adventure_stats_repository.h | 2 +- ...venture_template_entry_flavor_repository.h | 2 +- .../adventure_template_entry_repository.h | 2 +- .../adventure_template_repository.h | 2 +- .../alternate_currency_repository.h | 2 +- common/repositories/auras_repository.h | 2 +- .../base/base_aa_ability_repository.h | 20 +- .../base/base_aa_rank_effects_repository.h | 14 +- .../base/base_aa_rank_prereqs_repository.h | 14 +- .../base/base_aa_ranks_repository.h | 14 +- .../base/base_account_flags_repository.h | 26 +- .../base/base_account_ip_repository.h | 26 +- .../base/base_account_repository.h | 74 +- .../base/base_account_rewards_repository.h | 14 +- .../base/base_adventure_details_repository.h | 14 +- .../base/base_adventure_members_repository.h | 14 +- .../base/base_adventure_stats_repository.h | 14 +- ...venture_template_entry_flavor_repository.h | 20 +- ...base_adventure_template_entry_repository.h | 14 +- .../base/base_adventure_template_repository.h | 26 +- .../base/base_alternate_currency_repository.h | 14 +- .../repositories/base/base_auras_repository.h | 20 +- .../base/base_base_data_repository.h | 14 +- .../base/base_blocked_spells_repository.h | 26 +- .../repositories/base/base_books_repository.h | 26 +- .../base/base_bug_reports_repository.h | 80 +- .../repositories/base/base_bugs_repository.h | 56 +- .../repositories/base/base_buyer_repository.h | 20 +- ...base_char_create_combinations_repository.h | 14 +- ...char_create_point_allocations_repository.h | 14 +- .../base/base_char_recipe_list_repository.h | 14 +- .../base_character_activities_repository.h | 14 +- .../base_character_alt_currency_repository.h | 14 +- ...character_alternate_abilities_repository.h | 14 +- .../base/base_character_auras_repository.h | 14 +- .../base_character_bandolier_repository.h | 20 +- .../base/base_character_bind_repository.h | 14 +- .../base/base_character_buffs_repository.h | 20 +- .../base_character_corpse_items_repository.h | 14 +- .../base/base_character_corpses_repository.h | 20 +- .../base/base_character_currency_repository.h | 14 +- .../base/base_character_data_repository.h | 44 +- .../base_character_disciplines_repository.h | 14 +- .../base_character_exp_modifiers_repository.h | 14 +- ...character_expedition_lockouts_repository.h | 32 +- ...se_character_inspect_messages_repository.h | 20 +- ...haracter_instance_safereturns_repository.h | 14 +- .../base_character_item_recast_repository.h | 14 +- .../base_character_languages_repository.h | 14 +- ...haracter_leadership_abilities_repository.h | 14 +- .../base/base_character_material_repository.h | 14 +- .../base_character_memmed_spells_repository.h | 14 +- .../base_character_pet_buffs_repository.h | 20 +- .../base/base_character_pet_info_repository.h | 20 +- .../base_character_pet_inventory_repository.h | 14 +- .../base_character_potionbelt_repository.h | 14 +- .../base/base_character_skills_repository.h | 14 +- .../base/base_character_spells_repository.h | 14 +- .../base_character_task_timers_repository.h | 14 +- .../base/base_character_tasks_repository.h | 14 +- ...ed_shared_task_activity_state_repository.h | 14 +- ...completed_shared_task_members_repository.h | 14 +- .../base_completed_shared_tasks_repository.h | 14 +- .../base/base_completed_tasks_repository.h | 14 +- .../base/base_content_flags_repository.h | 26 +- .../base/base_damageshieldtypes_repository.h | 14 +- .../base/base_data_buckets_repository.h | 26 +- .../base/base_db_str_repository.h | 20 +- .../base/base_discord_webhooks_repository.h | 26 +- .../base/base_discovered_items_repository.h | 20 +- .../repositories/base/base_doors_repository.h | 44 +- .../base_dynamic_zone_members_repository.h | 14 +- .../base/base_dynamic_zones_repository.h | 26 +- .../base/base_eventlog_repository.h | 50 +- .../base_expedition_lockouts_repository.h | 26 +- .../base/base_expeditions_repository.h | 14 +- .../base/base_faction_base_data_repository.h | 14 +- .../base/base_faction_list_mod_repository.h | 20 +- .../base/base_faction_list_repository.h | 20 +- .../base/base_faction_values_repository.h | 14 +- .../base/base_fishing_repository.h | 26 +- .../base/base_forage_repository.h | 26 +- .../base/base_friends_repository.h | 20 +- .../base/base_global_loot_repository.h | 56 +- .../base/base_gm_ips_repository.h | 26 +- .../base/base_goallists_repository.h | 14 +- .../base/base_graveyard_repository.h | 14 +- .../base/base_grid_entries_repository.h | 14 +- .../repositories/base/base_grid_repository.h | 14 +- .../base/base_ground_spawns_repository.h | 38 +- .../base/base_group_id_repository.h | 20 +- .../base/base_group_leaders_repository.h | 56 +- .../base/base_guild_members_repository.h | 20 +- .../base/base_guild_ranks_repository.h | 20 +- .../base/base_guild_relations_repository.h | 14 +- .../base/base_guilds_repository.h | 44 +- .../base/base_hackers_repository.h | 44 +- .../base/base_horses_repository.h | 26 +- .../base_instance_list_player_repository.h | 14 +- .../base/base_instance_list_repository.h | 14 +- .../base/base_inventory_repository.h | 20 +- .../base_inventory_snapshots_repository.h | 20 +- .../base/base_ip_exemptions_repository.h | 20 +- .../base/base_item_tick_repository.h | 20 +- .../repositories/base/base_items_repository.h | 164 +-- .../base/base_launcher_repository.h | 20 +- .../base/base_ldon_trap_entries_repository.h | 14 +- .../base_ldon_trap_templates_repository.h | 14 +- .../base/base_level_exp_mods_repository.h | 14 +- .../base/base_lfguild_repository.h | 26 +- .../base/base_login_accounts_repository.h | 44 +- .../base/base_login_api_tokens_repository.h | 20 +- .../base_login_server_admins_repository.h | 50 +- .../base_login_server_list_types_repository.h | 20 +- .../base_login_world_servers_repository.h | 44 +- .../base/base_logsys_categories_repository.h | 20 +- .../base/base_lootdrop_entries_repository.h | 14 +- .../base/base_lootdrop_repository.h | 32 +- .../base/base_loottable_entries_repository.h | 14 +- .../base/base_loottable_repository.h | 32 +- .../repositories/base/base_mail_repository.h | 38 +- .../base/base_merchantlist_repository.h | 26 +- .../base/base_merchantlist_temp_repository.h | 14 +- .../base/base_name_filter_repository.h | 20 +- .../base/base_npc_emotes_repository.h | 20 +- .../base_npc_faction_entries_repository.h | 14 +- .../base/base_npc_faction_repository.h | 20 +- .../base_npc_scale_global_base_repository.h | 20 +- ...se_npc_spells_effects_entries_repository.h | 14 +- .../base/base_npc_spells_effects_repository.h | 20 +- .../base/base_npc_spells_entries_repository.h | 14 +- .../base/base_npc_spells_repository.h | 20 +- .../base/base_npc_types_repository.h | 44 +- .../base/base_npc_types_tint_repository.h | 20 +- .../base/base_object_contents_repository.h | 14 +- .../base/base_object_repository.h | 38 +- ...se_perl_event_export_settings_repository.h | 20 +- .../base/base_petitions_repository.h | 50 +- .../base_pets_beastlord_data_repository.h | 14 +- ...ase_pets_equipmentset_entries_repository.h | 14 +- .../base/base_pets_equipmentset_repository.h | 20 +- .../repositories/base/base_pets_repository.h | 20 +- .../base/base_player_titlesets_repository.h | 14 +- .../base/base_proximities_repository.h | 14 +- .../base/base_quest_globals_repository.h | 26 +- .../base/base_raid_details_repository.h | 20 +- .../base/base_raid_members_repository.h | 20 +- .../base/base_reports_repository.h | 32 +- .../base/base_respawn_times_repository.h | 14 +- .../base/base_rule_sets_repository.h | 20 +- .../base/base_rule_values_repository.h | 32 +- .../base/base_saylink_repository.h | 20 +- .../base_server_scheduled_events_repository.h | 38 +- ...se_shared_task_activity_state_repository.h | 14 +- ...ase_shared_task_dynamic_zones_repository.h | 14 +- .../base_shared_task_members_repository.h | 14 +- .../base/base_shared_tasks_repository.h | 14 +- .../base/base_skill_caps_repository.h | 14 +- .../base/base_spawn2_repository.h | 32 +- .../base_spawn_condition_values_repository.h | 20 +- .../base/base_spawn_conditions_repository.h | 26 +- .../base/base_spawn_events_repository.h | 26 +- .../base/base_spawnentry_repository.h | 26 +- .../base/base_spawngroup_repository.h | 20 +- .../base/base_spell_buckets_repository.h | 26 +- .../base/base_spell_globals_repository.h | 32 +- .../base/base_spells_new_repository.h | 62 +- .../base/base_start_zones_repository.h | 26 +- .../base/base_starting_items_repository.h | 26 +- .../base/base_task_activities_repository.h | 56 +- .../repositories/base/base_tasks_repository.h | 38 +- .../base/base_tasksets_repository.h | 14 +- .../base/base_timers_repository.h | 14 +- .../base/base_titles_repository.h | 26 +- .../base/base_tool_game_objects_repository.h | 32 +- .../base/base_trader_repository.h | 14 +- ...ase_tradeskill_recipe_entries_repository.h | 14 +- .../base/base_tradeskill_recipe_repository.h | 38 +- .../repositories/base/base_traps_repository.h | 38 +- .../base/base_tribute_levels_repository.h | 14 +- .../base/base_tributes_repository.h | 26 +- .../base/base_variables_repository.h | 38 +- ...base_veteran_reward_templates_repository.h | 20 +- .../base/base_zone_points_repository.h | 32 +- .../repositories/base/base_zone_repository.h | 62 +- common/repositories/base_data_repository.h | 2 +- .../repositories/blocked_spells_repository.h | 2 +- common/repositories/books_repository.h | 2 +- common/repositories/bug_reports_repository.h | 2 +- common/repositories/bugs_repository.h | 2 +- common/repositories/buyer_repository.h | 2 +- .../char_create_combinations_repository.h | 2 +- ...char_create_point_allocations_repository.h | 2 +- .../char_recipe_list_repository.h | 2 +- .../character_activities_repository.h | 2 +- .../character_alt_currency_repository.h | 2 +- ...character_alternate_abilities_repository.h | 2 +- .../repositories/character_auras_repository.h | 2 +- .../character_bandolier_repository.h | 2 +- .../repositories/character_bind_repository.h | 2 +- .../repositories/character_buffs_repository.h | 2 +- .../character_corpse_items_repository.h | 2 +- .../character_corpses_repository.h | 2 +- .../character_currency_repository.h | 2 +- .../repositories/character_data_repository.h | 2 +- .../character_disciplines_repository.h | 2 +- .../character_exp_modifiers_repository.h | 2 +- ...character_expedition_lockouts_repository.h | 6 +- .../character_inspect_messages_repository.h | 2 +- ...haracter_instance_safereturns_repository.h | 4 +- .../character_item_recast_repository.h | 2 +- .../character_languages_repository.h | 2 +- ...haracter_leadership_abilities_repository.h | 2 +- .../character_material_repository.h | 2 +- .../character_memmed_spells_repository.h | 2 +- .../character_pet_buffs_repository.h | 2 +- .../character_pet_info_repository.h | 2 +- .../character_pet_inventory_repository.h | 2 +- .../character_potionbelt_repository.h | 2 +- .../character_recipe_list_repository.h | 4 +- .../character_skills_repository.h | 2 +- .../character_spells_repository.h | 2 +- .../character_task_timers_repository.h | 2 +- .../repositories/character_tasks_repository.h | 2 +- ...ed_shared_task_activity_state_repository.h | 2 +- ...completed_shared_task_members_repository.h | 2 +- .../completed_shared_tasks_repository.h | 2 +- .../repositories/completed_tasks_repository.h | 2 +- .../repositories/content_flags_repository.h | 2 +- .../criteria/content_filter_criteria.h | 6 +- .../damageshieldtypes_repository.h | 2 +- common/repositories/data_buckets_repository.h | 2 +- common/repositories/db_str_repository.h | 2 +- .../discord_webhooks_repository.h | 2 +- .../discovered_items_repository.h | 2 +- common/repositories/doors_repository.h | 2 +- .../dynamic_zone_members_repository.h | 6 +- .../repositories/dynamic_zones_repository.h | 2 +- common/repositories/eventlog_repository.h | 2 +- .../expedition_lockouts_repository.h | 2 +- common/repositories/expeditions_repository.h | 2 +- .../faction_base_data_repository.h | 2 +- .../faction_list_mod_repository.h | 2 +- common/repositories/faction_list_repository.h | 2 +- .../repositories/faction_values_repository.h | 2 +- common/repositories/fishing_repository.h | 2 +- common/repositories/forage_repository.h | 2 +- common/repositories/friends_repository.h | 2 +- common/repositories/global_loot_repository.h | 2 +- common/repositories/gm_ips_repository.h | 2 +- common/repositories/goallists_repository.h | 2 +- common/repositories/graveyard_repository.h | 2 +- common/repositories/grid_entries_repository.h | 4 +- common/repositories/grid_repository.h | 2 +- .../repositories/ground_spawns_repository.h | 2 +- common/repositories/group_id_repository.h | 2 +- .../repositories/group_leaders_repository.h | 2 +- common/repositories/guild_bank_repository.h | 26 +- .../repositories/guild_members_repository.h | 2 +- common/repositories/guild_ranks_repository.h | 2 +- .../repositories/guild_relations_repository.h | 2 +- common/repositories/guilds_repository.h | 2 +- common/repositories/hackers_repository.h | 2 +- common/repositories/horses_repository.h | 2 +- .../instance_list_player_repository.h | 6 +- .../repositories/instance_list_repository.h | 2 +- common/repositories/inventory_repository.h | 2 +- .../inventory_snapshots_repository.h | 2 +- .../inventory_versions_repository.h | 14 +- .../repositories/ip_exemptions_repository.h | 2 +- common/repositories/item_tick_repository.h | 2 +- common/repositories/items_repository.h | 2 +- .../ldon_trap_entries_repository.h | 2 +- .../ldon_trap_templates_repository.h | 2 +- .../repositories/level_exp_mods_repository.h | 2 +- common/repositories/lfguild_repository.h | 2 +- .../repositories/login_accounts_repository.h | 2 +- .../login_api_tokens_repository.h | 2 +- .../login_server_admins_repository.h | 2 +- .../login_server_list_types_repository.h | 2 +- .../login_world_servers_repository.h | 2 +- .../logsys_categories_repository.h | 2 +- .../lootdrop_entries_repository.h | 2 +- common/repositories/lootdrop_repository.h | 2 +- .../loottable_entries_repository.h | 2 +- common/repositories/loottable_repository.h | 2 +- common/repositories/mail_repository.h | 2 +- common/repositories/merchantlist_repository.h | 2 +- .../merchantlist_temp_repository.h | 2 +- common/repositories/name_filter_repository.h | 2 +- common/repositories/npc_emotes_repository.h | 2 +- .../npc_faction_entries_repository.h | 2 +- common/repositories/npc_faction_repository.h | 2 +- .../npc_scale_global_base_repository.h | 2 +- .../npc_spells_effects_entries_repository.h | 2 +- .../npc_spells_effects_repository.h | 2 +- .../npc_spells_entries_repository.h | 2 +- common/repositories/npc_spells_repository.h | 2 +- common/repositories/npc_types_repository.h | 2 +- .../repositories/npc_types_tint_repository.h | 2 +- .../repositories/object_contents_repository.h | 2 +- common/repositories/object_repository.h | 2 +- .../perl_event_export_settings_repository.h | 2 +- common/repositories/petitions_repository.h | 2 +- .../pets_beastlord_data_repository.h | 2 +- .../pets_equipmentset_entries_repository.h | 2 +- .../pets_equipmentset_repository.h | 2 +- common/repositories/pets_repository.h | 2 +- .../player_titlesets_repository.h | 2 +- common/repositories/proximities_repository.h | 2 +- .../repositories/quest_globals_repository.h | 2 +- common/repositories/raid_details_repository.h | 2 +- common/repositories/raid_leaders_repository.h | 50 +- common/repositories/raid_members_repository.h | 2 +- common/repositories/reports_repository.h | 2 +- .../repositories/respawn_times_repository.h | 2 +- common/repositories/rule_sets_repository.h | 2 +- common/repositories/rule_values_repository.h | 2 +- common/repositories/saylink_repository.h | 2 +- .../server_scheduled_events_repository.h | 2 +- .../shared_task_activity_state_repository.h | 2 +- .../shared_task_dynamic_zones_repository.h | 2 +- .../shared_task_members_repository.h | 2 +- common/repositories/shared_tasks_repository.h | 2 +- common/repositories/sharedbank_repository.h | 20 +- common/repositories/skill_caps_repository.h | 2 +- common/repositories/spawn2_repository.h | 2 +- .../spawn_condition_values_repository.h | 2 +- .../spawn_conditions_repository.h | 2 +- common/repositories/spawn_events_repository.h | 2 +- common/repositories/spawnentry_repository.h | 2 +- common/repositories/spawngroup_repository.h | 2 +- .../repositories/spell_buckets_repository.h | 2 +- .../repositories/spell_globals_repository.h | 2 +- common/repositories/spells_new_repository.h | 2 +- common/repositories/start_zones_repository.h | 2 +- .../repositories/starting_items_repository.h | 2 +- .../repositories/task_activities_repository.h | 2 +- common/repositories/tasks_repository.h | 2 +- common/repositories/tasksets_repository.h | 2 +- .../template/base_repository.template | 14 +- .../repositories/template/repository.template | 2 +- common/repositories/timers_repository.h | 2 +- common/repositories/titles_repository.h | 2 +- .../tool_game_objects_repository.h | 2 +- common/repositories/trader_audit_repository.h | 38 +- common/repositories/trader_repository.h | 2 +- .../tradeskill_recipe_entries_repository.h | 2 +- .../tradeskill_recipe_repository.h | 2 +- common/repositories/traps_repository.h | 2 +- .../repositories/tribute_levels_repository.h | 2 +- common/repositories/tributes_repository.h | 2 +- common/repositories/variables_repository.h | 2 +- .../veteran_reward_templates_repository.h | 2 +- common/repositories/zone_points_repository.h | 2 +- common/repositories/zone_repository.h | 2 +- common/rulesys.cpp | 12 +- common/say_link.cpp | 33 +- common/say_link.h | 5 + common/server_event_scheduler.cpp | 2 +- common/shareddb.cpp | 22 +- common/string_util.cpp | 1288 ----------------- common/string_util.h | 237 --- common/strings.cpp | 651 +++++++++ common/strings.h | 216 +++ common/strings_legacy.cpp | 335 +++++ common/strings_misc.cpp | 371 +++++ eqlaunch/worldserver.cpp | 2 +- loginserver/account_management.cpp | 4 +- loginserver/client.cpp | 4 +- loginserver/database.cpp | 74 +- loginserver/login_server.h | 2 +- loginserver/loginserver_webserver.cpp | 4 +- loginserver/main.cpp | 2 +- loginserver/world_server.cpp | 6 +- queryserv/database.cpp | 2 +- queryserv/lfguild.cpp | 2 +- queryserv/queryserv.cpp | 2 +- shared_memory/main.cpp | 4 +- tests/atobool_test.h | 2 +- tests/hextoi_32_64_test.h | 18 +- tests/string_util_test.h | 54 +- ucs/chatchannel.cpp | 8 +- ucs/clientlist.cpp | 2 +- ucs/database.cpp | 2 +- ucs/worldserver.cpp | 8 +- .../generators/repository-generator.pl | 4 +- world/adventure.cpp | 2 +- world/adventure_manager.cpp | 2 +- world/client.cpp | 4 +- world/cliententry.cpp | 2 +- world/clientlist.cpp | 2 +- world/console.cpp | 34 +- world/console.old.cpp | 2 +- world/eql_config.cpp | 2 +- world/eqw.cpp | 2 +- world/launcher_link.cpp | 2 +- world/login_server.cpp | 2 +- world/main.cpp | 6 +- world/shared_task_manager.cpp | 2 +- world/world_store.cpp | 2 +- world/worlddb.cpp | 2 +- world/zonelist.cpp | 4 +- world/zoneserver.cpp | 4 +- zone/aa.cpp | 16 +- zone/attack.cpp | 2 +- zone/aura.cpp | 2 +- zone/bot.cpp | 4 +- zone/bot_command.cpp | 12 +- zone/bot_database.cpp | 10 +- zone/botspellsai.cpp | 2 +- zone/client.cpp | 158 +- zone/client_packet.cpp | 18 +- zone/client_process.cpp | 6 +- zone/combat_record.cpp | 4 +- zone/command.cpp | 12 +- zone/corpse.cpp | 10 +- zone/data_bucket.cpp | 14 +- zone/dialogue_window.cpp | 126 +- zone/doors.cpp | 2 +- zone/effects.cpp | 8 +- zone/embparser.cpp | 10 +- zone/embparser_api.cpp | 2 +- zone/entity.cpp | 4 +- zone/exp.cpp | 8 +- zone/expedition_database.cpp | 28 +- zone/forage.cpp | 2 +- zone/gm_commands/advnpcspawn.cpp | 2 +- zone/gm_commands/ai.cpp | 12 +- zone/gm_commands/ban.cpp | 2 +- zone/gm_commands/camerashake.cpp | 2 +- zone/gm_commands/databuckets.cpp | 4 +- zone/gm_commands/door_manipulation.cpp | 112 +- zone/gm_commands/dye.cpp | 2 +- zone/gm_commands/dz.cpp | 8 +- zone/gm_commands/editmassrespawn.cpp | 2 +- zone/gm_commands/faction.cpp | 4 +- zone/gm_commands/feature.cpp | 4 +- zone/gm_commands/findclass.cpp | 4 +- zone/gm_commands/findfaction.cpp | 4 +- zone/gm_commands/findrace.cpp | 6 +- zone/gm_commands/findskill.cpp | 4 +- zone/gm_commands/findspell.cpp | 4 +- zone/gm_commands/findtask.cpp | 4 +- zone/gm_commands/findzone.cpp | 8 +- zone/gm_commands/flagedit.cpp | 18 +- zone/gm_commands/gearup.cpp | 6 +- zone/gm_commands/givemoney.cpp | 6 +- zone/gm_commands/gmzone.cpp | 6 +- zone/gm_commands/instance.cpp | 10 +- zone/gm_commands/itemsearch.cpp | 8 +- zone/gm_commands/killallnpcs.cpp | 4 +- zone/gm_commands/list.cpp | 10 +- zone/gm_commands/logs.cpp | 2 +- zone/gm_commands/movechar.cpp | 4 +- zone/gm_commands/mysql.cpp | 8 +- zone/gm_commands/npcedit.cpp | 92 +- zone/gm_commands/npceditmass.cpp | 10 +- zone/gm_commands/npcloot.cpp | 14 +- zone/gm_commands/nudge.cpp | 2 +- zone/gm_commands/nukebuffs.cpp | 4 +- zone/gm_commands/peqzone.cpp | 2 +- zone/gm_commands/qglobal.cpp | 6 +- zone/gm_commands/raidloot.cpp | 2 +- zone/gm_commands/roambox.cpp | 2 +- zone/gm_commands/scale.cpp | 2 +- zone/gm_commands/serverinfo.cpp | 2 +- zone/gm_commands/setaapts.cpp | 2 +- zone/gm_commands/setaaxp.cpp | 2 +- zone/gm_commands/setcrystals.cpp | 2 +- zone/gm_commands/showskills.cpp | 6 +- zone/gm_commands/spawneditmass.cpp | 16 +- zone/gm_commands/spawnstatus.cpp | 6 +- zone/gm_commands/stun.cpp | 2 +- zone/gm_commands/suspend.cpp | 2 +- zone/gm_commands/task.cpp | 36 +- zone/gm_commands/timers.cpp | 2 +- zone/gm_commands/title.cpp | 6 +- zone/gm_commands/titlesuffix.cpp | 6 +- zone/gm_commands/viewcurrencies.cpp | 10 +- zone/gm_commands/viewzoneloot.cpp | 2 +- zone/gm_commands/who.cpp | 32 +- zone/gm_commands/zone.cpp | 2 +- zone/gm_commands/zonelock.cpp | 4 +- zone/groups.cpp | 4 +- zone/guild.cpp | 2 +- zone/guild_mgr.cpp | 2 +- zone/horse.cpp | 2 +- zone/inventory.cpp | 2 +- zone/loottables.cpp | 8 +- zone/lua_general.cpp | 2 +- zone/main.cpp | 8 +- zone/merc.cpp | 2 +- zone/mob.cpp | 8 +- zone/mob_ai.cpp | 2 +- zone/mob_appearance.cpp | 2 +- zone/mob_info.cpp | 210 +-- zone/npc.cpp | 14 +- zone/npc_scale_manager.cpp | 2 +- zone/object.cpp | 2 +- zone/pathfinder_waypoint.cpp | 74 +- zone/perl_entity.cpp | 2 +- zone/petitions.cpp | 2 +- zone/pets.cpp | 2 +- zone/position.cpp | 2 +- zone/qglobals.cpp | 2 +- zone/queryserv.cpp | 4 +- zone/questmgr.cpp | 8 +- zone/raids.cpp | 6 +- zone/spawn2.cpp | 2 +- zone/special_attacks.cpp | 2 +- zone/spell_effects.cpp | 4 +- zone/spells.cpp | 16 +- zone/task_client_state.cpp | 6 +- zone/task_goal_list_manager.cpp | 8 +- zone/task_manager.cpp | 6 +- zone/tasks.cpp | 2 +- zone/titles.cpp | 10 +- zone/tradeskills.cpp | 2 +- zone/trading.cpp | 2 +- zone/trap.cpp | 2 +- zone/tune.cpp | 2 +- zone/waypoints.cpp | 6 +- zone/worldserver.cpp | 8 +- zone/zone.cpp | 4 +- zone/zone.h | 6 +- zone/zone_event_scheduler.cpp | 6 +- zone/zone_store.cpp | 2 +- zone/zonedb.cpp | 18 +- zone/zoning.cpp | 2 +- 573 files changed, 5197 insertions(+), 5137 deletions(-) delete mode 100644 common/string_util.cpp delete mode 100644 common/string_util.h create mode 100644 common/strings.cpp create mode 100644 common/strings.h create mode 100644 common/strings_legacy.cpp create mode 100644 common/strings_misc.cpp diff --git a/client_files/export/main.cpp b/client_files/export/main.cpp index ff7f1f3dd..6284e6191 100644 --- a/client_files/export/main.cpp +++ b/client_files/export/main.cpp @@ -25,7 +25,7 @@ #include "../../common/platform.h" #include "../../common/crash.h" #include "../../common/rulesys.h" -#include "../../common/string_util.h" +#include "../../common/strings.h" #include "../../common/content/world_content_service.h" EQEmuLogSys LogSys; diff --git a/client_files/import/main.cpp b/client_files/import/main.cpp index 2fbdf421a..96ed82098 100644 --- a/client_files/import/main.cpp +++ b/client_files/import/main.cpp @@ -23,7 +23,7 @@ #include "../../common/platform.h" #include "../../common/crash.h" #include "../../common/rulesys.h" -#include "../../common/string_util.h" +#include "../../common/strings.h" #include "../../common/content/world_content_service.h" EQEmuLogSys LogSys; @@ -146,8 +146,8 @@ void ImportSpells(SharedDatabase *db) { } } - std::string escaped = ::EscapeString(buffer); - auto split = SplitString(escaped, '^'); + std::string escaped = ::Strings::Escape(buffer); + auto split = Strings::Split(escaped, '^'); int line_columns = (int)split.size(); std::string sql; @@ -225,7 +225,7 @@ void ImportSkillCaps(SharedDatabase *db) { char buffer[2048]; while(fgets(buffer, 2048, f)) { - auto split = SplitString(buffer, '^'); + auto split = Strings::Split(buffer, '^'); if(split.size() < 4) { continue; @@ -260,7 +260,7 @@ void ImportBaseData(SharedDatabase *db) { char buffer[2048]; while(fgets(buffer, 2048, f)) { - auto split = SplitString(buffer, '^'); + auto split = Strings::Split(buffer, '^'); if(split.size() < 10) { continue; @@ -318,7 +318,7 @@ void ImportDBStrings(SharedDatabase *db) { } } - auto split = SplitString(buffer, '^'); + auto split = Strings::Split(buffer, '^'); if(split.size() < 2) { continue; @@ -332,7 +332,7 @@ void ImportDBStrings(SharedDatabase *db) { type = atoi(split[1].c_str()); if(split.size() >= 3) { - value = ::EscapeString(split[2]); + value = ::Strings::Escape(split[2]); } sql = StringFormat("INSERT INTO db_str(id, type, value) VALUES(%u, %u, '%s')", diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 1ca2beb9d..729391eb6 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -77,7 +77,7 @@ SET(common_sources shareddb.cpp skills.cpp spdat.cpp - string_util.cpp + strings.cpp struct_strategy.cpp textures.cpp timer.cpp @@ -579,7 +579,7 @@ SET(common_headers shareddb.h skills.h spdat.h - string_util.h + strings.h struct_strategy.h tasks.h textures.h diff --git a/common/content/world_content_service.cpp b/common/content/world_content_service.cpp index 381bf5dc1..4f4319d3c 100644 --- a/common/content/world_content_service.cpp +++ b/common/content/world_content_service.cpp @@ -168,15 +168,15 @@ bool WorldContentService::DoesPassContentFiltering(const ContentFlags &f) } // if we don't have any enabled flag in enabled flags, we fail - for (const auto& flag: SplitString(f.content_flags)) { - if (!contains(GetContentFlagsEnabled(), flag)) { + for (const auto& flag: Strings::Split(f.content_flags)) { + if (!Strings::Contains(GetContentFlagsEnabled(), flag)) { return false; } } // if we don't have any disabled flag in disabled flags, we fail - for (const auto& flag: SplitString(f.content_flags_disabled)) { - if (!contains(GetContentFlagsDisabled(), flag)) { + for (const auto& flag: Strings::Split(f.content_flags_disabled)) { + if (!Strings::Contains(GetContentFlagsDisabled(), flag)) { return false; } } diff --git a/common/database.cpp b/common/database.cpp index c492f975a..67673640a 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -45,7 +45,7 @@ #include "database.h" #include "eq_packet_structs.h" #include "extprofile.h" -#include "string_util.h" +#include "strings.h" #include "database_schema.h" #include "http/httplib.h" #include "http/uri.h" @@ -107,7 +107,7 @@ uint32 Database::CheckLogin(const char* name, const char* password, const char * "SELECT id, status FROM account WHERE `name` = '{}' AND ls_id = '{}' AND password is NOT NULL " "AND length(password) > 0 AND (password = '{}' OR password = MD5('{}'))", temporary_username, - EscapeString(loginserver), + Strings::Escape(loginserver), temporary_password, temporary_password ); @@ -148,8 +148,8 @@ bool Database::CheckBannedIPs(std::string login_ip) bool Database::AddBannedIP(std::string banned_ip, std::string notes) { auto query = fmt::format( "INSERT into banned_ips SET ip_address = '{}', notes = '{}'", - EscapeString(banned_ip), - EscapeString(notes) + Strings::Escape(banned_ip), + Strings::Escape(notes) ); auto results = QueryDatabase(query); @@ -280,7 +280,7 @@ bool Database::DeleteAccount(const char* name, const char *loginserver) { } bool Database::SetLocalPassword(uint32 accid, const char* password) { - std::string query = StringFormat("UPDATE account SET password=MD5('%s') where id=%i;", EscapeString(password).c_str(), accid); + std::string query = StringFormat("UPDATE account SET password=MD5('%s') where id=%i;", Strings::Escape(password).c_str(), accid); auto results = QueryDatabase(query); @@ -619,8 +619,8 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe ")", character_id, // " id, " account_id, // " account_id, " - EscapeString(pp->name).c_str(), // " `name`, " - EscapeString(pp->last_name).c_str(), // " last_name, " + Strings::Escape(pp->name).c_str(), // " `name`, " + Strings::Escape(pp->last_name).c_str(), // " last_name, " pp->gender, // " gender, " pp->race, // " race, " pp->class_, // " class, " @@ -644,8 +644,8 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe pp->ability_number, // " ability_number, " pp->ability_time_minutes, // " ability_time_minutes, " pp->ability_time_hours, // " ability_time_hours, " - EscapeString(pp->title).c_str(), // " title, " - EscapeString(pp->suffix).c_str(), // " suffix, " + Strings::Escape(pp->title).c_str(), // " title, " + Strings::Escape(pp->suffix).c_str(), // " suffix, " pp->exp, // " exp, " pp->points, // " points, " pp->mana, // " mana, " @@ -781,7 +781,7 @@ uint32 Database::GetCharacterID(const char *name) { Zero will also be returned if there is a database error. */ uint32 Database::GetAccountIDByChar(const char* charname, uint32* oCharID) { - std::string query = StringFormat("SELECT `account_id`, `id` FROM `character_data` WHERE name='%s'", EscapeString(charname).c_str()); + std::string query = StringFormat("SELECT `account_id`, `id` FROM `character_data` WHERE name='%s'", Strings::Escape(charname).c_str()); auto results = QueryDatabase(query); @@ -825,8 +825,8 @@ uint32 Database::GetAccountIDByName(std::string account_name, std::string logins auto query = fmt::format( "SELECT `id`, `status`, `lsaccount_id` FROM `account` WHERE `name` = '{}' AND `ls_id` = '{}' LIMIT 1", - EscapeString(account_name), - EscapeString(loginserver) + Strings::Escape(account_name), + Strings::Escape(loginserver) ); auto results = QueryDatabase(query); @@ -982,8 +982,8 @@ bool Database::GetVariable(std::string varname, std::string &varvalue) bool Database::SetVariable(const std::string varname, const std::string &varvalue) { - std::string escaped_name = EscapeString(varname); - std::string escaped_value = EscapeString(varvalue); + std::string escaped_name = Strings::Escape(varname); + std::string escaped_value = Strings::Escape(varvalue); std::string query = StringFormat("Update variables set value='%s' WHERE varname like '%s'", escaped_value.c_str(), escaped_name.c_str()); auto results = QueryDatabase(query); @@ -1156,7 +1156,7 @@ uint8 Database::GetPEQZone(uint32 zone_id, uint32 version){ bool Database::CheckNameFilter(std::string name, bool surname) { - name = str_tolower(name); + name = Strings::ToLower(name); // the minimum 4 is enforced by the client too if (name.empty() || name.size() < 4) { @@ -1196,7 +1196,7 @@ bool Database::CheckNameFilter(std::string name, bool surname) } for (auto row : results) { - std::string current_row = str_tolower(row[0]); + std::string current_row = Strings::ToLower(row[0]); if (name.find(current_row) != std::string::npos) { return false; } @@ -1473,7 +1473,7 @@ uint32 Database::GetCharacterInfo(std::string character_name, uint32 *account_id { auto query = fmt::format( "SELECT `id`, `account_id`, `zone_id`, `zone_instance` FROM `character_data` WHERE `name` = '{}'", - EscapeString(character_name) + Strings::Escape(character_name) ); auto results = QueryDatabase(query); @@ -1546,7 +1546,7 @@ void Database::AddReport(std::string who, std::string against, std::string lines auto escape_str = new char[lines.size() * 2 + 1]; DoEscapeString(escape_str, lines.c_str(), lines.size()); - std::string query = StringFormat("INSERT INTO reports (name, reported, reported_text) VALUES('%s', '%s', '%s')", EscapeString(who).c_str(), EscapeString(against).c_str(), escape_str); + std::string query = StringFormat("INSERT INTO reports (name, reported, reported_text) VALUES('%s', '%s', '%s')", Strings::Escape(who).c_str(), Strings::Escape(against).c_str(), escape_str); QueryDatabase(query); safe_delete_array(escape_str); } @@ -1644,7 +1644,7 @@ std::string Database::GetGroupLeaderForLogin(std::string character_name) { } void Database::SetGroupLeaderName(uint32 gid, const char* name) { - std::string query = StringFormat("UPDATE group_leaders SET leadername = '%s' WHERE gid = %u", EscapeString(name).c_str(), gid); + std::string query = StringFormat("UPDATE group_leaders SET leadername = '%s' WHERE gid = %u", Strings::Escape(name).c_str(), gid); auto result = QueryDatabase(query); if(result.RowsAffected() != 0) { @@ -1652,7 +1652,7 @@ void Database::SetGroupLeaderName(uint32 gid, const char* name) { } query = StringFormat("REPLACE INTO group_leaders(gid, leadername, marknpc, leadershipaa, maintank, assist, puller, mentoree, mentor_percent) VALUES(%u, '%s', '', '', '', '', '', '', '0')", - gid, EscapeString(name).c_str()); + gid, Strings::Escape(name).c_str()); result = QueryDatabase(query); if(!result.Success()) { @@ -2358,7 +2358,7 @@ bool Database::CopyCharacter( results = QueryDatabase( fmt::format( "SELECT {} FROM {} WHERE {} = {}", - implode(",", wrap(columns, "`")), + Strings::Implode(",", Strings::Wrap(columns, "`")), table_name, character_id_column_name, source_character_id @@ -2394,7 +2394,7 @@ bool Database::CopyCharacter( std::vector insert_rows; for (auto &r: new_rows) { - std::string insert_row = "(" + implode(",", wrap(r, "'")) + ")"; + std::string insert_row = "(" + Strings::Implode(",", Strings::Wrap(r, "'")) + ")"; insert_rows.emplace_back(insert_row); } @@ -2412,8 +2412,8 @@ bool Database::CopyCharacter( fmt::format( "INSERT INTO {} ({}) VALUES {}", table_name, - implode(",", wrap(columns, "`")), - implode(",", insert_rows) + Strings::Implode(",", Strings::Wrap(columns, "`")), + Strings::Implode(",", insert_rows) ) ); @@ -2465,8 +2465,8 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur if (auto res = cli.Get(request_uri.get_path().c_str())) { if (res->status == 200) { - for (auto &s: SplitString(res->body, ';')) { - if (!trim(s).empty()) { + for (auto &s: Strings::Split(res->body, ';')) { + if (!Strings::Trim(s).empty()) { auto results = QueryDatabase(s); if (!results.ErrorMessage().empty()) { LogError("Error sourcing SQL [{}]", results.ErrorMessage()); diff --git a/common/database/database_dump_service.cpp b/common/database/database_dump_service.cpp index 8fdb1a16d..e2ba39d81 100644 --- a/common/database/database_dump_service.cpp +++ b/common/database/database_dump_service.cpp @@ -23,7 +23,7 @@ #include #include "database_dump_service.h" #include "../eqemu_logsys.h" -#include "../string_util.h" +#include "../strings.h" #include "../eqemu_config.h" #include "../database_schema.h" #include "../file_util.h" @@ -119,7 +119,7 @@ std::string DatabaseDumpService::GetMySQLVersion() { std::string version_output = execute("mysql --version"); - return trim(version_output); + return Strings::Trim(version_output); } /** @@ -160,7 +160,7 @@ std::string DatabaseDumpService::GetPlayerTablesList() tables_list += table + " "; } - return trim(tables_list); + return Strings::Trim(tables_list); } /** @@ -174,7 +174,7 @@ std::string DatabaseDumpService::GetBotTablesList() tables_list += table + " "; } - return trim(tables_list); + return Strings::Trim(tables_list); } /** @@ -188,7 +188,7 @@ std::string DatabaseDumpService::GetLoginTableList() tables_list += table + " "; } - return trim(tables_list); + return Strings::Trim(tables_list); } /** @@ -202,7 +202,7 @@ std::string DatabaseDumpService::GetQueryServTables() tables_list += table + " "; } - return trim(tables_list); + return Strings::Trim(tables_list); } /** @@ -222,7 +222,7 @@ std::string DatabaseDumpService::GetSystemTablesList() tables_list += table + " "; } - return trim(tables_list); + return Strings::Trim(tables_list); } /** * @return @@ -236,7 +236,7 @@ std::string DatabaseDumpService::GetStateTablesList() tables_list += table + " "; } - return trim(tables_list); + return Strings::Trim(tables_list); } /** @@ -251,7 +251,7 @@ std::string DatabaseDumpService::GetContentTablesList() tables_list += table + " "; } - return trim(tables_list); + return Strings::Trim(tables_list); } /** @@ -331,7 +331,7 @@ void DatabaseDumpService::Dump() tables_to_dump += GetPlayerTablesList() + " "; dump_descriptor += "-player"; } - + if (IsDumpBotTables()) { tables_to_dump += GetBotTablesList() + " "; dump_descriptor += "-bots"; @@ -388,7 +388,7 @@ void DatabaseDumpService::Dump() } if (IsDumpDropTableSyntaxOnly()) { - std::vector tables = SplitString(tables_to_dump, ' '); + std::vector tables = Strings::Split(tables_to_dump, ' '); for (auto &table : tables) { std::cout << "DROP TABLE IF EXISTS `" << table << "`;" << std::endl; diff --git a/common/database_conversions.cpp b/common/database_conversions.cpp index d3dfd92ab..15bc1fd23 100644 --- a/common/database_conversions.cpp +++ b/common/database_conversions.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "../common/global_define.h" #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/timer.h" #include "database.h" @@ -961,7 +961,7 @@ bool Database::CheckDatabaseConvertPPDeblob(){ std::string rquery = StringFormat("REPLACE INTO `character_inspect_messages` (id, inspect_message)" "VALUES (%u, '%s')", character_id, - EscapeString(inspectmessage).c_str() + Strings::Escape(inspectmessage).c_str() ); auto results = QueryDatabase(rquery); } @@ -1097,95 +1097,95 @@ bool Database::CheckDatabaseConvertPPDeblob(){ "e_expended_aa_spent" ")" "VALUES (" - "%u," // id - "%u," // account_id - "'%s'," // `name` - "'%s'," // last_name - "%u," // gender - "%u," // race - "%u," // class - "%u," // `level` - "%u," // deity - "%u," // birthday - "%u," // last_login - "%u," // time_played - "%u," // pvp_status - "%u," // level2 - "%u," // anon - "%u," // gm - "%u," // intoxication - "%u," // hair_color - "%u," // beard_color - "%u," // eye_color_1 - "%u," // eye_color_2 - "%u," // hair_style - "%u," // beard - "%u," // ability_time_seconds - "%u," // ability_number - "%u," // ability_time_minutes - "%u," // ability_time_hours - "'%s'," // title - "'%s'," // suffix - "%u," // exp - "%u," // points - "%u," // mana - "%u," // cur_hp - "%u," // str - "%u," // sta - "%u," // cha - "%u," // dex - "%u," // `int` - "%u," // agi - "%u," // wis - "%u," // face - "%f," // y - "%f," // x - "%f," // z - "%f," // heading - "%u," // pvp2 - "%u," // pvp_type - "%u," // autosplit_enabled - "%u," // zone_change_count - "%u," // drakkin_heritage - "%u," // drakkin_tattoo - "%u," // drakkin_details - "%i," // toxicity - "%u," // hunger_level - "%u," // thirst_level - "%u," // ability_up - "%u," // zone_id - "%u," // zone_instance - "%u," // leadership_exp_on - "%u," // ldon_points_guk - "%u," // ldon_points_mir - "%u," // ldon_points_mmc - "%u," // ldon_points_ruj - "%u," // ldon_points_tak - "%u," // ldon_points_available - "%u," // tribute_time_remaining - "%u," // show_helm - "%u," // career_tribute_points - "%u," // tribute_points - "%u," // tribute_active - "%u," // endurance - "%u," // group_leadership_exp - "%u," // raid_leadership_exp - "%u," // group_leadership_points - "%u," // raid_leadership_points - "%u," // air_remaining - "%u," // pvp_kills - "%u," // pvp_deaths - "%u," // pvp_current_points - "%u," // pvp_career_points - "%u," // pvp_best_kill_streak - "%u," // pvp_worst_death_streak - "%u," // pvp_current_kill_streak - "%u," // aa_points_spent - "%u," // aa_exp - "%u," // aa_points - "%u," // group_auto_consent - "%u," // raid_auto_consent - "%u," // guild_auto_consent + "%u," // id + "%u," // account_id + "'%s'," // `name` + "'%s'," // last_name + "%u," // gender + "%u," // race + "%u," // class + "%u," // `level` + "%u," // deity + "%u," // birthday + "%u," // last_login + "%u," // time_played + "%u," // pvp_status + "%u," // level2 + "%u," // anon + "%u," // gm + "%u," // intoxication + "%u," // hair_color + "%u," // beard_color + "%u," // eye_color_1 + "%u," // eye_color_2 + "%u," // hair_style + "%u," // beard + "%u," // ability_time_seconds + "%u," // ability_number + "%u," // ability_time_minutes + "%u," // ability_time_hours + "'%s'," // title + "'%s'," // suffix + "%u," // exp + "%u," // points + "%u," // mana + "%u," // cur_hp + "%u," // str + "%u," // sta + "%u," // cha + "%u," // dex + "%u," // `int` + "%u," // agi + "%u," // wis + "%u," // face + "%f," // y + "%f," // x + "%f," // z + "%f," // heading + "%u," // pvp2 + "%u," // pvp_type + "%u," // autosplit_enabled + "%u," // zone_change_count + "%u," // drakkin_heritage + "%u," // drakkin_tattoo + "%u," // drakkin_details + "%i," // toxicity + "%u," // hunger_level + "%u," // thirst_level + "%u," // ability_up + "%u," // zone_id + "%u," // zone_instance + "%u," // leadership_exp_on + "%u," // ldon_points_guk + "%u," // ldon_points_mir + "%u," // ldon_points_mmc + "%u," // ldon_points_ruj + "%u," // ldon_points_tak + "%u," // ldon_points_available + "%u," // tribute_time_remaining + "%u," // show_helm + "%u," // career_tribute_points + "%u," // tribute_points + "%u," // tribute_active + "%u," // endurance + "%u," // group_leadership_exp + "%u," // raid_leadership_exp + "%u," // group_leadership_points + "%u," // raid_leadership_points + "%u," // air_remaining + "%u," // pvp_kills + "%u," // pvp_deaths + "%u," // pvp_current_points + "%u," // pvp_career_points + "%u," // pvp_best_kill_streak + "%u," // pvp_worst_death_streak + "%u," // pvp_current_kill_streak + "%u," // aa_points_spent + "%u," // aa_exp + "%u," // aa_points + "%u," // group_auto_consent + "%u," // raid_auto_consent + "%u," // guild_auto_consent "%u," // RestTimer "%u," // First Logon - References online status for EVENT_CONNECT/EVENT_DISCONNECt "%u," // Looking for Group @@ -1198,8 +1198,8 @@ bool Database::CheckDatabaseConvertPPDeblob(){ ")", character_id, account_id, - EscapeString(pp->name).c_str(), - EscapeString(pp->last_name).c_str(), + Strings::Escape(pp->name).c_str(), + Strings::Escape(pp->last_name).c_str(), pp->gender, pp->race, pp->class_, @@ -1223,8 +1223,8 @@ bool Database::CheckDatabaseConvertPPDeblob(){ pp->ability_number, pp->ability_time_minutes, pp->ability_time_hours, - EscapeString(pp->title).c_str(), - EscapeString(pp->suffix).c_str(), + Strings::Escape(pp->title).c_str(), + Strings::Escape(pp->suffix).c_str(), pp->exp, pp->points, pp->mana, diff --git a/common/database_instances.cpp b/common/database_instances.cpp index 75edd9fd3..fd2659e39 100644 --- a/common/database_instances.cpp +++ b/common/database_instances.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "../common/global_define.h" #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/timer.h" #include "../common/repositories/dynamic_zone_members_repository.h" #include "../common/repositories/dynamic_zones_repository.h" @@ -485,7 +485,7 @@ void Database::BuryCorpsesInInstance(uint16 instance_id) { void Database::DeleteInstance(uint16 instance_id) { std::string query; - + query = StringFormat("DELETE FROM instance_list_player WHERE id=%u", instance_id); QueryDatabase(query); @@ -580,7 +580,7 @@ void Database::PurgeExpiredInstances() instance_ids.emplace_back(row[0]); } - std::string imploded_instance_ids = implode(",", instance_ids); + std::string imploded_instance_ids = Strings::Implode(",", instance_ids); QueryDatabase(fmt::format("DELETE FROM instance_list WHERE id IN ({})", imploded_instance_ids)); QueryDatabase(fmt::format("DELETE FROM instance_list_player WHERE id IN ({})", imploded_instance_ids)); diff --git a/common/discord/discord.cpp b/common/discord/discord.cpp index 5d17f4d35..48e27b17c 100644 --- a/common/discord/discord.cpp +++ b/common/discord/discord.cpp @@ -1,7 +1,7 @@ #include "discord.h" #include "../http/httplib.h" #include "../json/json.h" -#include "../string_util.h" +#include "../strings.h" #include "../eqemu_logsys.h" constexpr int MAX_RETRIES = 10; @@ -21,11 +21,11 @@ void Discord::SendWebhookMessage(const std::string &message, const std::string & } // split - auto s = SplitString(webhook_url, '/'); + auto s = Strings::Split(webhook_url, '/'); // url std::string base_url = fmt::format("{}//{}", s[0], s[2]); - std::string endpoint = replace_string(webhook_url, base_url, ""); + std::string endpoint = Strings::Replace(webhook_url, base_url, ""); // client httplib::Client cli(base_url.c_str()); diff --git a/common/discord_manager.cpp b/common/discord_manager.cpp index d889b7e9b..2e0143f6a 100644 --- a/common/discord_manager.cpp +++ b/common/discord_manager.cpp @@ -1,7 +1,7 @@ #include "discord_manager.h" #include "../common/discord/discord.h" #include "../common/eqemu_logsys.h" -#include "../common/string_util.h" +#include "../common/strings.h" void DiscordManager::QueueWebhookMessage(uint32 webhook_id, const std::string &message) { diff --git a/common/eq_stream.cpp b/common/eq_stream.cpp index 61162580a..0182c53f4 100644 --- a/common/eq_stream.cpp +++ b/common/eq_stream.cpp @@ -23,7 +23,7 @@ #include "op_codes.h" #include "crc16.h" #include "platform.h" -#include "string_util.h" +#include "strings.h" #include #include @@ -406,7 +406,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p) if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) { LogNetcode(_L "Pre-OOA Invalid Sequenced queue: BS [{}] + SQ [{}] != NOS [{}]" __L, SequencedBase, SequencedQueue.size(), NextOutSeq); } - + //if the packet they got out of order is between our last acked packet and the last sent packet, then its valid. if (CompareSequence(SequencedBase,seq) != SeqPast && CompareSequence(NextOutSeq,seq) == SeqPast) { Log(Logs::Detail, Logs::Netcode, _L "Received OP_OutOfOrderAck for sequence %d, starting retransmit at the start of our unacked buffer (seq %d, was %d)." __L, @@ -453,7 +453,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p) (unsigned long)ntohl(ClientStats->packets_received), (unsigned long)ntohl(ClientStats->packets_sent), (unsigned long)ntohl(ClientStats->last_local_delta), (unsigned long)ntohl(ClientStats->low_delta), (unsigned long)ntohl(ClientStats->average_delta), (unsigned long)ntohl(ClientStats->high_delta), (unsigned long)ntohl(ClientStats->last_remote_delta)); - + AdjustRates(ntohl(ClientStats->average_delta)); if(GetExecutablePlatform() == ExePlatformWorld || GetExecutablePlatform() == ExePlatformZone) { @@ -951,7 +951,7 @@ EQRawApplicationPacket *p=nullptr; EmuOpcode emu_op = (*OpMgr)->EQToEmu(p->opcode); if (emu_op == OP_Unknown) { // Log(Logs::General, Logs::Client_Server_Packet_Unhandled, "Unknown :: [%s - 0x%04x] [Size: %u] %s", OpcodeManager::EmuToName(p->GetOpcode()), p->opcode, p->Size(), DumpPacketToString(p).c_str()); - } + } p->SetOpcode(emu_op); } } @@ -1359,11 +1359,11 @@ void EQStream::AdjustRates(uint32 average_delta) DecayRate=DECAYBASE/average_delta; if (BytesWritten > RateThreshold) BytesWritten = RateThreshold + DecayRate; - Log(Logs::Detail, Logs::Netcode, _L "Adjusting data rate to thresh %d, decay %d based on avg delta %d" __L, + Log(Logs::Detail, Logs::Netcode, _L "Adjusting data rate to thresh %d, decay %d based on avg delta %d" __L, RateThreshold, DecayRate, average_delta); MRate.unlock(); } else { - Log(Logs::Detail, Logs::Netcode, _L "Not adjusting data rate because avg delta over max (%d > %d)" __L, + Log(Logs::Detail, Logs::Netcode, _L "Not adjusting data rate because avg delta over max (%d > %d)" __L, average_delta, AVERAGE_DELTA_MAX); AverageDelta = AVERAGE_DELTA_MAX; } @@ -1374,7 +1374,7 @@ void EQStream::AdjustRates(uint32 average_delta) BytesWritten = 0; RateThreshold=RATEBASE/average_delta; DecayRate=DECAYBASE/average_delta; - Log(Logs::Detail, Logs::Netcode, _L "Adjusting data rate to thresh %d, decay %d based on avg delta %d" __L, + Log(Logs::Detail, Logs::Netcode, _L "Adjusting data rate to thresh %d, decay %d based on avg delta %d" __L, RateThreshold, DecayRate, average_delta); MRate.unlock(); } diff --git a/common/eqemu_logsys.cpp b/common/eqemu_logsys.cpp index 453b9566e..eacc6ee68 100644 --- a/common/eqemu_logsys.cpp +++ b/common/eqemu_logsys.cpp @@ -21,7 +21,7 @@ #include "eqemu_logsys.h" #include "rulesys.h" #include "platform.h" -#include "string_util.h" +#include "strings.h" #include "misc.h" #include "discord/discord.h" #include "repositories/discord_webhooks_repository.h" @@ -650,7 +650,7 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings() auto new_category = LogsysCategoriesRepository::NewEntity(); new_category.log_category_id = i; - new_category.log_category_description = EscapeString(Logs::LogCategoryName[i]); + new_category.log_category_description = Strings::Escape(Logs::LogCategoryName[i]); new_category.log_to_console = log_settings[i].log_to_console; new_category.log_to_gmsay = log_settings[i].log_to_gmsay; new_category.log_to_file = log_settings[i].log_to_file; diff --git a/common/expedition_lockout_timer.cpp b/common/expedition_lockout_timer.cpp index dc4cb97c6..6422ad55a 100644 --- a/common/expedition_lockout_timer.cpp +++ b/common/expedition_lockout_timer.cpp @@ -19,7 +19,7 @@ */ #include "expedition_lockout_timer.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/rulesys.h" #include "../common/util/uuid.h" #include diff --git a/common/guild_base.cpp b/common/guild_base.cpp index 07ba3b040..eec10a696 100644 --- a/common/guild_base.cpp +++ b/common/guild_base.cpp @@ -20,7 +20,7 @@ #include "database.h" //#include "misc_functions.h" -#include "string_util.h" +#include "strings.h" #include #include @@ -1281,10 +1281,10 @@ bool BaseGuildManager::IsCharacterInGuild(uint32 character_id, uint32 guild_id) if (current_guild_id == GUILD_NONE) { return false; } - + if (guild_id && current_guild_id != guild_id) { return false; } return true; -} \ No newline at end of file +} diff --git a/common/inventory_profile.cpp b/common/inventory_profile.cpp index fbc794351..0325ef8f3 100644 --- a/common/inventory_profile.cpp +++ b/common/inventory_profile.cpp @@ -25,7 +25,7 @@ //#include "races.h" //#include "rulesys.h" //#include "shareddb.h" -#include "string_util.h" +#include "strings.h" #include "../common/light_source.h" @@ -245,7 +245,7 @@ int16 EQ::InventoryProfile::PutItem(int16 slot_id, const ItemInstance& inst) if (temp_slot >= m_lookup->InventoryTypeSize.Bank) return EQ::invslot::SLOT_INVALID; } - + // Clean up item already in slot (if exists) DeleteItem(slot_id); @@ -617,7 +617,7 @@ int EQ::InventoryProfile::CountAugmentEquippedByID(uint32 item_id) quantity += item->CountAugmentByID(item_id); } } - + return quantity; } @@ -648,7 +648,7 @@ int EQ::InventoryProfile::CountItemEquippedByID(uint32 item_id) quantity += item->IsStackable() ? item->GetCharges() : 1; } } - + return quantity; } @@ -993,7 +993,7 @@ int16 EQ::InventoryProfile::CalcSlotId(int16 slot_id) { //else if (slot_id >= EmuConstants::BANK_BEGIN && slot_id <= EmuConstants::BANK_END) // parent_slot_id = EmuConstants::BANK_BEGIN + (slot_id - EmuConstants::BANK_BEGIN) / EmuConstants::ITEM_CONTAINER_SIZE; //else if (slot_id >= 3100 && slot_id <= 3179) should be {3031..3110}..where did this range come from!!? (verified db save range) - + if (slot_id >= invbag::GENERAL_BAGS_BEGIN && slot_id <= invbag::GENERAL_BAGS_END) { parent_slot_id = invslot::GENERAL_BEGIN + (slot_id - invbag::GENERAL_BAGS_BEGIN) / invbag::SLOT_COUNT; } @@ -1231,7 +1231,7 @@ uint8 EQ::InventoryProfile::FindBrightestLightType() for (auto iter = m_worn.begin(); iter != m_worn.end(); ++iter) { if ((iter->first < invslot::EQUIPMENT_BEGIN || iter->first > invslot::EQUIPMENT_END)) continue; - + if (iter->first == invslot::slotAmmo) continue; @@ -1369,7 +1369,7 @@ EQ::ItemInstance* EQ::InventoryProfile::_GetItem(const std::map= m_lookup->InventoryTypeSize.Bank) return nullptr; } - + auto it = bucket.find(slot_id); if (it != bucket.end()) { return it->second; @@ -1441,7 +1441,7 @@ int16 EQ::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst) result = slot_id; } } - + if (result == INVALID_INDEX) { LogError("InventoryProfile::_PutItem: Invalid slot_id specified ({}) with parent slot id ({})", slot_id, parentSlot); InventoryProfile::MarkDirty(inst); // Slot not found, clean up @@ -1478,7 +1478,7 @@ int16 EQ::InventoryProfile::_HasItem(std::map& bucket, uin if (inst->GetAugmentItemID(index) == item_id && quantity <= 1) return invslot::SLOT_AUGMENT_GENERIC_RETURN; } - + if (!inst->IsClassBag()) { continue; } for (auto bag_iter = inst->_cbegin(); bag_iter != inst->_cend(); ++bag_iter) { @@ -1509,7 +1509,7 @@ int16 EQ::InventoryProfile::_HasItem(ItemInstQueue& iqueue, uint32 item_id, uint // is sufficient. However, in cases where referential criteria is considered, this can lead // to unintended results. Funtionality should be observed when referencing the return value // of this query - + uint32 quantity_found = 0; for (auto iter = iqueue.cbegin(); iter != iqueue.cend(); ++iter) { @@ -1715,6 +1715,6 @@ int16 EQ::InventoryProfile::_HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 lo // We only check the visible cursor due to lack of queue processing ability (client allows duplicate in limbo) break; } - + return EQ::invslot::SLOT_INVALID; } diff --git a/common/inventory_slot.cpp b/common/inventory_slot.cpp index b86b5ca91..a63512ae2 100644 --- a/common/inventory_slot.cpp +++ b/common/inventory_slot.cpp @@ -19,7 +19,7 @@ #include "inventory_slot.h" #include "textures.h" -#include "string_util.h" +#include "strings.h" int8 EQ::inventory::ConvertEquipmentIndexToTextureIndex(int16 slot_index) @@ -86,7 +86,7 @@ bool EQ::InventorySlot::IsValidSlot() const { if (_typeless) return false; - + int16 slot_count = invtype::GetInvTypeSize(_type_index); if (!slot_count || _slot_index < invslot::SLOT_BEGIN || _slot_index >= slot_count) return false; @@ -136,7 +136,7 @@ bool EQ::InventorySlot::IsWeaponIndex(int16 slot_index) { if (slot_index == invslot::slotPrimary || slot_index == invslot::slotSecondary || slot_index == invslot::slotRange) return true; - + return false; } @@ -364,7 +364,7 @@ bool EQ::InventorySlot::operator<(const InventorySlot& rhs) const { if (Typeless() || rhs.Typeless()) return inventory_slot_typeless_lessthan(*this, rhs); - + if (TypeIndex() < rhs.TypeIndex()) return true; @@ -384,6 +384,6 @@ bool EQ::operator==(const InventorySlot& lhs, const InventorySlot& rhs) { if (lhs.Typeless() || rhs.Typeless()) return ((lhs.SlotIndex() == rhs.SlotIndex()) && (lhs.ContainerIndex() == rhs.ContainerIndex()) && (lhs.SocketIndex() == rhs.SocketIndex())); - + return ((lhs.TypeIndex() == rhs.TypeIndex()) && (lhs.SlotIndex() == rhs.SlotIndex()) && (lhs.ContainerIndex() == rhs.ContainerIndex()) && (lhs.SocketIndex() == rhs.SocketIndex())); } diff --git a/common/item_instance.cpp b/common/item_instance.cpp index 185f2960b..6f0e4b32a 100644 --- a/common/item_instance.cpp +++ b/common/item_instance.cpp @@ -23,7 +23,7 @@ //#include "races.h" #include "rulesys.h" #include "shareddb.h" -#include "string_util.h" +#include "strings.h" //#include "../common/light_source.h" diff --git a/common/md5.cpp b/common/md5.cpp index e3df1ff3c..ca2e38eb2 100644 --- a/common/md5.cpp +++ b/common/md5.cpp @@ -9,7 +9,7 @@ */ #include /* for memcpy() */ #include "../common/md5.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/seperator.h" MD5::MD5() { diff --git a/common/net/console_server.cpp b/common/net/console_server.cpp index 31b597bfb..1b8e8af32 100644 --- a/common/net/console_server.cpp +++ b/common/net/console_server.cpp @@ -1,5 +1,5 @@ #include "console_server.h" -#include "../string_util.h" +#include "../strings.h" #include EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port) @@ -52,11 +52,11 @@ void EQ::Net::ConsoleServer::ConnectionDisconnected(ConsoleServerConnection *c) void EQ::Net::ConsoleServer::ProcessCommand(ConsoleServerConnection *c, const std::string &cmd) { - auto split = SplitString(cmd, ' '); - + auto split = Strings::Split(cmd, ' '); + if (split.size() > 0) { auto command = split[0]; - ToLowerString(command); + command = Strings::ToLower(command); if (command == "help" || command == "?") { c->SendLine("Commands:"); @@ -70,9 +70,9 @@ void EQ::Net::ConsoleServer::ProcessCommand(ConsoleServerConnection *c, const st c->SendPrompt(); return; } - + split.erase(split.begin(), split.begin() + 1); - + auto cmd_def = m_commands.find(command); if (cmd_def != m_commands.end()) { if (c->Admin() >= cmd_def->second.status_required) { diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp index 908ecc26b..08f7aee8d 100644 --- a/common/patches/rof.cpp +++ b/common/patches/rof.cpp @@ -11,7 +11,7 @@ are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -28,7 +28,7 @@ #include "../eq_packet_structs.h" #include "../misc_functions.h" -#include "../string_util.h" +#include "../strings.h" #include "../inventory_profile.h" #include "rof_structs.h" #include "../rulesys.h" @@ -52,13 +52,13 @@ namespace RoF static inline structs::InventorySlot_Struct ServerToRoFCorpseSlot(uint32 server_corpse_slot); static inline uint32 ServerToRoFCorpseMainSlot(uint32 server_corpse_slot); static inline structs::TypelessInventorySlot_Struct ServerToRoFTypelessSlot(uint32 server_slot, int16 server_type); - + // client to server inventory location converters static inline uint32 RoFToServerSlot(structs::InventorySlot_Struct rof_slot); static inline uint32 RoFToServerCorpseSlot(structs::InventorySlot_Struct rof_corpse_slot); static inline uint32 RoFToServerCorpseMainSlot(uint32 rof_corpse_slot); static inline uint32 RoFToServerTypelessSlot(structs::TypelessInventorySlot_Struct rof_slot, int16 rof_type); - + // server to client say link converter static inline void ServerToRoFSayLink(std::string& rofSayLink, const std::string& serverSayLink); @@ -1558,7 +1558,7 @@ namespace RoF in->size = ob.size(); in->pBuffer = ob.detach(); - + delete[] __emu_buffer; dest->FastQueuePacket(&in, ack_req); @@ -5188,7 +5188,7 @@ namespace RoF void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth, ItemPacketType packet_type) { const EQ::ItemData *item = inst->GetUnscaledItem(); - + RoF::structs::ItemSerializationHeader hdr; //sprintf(hdr.unknown000, "06e0002Y1W00"); @@ -5207,7 +5207,7 @@ namespace RoF slot_id = ServerToRoFSlot(slot_id_in); break; } - + hdr.slot_type = (inst->GetMerchantSlot() ? invtype::typeMerchant : slot_id.Type); hdr.main_slot = (inst->GetMerchantSlot() ? inst->GetMerchantSlot() : slot_id.Slot); hdr.sub_slot = (inst->GetMerchantSlot() ? 0xffff : slot_id.SubIndex); @@ -5295,7 +5295,7 @@ namespace RoF ob.write("\0", 1); ob.write("\0", 1); - + RoF::structs::ItemBodyStruct ibs; memset(&ibs, 0, sizeof(RoF::structs::ItemBodyStruct)); @@ -5608,7 +5608,7 @@ namespace RoF iqbs.unknown28 = 0; iqbs.unknown30 = 0; iqbs.unknown39 = 1; - + ob.write((const char*)&iqbs, sizeof(RoF::structs::ItemQuaternaryBodyStruct)); EQ::OutBuffer::pos_type count_pos = ob.tellp(); @@ -5776,7 +5776,7 @@ namespace RoF static inline uint32 ServerToRoFCorpseMainSlot(uint32 server_corpse_slot) { uint32 RoFSlot = invslot::SLOT_INVALID; - + if (server_corpse_slot <= EQ::invslot::CORPSE_END && server_corpse_slot >= EQ::invslot::CORPSE_BEGIN) { RoFSlot = server_corpse_slot; } @@ -6123,7 +6123,7 @@ namespace RoF return; } - auto segments = SplitString(serverSayLink, '\x12'); + auto segments = Strings::Split(serverSayLink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { @@ -6162,7 +6162,7 @@ namespace RoF return; } - auto segments = SplitString(rofSayLink, '\x12'); + auto segments = Strings::Split(rofSayLink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp index e6404a62a..8053fac07 100644 --- a/common/patches/rof2.cpp +++ b/common/patches/rof2.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -28,7 +28,7 @@ #include "../eq_packet_structs.h" #include "../misc_functions.h" -#include "../string_util.h" +#include "../strings.h" #include "../inventory_profile.h" #include "rof2_structs.h" #include "../rulesys.h" @@ -53,13 +53,13 @@ namespace RoF2 static inline structs::InventorySlot_Struct ServerToRoF2CorpseSlot(uint32 server_corpse_slot); static inline uint32 ServerToRoF2CorpseMainSlot(uint32 server_corpse_slot); static inline structs::TypelessInventorySlot_Struct ServerToRoF2TypelessSlot(uint32 server_slot, int16 server_type); - + // client to server inventory location converters static inline uint32 RoF2ToServerSlot(structs::InventorySlot_Struct rof2_slot); static inline uint32 RoF2ToServerCorpseSlot(structs::InventorySlot_Struct rof2_corpse_slot); static inline uint32 RoF2ToServerCorpseMainSlot(uint32 rof2_corpse_slot); static inline uint32 RoF2ToServerTypelessSlot(structs::TypelessInventorySlot_Struct rof2_slot, int16 rof2_type); - + // server to client say link converter static inline void ServerToRoF2SayLink(std::string &rof2_saylink, const std::string &server_saylink); @@ -2894,12 +2894,12 @@ namespace RoF2 EQApplicationPacket *inapp = *p; *p = nullptr; AARankInfo_Struct *emu = (AARankInfo_Struct*)inapp->pBuffer; - + // the structs::SendAA_Struct includes enough space for 1 prereq which is the min even if it has no prereqs auto prereq_size = emu->total_prereqs > 1 ? (emu->total_prereqs - 1) * 8 : 0; auto outapp = new EQApplicationPacket(OP_SendAATable, sizeof(structs::SendAA_Struct) + emu->total_effects * sizeof(structs::AA_Ability) + prereq_size); inapp->SetReadPosition(sizeof(AARankInfo_Struct)+emu->total_effects * sizeof(AARankEffect_Struct)); - + std::vector skill; std::vector points; @@ -2962,7 +2962,7 @@ namespace RoF2 outapp->WriteUInt32(inapp->ReadUInt32()); // base2 outapp->WriteUInt32(inapp->ReadUInt32()); // slot } - + dest->FastQueuePacket(&outapp); delete inapp; } @@ -5062,11 +5062,11 @@ namespace RoF2 SETUP_DIRECT_DECODE(MoveItem_Struct, structs::MoveItem_Struct); Log(Logs::Moderate, Logs::Netcode, "RoF2::DECODE(OP_MoveItem)"); - + emu->from_slot = RoF2ToServerSlot(eq->from_slot); emu->to_slot = RoF2ToServerSlot(eq->to_slot); IN(number_in_stack); - + //LogNetcode("[RoF2] MoveItem Slot from [{}] to [{}], Number [{}]", emu->from_slot, emu->to_slot, emu->number_in_stack); FINISH_DIRECT_DECODE(); @@ -5443,7 +5443,7 @@ namespace RoF2 void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth, ItemPacketType packet_type) { const EQ::ItemData *item = inst->GetUnscaledItem(); - + RoF2::structs::ItemSerializationHeader hdr; //sprintf(hdr.unknown000, "06e0002Y1W00"); @@ -5462,7 +5462,7 @@ namespace RoF2 slot_id = ServerToRoF2Slot(slot_id_in); break; } - + hdr.slot_type = (inst->GetMerchantSlot() ? invtype::typeMerchant : slot_id.Type); hdr.main_slot = (inst->GetMerchantSlot() ? inst->GetMerchantSlot() : slot_id.Slot); hdr.sub_slot = (inst->GetMerchantSlot() ? 0xffff : slot_id.SubIndex); @@ -5550,7 +5550,7 @@ namespace RoF2 ob.write("\0", 1); ob.write("\0", 1); - + RoF2::structs::ItemBodyStruct ibs; memset(&ibs, 0, sizeof(RoF2::structs::ItemBodyStruct)); @@ -5873,7 +5873,7 @@ namespace RoF2 iqbs.unknown37a = 0; // (guessed position) New to RoF2 iqbs.unknown38 = 0; iqbs.unknown39 = 1; - + ob.write((const char*)&iqbs, sizeof(RoF2::structs::ItemQuaternaryBodyStruct)); EQ::OutBuffer::pos_type count_pos = ob.tellp(); @@ -6073,7 +6073,7 @@ namespace RoF2 uint32 server_slot = EQ::invslot::SLOT_INVALID; uint32 temp_slot = invslot::SLOT_INVALID; - + switch (rof2_slot.Type) { case invtype::typePossessions: { if (rof2_slot.Slot >= invslot::POSSESSIONS_BEGIN && rof2_slot.Slot <= invslot::POSSESSIONS_END) { @@ -6188,11 +6188,11 @@ namespace RoF2 static inline uint32 RoF2ToServerCorpseSlot(structs::InventorySlot_Struct rof2_corpse_slot) { uint32 ServerSlot = EQ::invslot::SLOT_INVALID; - + if (rof2_corpse_slot.Type != invtype::typeCorpse || rof2_corpse_slot.SubIndex != invbag::SLOT_INVALID || rof2_corpse_slot.AugIndex != invaug::SOCKET_INVALID) { ServerSlot = EQ::invslot::SLOT_INVALID; } - + else { ServerSlot = RoF2ToServerCorpseMainSlot(rof2_corpse_slot.Slot); } @@ -6346,7 +6346,7 @@ namespace RoF2 return; } - auto segments = SplitString(server_saylink, '\x12'); + auto segments = Strings::Split(server_saylink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { @@ -6378,7 +6378,7 @@ namespace RoF2 return; } - auto segments = SplitString(rof2_saylink, '\x12'); + auto segments = Strings::Split(rof2_saylink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { diff --git a/common/patches/rof2_limits.cpp b/common/patches/rof2_limits.cpp index c67ccf3ad..6df113f51 100644 --- a/common/patches/rof2_limits.cpp +++ b/common/patches/rof2_limits.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -19,7 +19,7 @@ #include "rof2_limits.h" -#include "../string_util.h" +#include "../strings.h" int16 RoF2::invtype::GetInvTypeSize(int16 inv_type) diff --git a/common/patches/rof_limits.cpp b/common/patches/rof_limits.cpp index 6c30b85f7..beb2bdbbc 100644 --- a/common/patches/rof_limits.cpp +++ b/common/patches/rof_limits.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -19,7 +19,7 @@ #include "rof_limits.h" -#include "../string_util.h" +#include "../strings.h" int16 RoF::invtype::GetInvTypeSize(int16 inv_type) diff --git a/common/patches/sod.cpp b/common/patches/sod.cpp index 32e58e432..ae7036664 100644 --- a/common/patches/sod.cpp +++ b/common/patches/sod.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -28,7 +28,7 @@ #include "../eq_packet_structs.h" #include "../misc_functions.h" -#include "../string_util.h" +#include "../strings.h" #include "../item_instance.h" #include "sod_structs.h" #include "../rulesys.h" @@ -407,7 +407,7 @@ namespace SoD in->size = ob.size(); in->pBuffer = ob.detach(); - + delete[] __emu_buffer; dest->FastQueuePacket(&in, ack_req); @@ -1089,7 +1089,7 @@ namespace SoD //store away the emu struct uchar* __emu_buffer = in->pBuffer; - + EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]); EQ::OutBuffer ob; @@ -1106,7 +1106,7 @@ namespace SoD in->size = ob.size(); in->pBuffer = ob.detach(); - + delete[] __emu_buffer; dest->FastQueuePacket(&in, ack_req); @@ -3538,7 +3538,7 @@ namespace SoD void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth) { const EQ::ItemData *item = inst->GetUnscaledItem(); - + SoD::structs::ItemSerializationHeader hdr; hdr.stacksize = (inst->IsStackable() ? ((inst->GetCharges() > 254) ? 0xFFFFFFFF : inst->GetCharges()) : 1); @@ -3849,7 +3849,7 @@ namespace SoD iqbs.HealAmt = item->HealAmt; iqbs.SpellDmg = item->SpellDmg; iqbs.Clairvoyance = item->Clairvoyance; - + ob.write((const char*)&iqbs, sizeof(SoD::structs::ItemQuaternaryBodyStruct)); EQ::OutBuffer::pos_type count_pos = ob.tellp(); @@ -4061,7 +4061,7 @@ namespace SoD return; } - auto segments = SplitString(server_saylink, '\x12'); + auto segments = Strings::Split(server_saylink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { @@ -4101,7 +4101,7 @@ namespace SoD return; } - auto segments = SplitString(sod_saylink, '\x12'); + auto segments = Strings::Split(sod_saylink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { diff --git a/common/patches/sod_limits.cpp b/common/patches/sod_limits.cpp index dc1676d5a..87acff88a 100644 --- a/common/patches/sod_limits.cpp +++ b/common/patches/sod_limits.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -19,7 +19,7 @@ #include "sod_limits.h" -#include "../string_util.h" +#include "../strings.h" int16 SoD::invtype::GetInvTypeSize(int16 inv_type) diff --git a/common/patches/sof.cpp b/common/patches/sof.cpp index ff77e788b..94b676a12 100644 --- a/common/patches/sof.cpp +++ b/common/patches/sof.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -28,7 +28,7 @@ #include "../eq_packet_structs.h" #include "../misc_functions.h" -#include "../string_util.h" +#include "../strings.h" #include "../item_instance.h" #include "sof_structs.h" #include "../rulesys.h" @@ -387,7 +387,7 @@ namespace SoF in->size = ob.size(); in->pBuffer = ob.detach(); - + delete[] __emu_buffer; dest->FastQueuePacket(&in, ack_req); @@ -885,7 +885,7 @@ namespace SoF //store away the emu struct uchar* __emu_buffer = in->pBuffer; - + EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]); EQ::OutBuffer ob; @@ -902,7 +902,7 @@ namespace SoF in->size = ob.size(); in->pBuffer = ob.detach(); - + delete[] __emu_buffer; dest->FastQueuePacket(&in, ack_req); @@ -2936,7 +2936,7 @@ namespace SoF void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth) { const EQ::ItemData *item = inst->GetUnscaledItem(); - + SoF::structs::ItemSerializationHeader hdr; hdr.stacksize = (inst->IsStackable() ? ((inst->GetCharges() > 254) ? 0xFFFFFFFF : inst->GetCharges()) : 1); @@ -3245,7 +3245,7 @@ namespace SoF iqbs.HeroicSVCorrup = item->HeroicSVCorrup; iqbs.HealAmt = item->HealAmt; iqbs.SpellDmg = item->SpellDmg; - + ob.write((const char*)&iqbs, sizeof(SoF::structs::ItemQuaternaryBodyStruct)); EQ::OutBuffer::pos_type count_pos = ob.tellp(); @@ -3354,7 +3354,7 @@ namespace SoF static inline uint32 ServerToSoFCorpseSlot(uint32 server_corpse_slot) { uint32 SoFSlot = invslot::SLOT_INVALID; - + if (server_corpse_slot <= EQ::invslot::slotGeneral8 && server_corpse_slot >= EQ::invslot::slotGeneral1) { SoFSlot = server_corpse_slot; } @@ -3465,7 +3465,7 @@ namespace SoF return; } - auto segments = SplitString(server_saylink, '\x12'); + auto segments = Strings::Split(server_saylink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { @@ -3505,7 +3505,7 @@ namespace SoF return; } - auto segments = SplitString(sof_saylink, '\x12'); + auto segments = Strings::Split(sof_saylink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { diff --git a/common/patches/sof_limits.cpp b/common/patches/sof_limits.cpp index aa42320c8..a646991da 100644 --- a/common/patches/sof_limits.cpp +++ b/common/patches/sof_limits.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -19,7 +19,7 @@ #include "sof_limits.h" -#include "../string_util.h" +#include "../strings.h" int16 SoF::invtype::GetInvTypeSize(int16 inv_type) diff --git a/common/patches/titanium.cpp b/common/patches/titanium.cpp index 4c9339854..2861bb861 100644 --- a/common/patches/titanium.cpp +++ b/common/patches/titanium.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ #include "../eq_packet_structs.h" #include "../misc_functions.h" -#include "../string_util.h" +#include "../strings.h" #include "../item_instance.h" #include "titanium_structs.h" @@ -338,13 +338,13 @@ namespace Titanium SerializeItem(ob, (const EQ::ItemInstance*)eq->inst, ServerToTitaniumSlot(eq->slot_id), 0); if (ob.tellp() == last_pos) LogNetcode("Titanium::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory. Item skipped", eq->slot_id); - + last_pos = ob.tellp(); } in->size = ob.size(); in->pBuffer = ob.detach(); - + delete[] __emu_buffer; dest->FastQueuePacket(&in, ack_req); @@ -861,7 +861,7 @@ namespace Titanium //store away the emu struct uchar* __emu_buffer = in->pBuffer; - + EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]); EQ::OutBuffer ob; @@ -878,7 +878,7 @@ namespace Titanium in->size = ob.size(); in->pBuffer = ob.detach(); - + delete[] __emu_buffer; dest->FastQueuePacket(&in, ack_req); @@ -2845,7 +2845,7 @@ namespace Titanium return; } - auto segments = SplitString(server_saylink, '\x12'); + auto segments = Strings::Split(server_saylink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { @@ -2885,7 +2885,7 @@ namespace Titanium return; } - auto segments = SplitString(titanium_saylink, '\x12'); + auto segments = Strings::Split(titanium_saylink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { diff --git a/common/patches/titanium_limits.cpp b/common/patches/titanium_limits.cpp index 2cab723f0..76da83b63 100644 --- a/common/patches/titanium_limits.cpp +++ b/common/patches/titanium_limits.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -19,7 +19,7 @@ #include "titanium_limits.h" -#include "../string_util.h" +#include "../strings.h" int16 Titanium::invtype::GetInvTypeSize(int16 inv_type) diff --git a/common/patches/uf.cpp b/common/patches/uf.cpp index 1e33ed307..0b465ae75 100644 --- a/common/patches/uf.cpp +++ b/common/patches/uf.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -28,7 +28,7 @@ #include "../eq_packet_structs.h" #include "../misc_functions.h" -#include "../string_util.h" +#include "../strings.h" #include "../item_instance.h" #include "uf_structs.h" #include "../rulesys.h" @@ -527,7 +527,7 @@ namespace UF in->size = ob.size(); in->pBuffer = ob.detach(); - + delete[] __emu_buffer; dest->FastQueuePacket(&in, ack_req); @@ -1314,7 +1314,7 @@ namespace UF in->size = ob.size(); in->pBuffer = ob.detach(); - + delete[] __emu_buffer; dest->FastQueuePacket(&in, ack_req); @@ -1741,7 +1741,7 @@ namespace UF OUT(WIS); OUT(face); // OUT(unknown02264[47]); - + if (spells::SPELLBOOK_SIZE <= EQ::spells::SPELLBOOK_SIZE) { for (uint32 r = 0; r < spells::SPELLBOOK_SIZE; r++) { if (emu->spell_book[r] <= spells::SPELL_ID_MAX) @@ -2122,7 +2122,7 @@ namespace UF eq->aa_expansion = emu->expansion; eq->special_category = emu->category; eq->total_abilities = emu->total_effects; - + for(auto i = 0; i < eq->total_abilities; ++i) { eq->abilities[i].skill_id = inapp->ReadUInt32(); eq->abilities[i].base_value = inapp->ReadUInt32(); @@ -3835,7 +3835,7 @@ namespace UF void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth) { const EQ::ItemData *item = inst->GetUnscaledItem(); - + UF::structs::ItemSerializationHeader hdr; hdr.stacksize = (inst->IsStackable() ? ((inst->GetCharges() > 1000) ? 0xFFFFFFFF : inst->GetCharges()) : 1); @@ -4420,7 +4420,7 @@ namespace UF return; } - auto segments = SplitString(serverSayLink, '\x12'); + auto segments = Strings::Split(serverSayLink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { @@ -4460,7 +4460,7 @@ namespace UF return; } - auto segments = SplitString(ufSayLink, '\x12'); + auto segments = Strings::Split(ufSayLink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { diff --git a/common/patches/uf_limits.cpp b/common/patches/uf_limits.cpp index 7cf5ec63e..f0083d086 100644 --- a/common/patches/uf_limits.cpp +++ b/common/patches/uf_limits.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - + Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -19,7 +19,7 @@ #include "uf_limits.h" -#include "../string_util.h" +#include "../strings.h" int16 UF::invtype::GetInvTypeSize(int16 inv_type) diff --git a/common/profanity_manager.cpp b/common/profanity_manager.cpp index 5b5cbea07..6cc4b1365 100644 --- a/common/profanity_manager.cpp +++ b/common/profanity_manager.cpp @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - + Copyright (C) 2001-2019 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -11,7 +11,7 @@ are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -19,7 +19,7 @@ #include "profanity_manager.h" #include "dbcore.h" -#include "string_util.h" +#include "strings.h" #include #include @@ -66,7 +66,7 @@ bool EQ::ProfanityManager::AddProfanity(DBcore *db, std::string profanity) { return false; } - std::string entry = str_tolower(profanity); + std::string entry = Strings::ToLower(profanity); if (check_for_existing_entry(entry)) { return true; @@ -98,7 +98,7 @@ bool EQ::ProfanityManager::RemoveProfanity(DBcore *db, std::string profanity) { return false; } - std::string entry = str_tolower(profanity); + std::string entry = Strings::ToLower(profanity); if (!check_for_existing_entry(entry)) { return true; @@ -126,13 +126,13 @@ void EQ::ProfanityManager::RedactMessage(char *message) { return; } - std::string test_message = str_tolower(message); + std::string test_message = Strings::ToLower(message); // hard-coded max length based on channel message buffer size (4096 bytes).. // ..will need to change or remove if other sources are used for redaction if (test_message.length() < REDACTION_LENGTH_MIN || test_message.length() >= 4096) { return; } - + for (const auto &iter : profanity_list) { // consider adding textlink checks if it becomes an issue size_t pos = 0; size_t start_pos = 0; @@ -162,7 +162,7 @@ void EQ::ProfanityManager::RedactMessage(std::string &message) { return; } - std::string test_message = str_tolower(message); + std::string test_message = Strings::ToLower(message); for (const auto &iter : profanity_list) { size_t pos = 0; @@ -194,7 +194,7 @@ bool EQ::ProfanityManager::ContainsCensoredLanguage(const std::string &message) return false; } - std::string test_message = str_tolower(message); + std::string test_message = Strings::ToLower(message); for (const auto &iter : profanity_list) { if (test_message.find(iter) != std::string::npos) { @@ -227,8 +227,8 @@ bool EQ::ProfanityManager::load_database_entries(DBcore *db) { } for (auto row : results) { - std::string entry = str_tolower(row[0]); - if (entry.length() >= REDACTION_LENGTH_MIN) { + std::string entry = Strings::ToLower(row[0]); + if (entry.length() >= REDACTION_LENGTH_MIN) { if (!check_for_existing_entry(entry)) { profanity_list.push_back(entry); } @@ -265,6 +265,6 @@ bool EQ::ProfanityManager::check_for_existing_entry(std::string profanity) { return true; } } - + return false; } diff --git a/common/ptimer.cpp b/common/ptimer.cpp index e6338bdf9..e5e5f438e 100644 --- a/common/ptimer.cpp +++ b/common/ptimer.cpp @@ -21,7 +21,7 @@ #include "timer.h" #include "ptimer.h" #include "database.h" -#include "string_util.h" +#include "strings.h" #ifdef _WINDOWS #include diff --git a/common/repositories/aa_ability_repository.h b/common/repositories/aa_ability_repository.h index cf452a7d0..f79bd9794 100644 --- a/common/repositories/aa_ability_repository.h +++ b/common/repositories/aa_ability_repository.h @@ -22,7 +22,7 @@ #define EQEMU_AA_ABILITY_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_aa_ability_repository.h" class AaAbilityRepository: public BaseAaAbilityRepository { diff --git a/common/repositories/aa_rank_effects_repository.h b/common/repositories/aa_rank_effects_repository.h index 7242e8f4a..25f155481 100644 --- a/common/repositories/aa_rank_effects_repository.h +++ b/common/repositories/aa_rank_effects_repository.h @@ -22,7 +22,7 @@ #define EQEMU_AA_RANK_EFFECTS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_aa_rank_effects_repository.h" class AaRankEffectsRepository: public BaseAaRankEffectsRepository { diff --git a/common/repositories/aa_rank_prereqs_repository.h b/common/repositories/aa_rank_prereqs_repository.h index cf0055870..be2096f3e 100644 --- a/common/repositories/aa_rank_prereqs_repository.h +++ b/common/repositories/aa_rank_prereqs_repository.h @@ -22,7 +22,7 @@ #define EQEMU_AA_RANK_PREREQS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_aa_rank_prereqs_repository.h" class AaRankPrereqsRepository: public BaseAaRankPrereqsRepository { diff --git a/common/repositories/aa_ranks_repository.h b/common/repositories/aa_ranks_repository.h index 64ac64c84..3072371e7 100644 --- a/common/repositories/aa_ranks_repository.h +++ b/common/repositories/aa_ranks_repository.h @@ -22,7 +22,7 @@ #define EQEMU_AA_RANKS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_aa_ranks_repository.h" class AaRanksRepository: public BaseAaRanksRepository { diff --git a/common/repositories/account_flags_repository.h b/common/repositories/account_flags_repository.h index 12614e860..c5d6f9e57 100644 --- a/common/repositories/account_flags_repository.h +++ b/common/repositories/account_flags_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ACCOUNT_FLAGS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_account_flags_repository.h" class AccountFlagsRepository: public BaseAccountFlagsRepository { diff --git a/common/repositories/account_ip_repository.h b/common/repositories/account_ip_repository.h index 50f10f168..58e1a50bd 100644 --- a/common/repositories/account_ip_repository.h +++ b/common/repositories/account_ip_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ACCOUNT_IP_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_account_ip_repository.h" class AccountIpRepository: public BaseAccountIpRepository { diff --git a/common/repositories/account_repository.h b/common/repositories/account_repository.h index 433be1b44..fa25edee9 100644 --- a/common/repositories/account_repository.h +++ b/common/repositories/account_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ACCOUNT_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_account_repository.h" class AccountRepository: public BaseAccountRepository { diff --git a/common/repositories/account_rewards_repository.h b/common/repositories/account_rewards_repository.h index 16e1a1a19..274cf7fcb 100644 --- a/common/repositories/account_rewards_repository.h +++ b/common/repositories/account_rewards_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ACCOUNT_REWARDS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_account_rewards_repository.h" class AccountRewardsRepository: public BaseAccountRewardsRepository { diff --git a/common/repositories/adventure_details_repository.h b/common/repositories/adventure_details_repository.h index c616ccf0d..10563938d 100644 --- a/common/repositories/adventure_details_repository.h +++ b/common/repositories/adventure_details_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ADVENTURE_DETAILS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_adventure_details_repository.h" class AdventureDetailsRepository: public BaseAdventureDetailsRepository { diff --git a/common/repositories/adventure_members_repository.h b/common/repositories/adventure_members_repository.h index 84a18c14a..619b456aa 100644 --- a/common/repositories/adventure_members_repository.h +++ b/common/repositories/adventure_members_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ADVENTURE_MEMBERS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_adventure_members_repository.h" class AdventureMembersRepository: public BaseAdventureMembersRepository { diff --git a/common/repositories/adventure_stats_repository.h b/common/repositories/adventure_stats_repository.h index 6ad1c3fe6..452fea32d 100644 --- a/common/repositories/adventure_stats_repository.h +++ b/common/repositories/adventure_stats_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ADVENTURE_STATS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_adventure_stats_repository.h" class AdventureStatsRepository: public BaseAdventureStatsRepository { diff --git a/common/repositories/adventure_template_entry_flavor_repository.h b/common/repositories/adventure_template_entry_flavor_repository.h index 8d9ae5406..8e5a85a7a 100644 --- a/common/repositories/adventure_template_entry_flavor_repository.h +++ b/common/repositories/adventure_template_entry_flavor_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ADVENTURE_TEMPLATE_ENTRY_FLAVOR_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_adventure_template_entry_flavor_repository.h" class AdventureTemplateEntryFlavorRepository: public BaseAdventureTemplateEntryFlavorRepository { diff --git a/common/repositories/adventure_template_entry_repository.h b/common/repositories/adventure_template_entry_repository.h index 756ddf417..411325411 100644 --- a/common/repositories/adventure_template_entry_repository.h +++ b/common/repositories/adventure_template_entry_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ADVENTURE_TEMPLATE_ENTRY_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_adventure_template_entry_repository.h" class AdventureTemplateEntryRepository: public BaseAdventureTemplateEntryRepository { diff --git a/common/repositories/adventure_template_repository.h b/common/repositories/adventure_template_repository.h index b284670ee..1931df8b1 100644 --- a/common/repositories/adventure_template_repository.h +++ b/common/repositories/adventure_template_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ADVENTURE_TEMPLATE_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_adventure_template_repository.h" class AdventureTemplateRepository: public BaseAdventureTemplateRepository { diff --git a/common/repositories/alternate_currency_repository.h b/common/repositories/alternate_currency_repository.h index 05b21a755..cac9daaf5 100644 --- a/common/repositories/alternate_currency_repository.h +++ b/common/repositories/alternate_currency_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ALTERNATE_CURRENCY_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_alternate_currency_repository.h" class AlternateCurrencyRepository: public BaseAlternateCurrencyRepository { diff --git a/common/repositories/auras_repository.h b/common/repositories/auras_repository.h index bacfd0be9..80489e554 100644 --- a/common/repositories/auras_repository.h +++ b/common/repositories/auras_repository.h @@ -22,7 +22,7 @@ #define EQEMU_AURAS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_auras_repository.h" class AurasRepository: public BaseAurasRepository { diff --git a/common/repositories/base/base_aa_ability_repository.h b/common/repositories/base/base_aa_ability_repository.h index 40a8e2f18..9af336da8 100644 --- a/common/repositories/base/base_aa_ability_repository.h +++ b/common/repositories/base/base_aa_ability_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_AA_ABILITY_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAaAbilityRepository { @@ -82,12 +82,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -214,7 +214,7 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(aa_ability_entry.id)); - update_values.push_back(columns[1] + " = '" + EscapeString(aa_ability_entry.name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(aa_ability_entry.name) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(aa_ability_entry.category)); update_values.push_back(columns[3] + " = " + std::to_string(aa_ability_entry.classes)); update_values.push_back(columns[4] + " = " + std::to_string(aa_ability_entry.races)); @@ -232,7 +232,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), aa_ability_entry.id ) @@ -249,7 +249,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(aa_ability_entry.id)); - insert_values.push_back("'" + EscapeString(aa_ability_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(aa_ability_entry.name) + "'"); insert_values.push_back(std::to_string(aa_ability_entry.category)); insert_values.push_back(std::to_string(aa_ability_entry.classes)); insert_values.push_back(std::to_string(aa_ability_entry.races)); @@ -267,7 +267,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -292,7 +292,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(aa_ability_entry.id)); - insert_values.push_back("'" + EscapeString(aa_ability_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(aa_ability_entry.name) + "'"); insert_values.push_back(std::to_string(aa_ability_entry.category)); insert_values.push_back(std::to_string(aa_ability_entry.classes)); insert_values.push_back(std::to_string(aa_ability_entry.races)); @@ -306,7 +306,7 @@ public: insert_values.push_back(std::to_string(aa_ability_entry.enabled)); insert_values.push_back(std::to_string(aa_ability_entry.reset_on_death)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -315,7 +315,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_aa_rank_effects_repository.h b/common/repositories/base/base_aa_rank_effects_repository.h index 4d9c0684d..74d915f8c 100644 --- a/common/repositories/base/base_aa_rank_effects_repository.h +++ b/common/repositories/base/base_aa_rank_effects_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_AA_RANK_EFFECTS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAaRankEffectsRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -178,7 +178,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), aa_rank_effects_entry.rank_id ) @@ -204,7 +204,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -234,7 +234,7 @@ public: insert_values.push_back(std::to_string(aa_rank_effects_entry.base1)); insert_values.push_back(std::to_string(aa_rank_effects_entry.base2)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -243,7 +243,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_aa_rank_prereqs_repository.h b/common/repositories/base/base_aa_rank_prereqs_repository.h index e6e76061c..605255948 100644 --- a/common/repositories/base/base_aa_rank_prereqs_repository.h +++ b/common/repositories/base/base_aa_rank_prereqs_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_AA_RANK_PREREQS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAaRankPrereqsRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,7 +166,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), aa_rank_prereqs_entry.rank_id ) @@ -190,7 +190,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -218,7 +218,7 @@ public: insert_values.push_back(std::to_string(aa_rank_prereqs_entry.aa_id)); insert_values.push_back(std::to_string(aa_rank_prereqs_entry.points)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_aa_ranks_repository.h b/common/repositories/base/base_aa_ranks_repository.h index 2f72f088f..c16d86451 100644 --- a/common/repositories/base/base_aa_ranks_repository.h +++ b/common/repositories/base/base_aa_ranks_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_AA_RANKS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAaRanksRepository { @@ -79,12 +79,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -226,7 +226,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), aa_ranks_entry.id ) @@ -260,7 +260,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -298,7 +298,7 @@ public: insert_values.push_back(std::to_string(aa_ranks_entry.prev_id)); insert_values.push_back(std::to_string(aa_ranks_entry.next_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -307,7 +307,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_account_flags_repository.h b/common/repositories/base/base_account_flags_repository.h index 00ba26713..0a47fec36 100644 --- a/common/repositories/base/base_account_flags_repository.h +++ b/common/repositories/base/base_account_flags_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ACCOUNT_FLAGS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAccountFlagsRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -159,14 +159,14 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(account_flags_entry.p_accid)); - update_values.push_back(columns[1] + " = '" + EscapeString(account_flags_entry.p_flag) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(account_flags_entry.p_value) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(account_flags_entry.p_flag) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(account_flags_entry.p_value) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), account_flags_entry.p_accid ) @@ -183,14 +183,14 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(account_flags_entry.p_accid)); - insert_values.push_back("'" + EscapeString(account_flags_entry.p_flag) + "'"); - insert_values.push_back("'" + EscapeString(account_flags_entry.p_value) + "'"); + insert_values.push_back("'" + Strings::Escape(account_flags_entry.p_flag) + "'"); + insert_values.push_back("'" + Strings::Escape(account_flags_entry.p_value) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -215,10 +215,10 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(account_flags_entry.p_accid)); - insert_values.push_back("'" + EscapeString(account_flags_entry.p_flag) + "'"); - insert_values.push_back("'" + EscapeString(account_flags_entry.p_value) + "'"); + insert_values.push_back("'" + Strings::Escape(account_flags_entry.p_flag) + "'"); + insert_values.push_back("'" + Strings::Escape(account_flags_entry.p_value) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_account_ip_repository.h b/common/repositories/base/base_account_ip_repository.h index e55a628c0..bc889db6c 100644 --- a/common/repositories/base/base_account_ip_repository.h +++ b/common/repositories/base/base_account_ip_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ACCOUNT_IP_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAccountIpRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -164,15 +164,15 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(account_ip_entry.accid)); - update_values.push_back(columns[1] + " = '" + EscapeString(account_ip_entry.ip) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(account_ip_entry.ip) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(account_ip_entry.count)); - update_values.push_back(columns[3] + " = '" + EscapeString(account_ip_entry.lastused) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(account_ip_entry.lastused) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), account_ip_entry.accid ) @@ -189,15 +189,15 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(account_ip_entry.accid)); - insert_values.push_back("'" + EscapeString(account_ip_entry.ip) + "'"); + insert_values.push_back("'" + Strings::Escape(account_ip_entry.ip) + "'"); insert_values.push_back(std::to_string(account_ip_entry.count)); - insert_values.push_back("'" + EscapeString(account_ip_entry.lastused) + "'"); + insert_values.push_back("'" + Strings::Escape(account_ip_entry.lastused) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -222,11 +222,11 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(account_ip_entry.accid)); - insert_values.push_back("'" + EscapeString(account_ip_entry.ip) + "'"); + insert_values.push_back("'" + Strings::Escape(account_ip_entry.ip) + "'"); insert_values.push_back(std::to_string(account_ip_entry.count)); - insert_values.push_back("'" + EscapeString(account_ip_entry.lastused) + "'"); + insert_values.push_back("'" + Strings::Escape(account_ip_entry.lastused) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_account_repository.h b/common/repositories/base/base_account_repository.h index 5e8160085..6c889c1de 100644 --- a/common/repositories/base/base_account_repository.h +++ b/common/repositories/base/base_account_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ACCOUNT_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAccountRepository { @@ -106,12 +106,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -253,33 +253,33 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(account_entry.name) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(account_entry.charname) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(account_entry.name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(account_entry.charname) + "'"); update_values.push_back(columns[3] + " = " + std::to_string(account_entry.sharedplat)); - update_values.push_back(columns[4] + " = '" + EscapeString(account_entry.password) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(account_entry.password) + "'"); update_values.push_back(columns[5] + " = " + std::to_string(account_entry.status)); - update_values.push_back(columns[6] + " = '" + EscapeString(account_entry.ls_id) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(account_entry.ls_id) + "'"); update_values.push_back(columns[7] + " = " + std::to_string(account_entry.lsaccount_id)); update_values.push_back(columns[8] + " = " + std::to_string(account_entry.gmspeed)); update_values.push_back(columns[9] + " = " + std::to_string(account_entry.revoked)); update_values.push_back(columns[10] + " = " + std::to_string(account_entry.karma)); - update_values.push_back(columns[11] + " = '" + EscapeString(account_entry.minilogin_ip) + "'"); + update_values.push_back(columns[11] + " = '" + Strings::Escape(account_entry.minilogin_ip) + "'"); update_values.push_back(columns[12] + " = " + std::to_string(account_entry.hideme)); update_values.push_back(columns[13] + " = " + std::to_string(account_entry.rulesflag)); update_values.push_back(columns[14] + " = FROM_UNIXTIME(" + (account_entry.suspendeduntil > 0 ? std::to_string(account_entry.suspendeduntil) : "null") + ")"); update_values.push_back(columns[15] + " = " + std::to_string(account_entry.time_creation)); update_values.push_back(columns[16] + " = " + std::to_string(account_entry.expansion)); - update_values.push_back(columns[17] + " = '" + EscapeString(account_entry.ban_reason) + "'"); - update_values.push_back(columns[18] + " = '" + EscapeString(account_entry.suspend_reason) + "'"); - update_values.push_back(columns[19] + " = '" + EscapeString(account_entry.crc_eqgame) + "'"); - update_values.push_back(columns[20] + " = '" + EscapeString(account_entry.crc_skillcaps) + "'"); - update_values.push_back(columns[21] + " = '" + EscapeString(account_entry.crc_basedata) + "'"); + update_values.push_back(columns[17] + " = '" + Strings::Escape(account_entry.ban_reason) + "'"); + update_values.push_back(columns[18] + " = '" + Strings::Escape(account_entry.suspend_reason) + "'"); + update_values.push_back(columns[19] + " = '" + Strings::Escape(account_entry.crc_eqgame) + "'"); + update_values.push_back(columns[20] + " = '" + Strings::Escape(account_entry.crc_skillcaps) + "'"); + update_values.push_back(columns[21] + " = '" + Strings::Escape(account_entry.crc_basedata) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), account_entry.id ) @@ -296,33 +296,33 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(account_entry.id)); - insert_values.push_back("'" + EscapeString(account_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(account_entry.charname) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.charname) + "'"); insert_values.push_back(std::to_string(account_entry.sharedplat)); - insert_values.push_back("'" + EscapeString(account_entry.password) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.password) + "'"); insert_values.push_back(std::to_string(account_entry.status)); - insert_values.push_back("'" + EscapeString(account_entry.ls_id) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.ls_id) + "'"); insert_values.push_back(std::to_string(account_entry.lsaccount_id)); insert_values.push_back(std::to_string(account_entry.gmspeed)); insert_values.push_back(std::to_string(account_entry.revoked)); insert_values.push_back(std::to_string(account_entry.karma)); - insert_values.push_back("'" + EscapeString(account_entry.minilogin_ip) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.minilogin_ip) + "'"); insert_values.push_back(std::to_string(account_entry.hideme)); insert_values.push_back(std::to_string(account_entry.rulesflag)); insert_values.push_back("FROM_UNIXTIME(" + (account_entry.suspendeduntil > 0 ? std::to_string(account_entry.suspendeduntil) : "null") + ")"); insert_values.push_back(std::to_string(account_entry.time_creation)); insert_values.push_back(std::to_string(account_entry.expansion)); - insert_values.push_back("'" + EscapeString(account_entry.ban_reason) + "'"); - insert_values.push_back("'" + EscapeString(account_entry.suspend_reason) + "'"); - insert_values.push_back("'" + EscapeString(account_entry.crc_eqgame) + "'"); - insert_values.push_back("'" + EscapeString(account_entry.crc_skillcaps) + "'"); - insert_values.push_back("'" + EscapeString(account_entry.crc_basedata) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.ban_reason) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.suspend_reason) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.crc_eqgame) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.crc_skillcaps) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.crc_basedata) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -347,29 +347,29 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(account_entry.id)); - insert_values.push_back("'" + EscapeString(account_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(account_entry.charname) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.charname) + "'"); insert_values.push_back(std::to_string(account_entry.sharedplat)); - insert_values.push_back("'" + EscapeString(account_entry.password) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.password) + "'"); insert_values.push_back(std::to_string(account_entry.status)); - insert_values.push_back("'" + EscapeString(account_entry.ls_id) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.ls_id) + "'"); insert_values.push_back(std::to_string(account_entry.lsaccount_id)); insert_values.push_back(std::to_string(account_entry.gmspeed)); insert_values.push_back(std::to_string(account_entry.revoked)); insert_values.push_back(std::to_string(account_entry.karma)); - insert_values.push_back("'" + EscapeString(account_entry.minilogin_ip) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.minilogin_ip) + "'"); insert_values.push_back(std::to_string(account_entry.hideme)); insert_values.push_back(std::to_string(account_entry.rulesflag)); insert_values.push_back("FROM_UNIXTIME(" + (account_entry.suspendeduntil > 0 ? std::to_string(account_entry.suspendeduntil) : "null") + ")"); insert_values.push_back(std::to_string(account_entry.time_creation)); insert_values.push_back(std::to_string(account_entry.expansion)); - insert_values.push_back("'" + EscapeString(account_entry.ban_reason) + "'"); - insert_values.push_back("'" + EscapeString(account_entry.suspend_reason) + "'"); - insert_values.push_back("'" + EscapeString(account_entry.crc_eqgame) + "'"); - insert_values.push_back("'" + EscapeString(account_entry.crc_skillcaps) + "'"); - insert_values.push_back("'" + EscapeString(account_entry.crc_basedata) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.ban_reason) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.suspend_reason) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.crc_eqgame) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.crc_skillcaps) + "'"); + insert_values.push_back("'" + Strings::Escape(account_entry.crc_basedata) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -378,7 +378,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_account_rewards_repository.h b/common/repositories/base/base_account_rewards_repository.h index cc2fc52a2..56ebd8779 100644 --- a/common/repositories/base/base_account_rewards_repository.h +++ b/common/repositories/base/base_account_rewards_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ACCOUNT_REWARDS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAccountRewardsRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,7 +166,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), account_rewards_entry.account_id ) @@ -190,7 +190,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -218,7 +218,7 @@ public: insert_values.push_back(std::to_string(account_rewards_entry.reward_id)); insert_values.push_back(std::to_string(account_rewards_entry.amount)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_adventure_details_repository.h b/common/repositories/base/base_adventure_details_repository.h index 2eac688ab..50e76fad5 100644 --- a/common/repositories/base/base_adventure_details_repository.h +++ b/common/repositories/base/base_adventure_details_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ADVENTURE_DETAILS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAdventureDetailsRepository { @@ -67,12 +67,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -201,7 +201,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), adventure_details_entry.id ) @@ -231,7 +231,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -265,7 +265,7 @@ public: insert_values.push_back(std::to_string(adventure_details_entry.time_zoned)); insert_values.push_back(std::to_string(adventure_details_entry.time_completed)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -274,7 +274,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_adventure_members_repository.h b/common/repositories/base/base_adventure_members_repository.h index 81102350c..8d940f1d0 100644 --- a/common/repositories/base/base_adventure_members_repository.h +++ b/common/repositories/base/base_adventure_members_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ADVENTURE_MEMBERS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAdventureMembersRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -160,7 +160,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), adventure_members_entry.charid ) @@ -183,7 +183,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -210,7 +210,7 @@ public: insert_values.push_back(std::to_string(adventure_members_entry.id)); insert_values.push_back(std::to_string(adventure_members_entry.charid)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -219,7 +219,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_adventure_stats_repository.h b/common/repositories/base/base_adventure_stats_repository.h index 68d3ba20d..0ed9cedb3 100644 --- a/common/repositories/base/base_adventure_stats_repository.h +++ b/common/repositories/base/base_adventure_stats_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ADVENTURE_STATS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAdventureStatsRepository { @@ -73,12 +73,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -214,7 +214,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), adventure_stats_entry.player_id ) @@ -246,7 +246,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -282,7 +282,7 @@ public: insert_values.push_back(std::to_string(adventure_stats_entry.ruj_losses)); insert_values.push_back(std::to_string(adventure_stats_entry.tak_losses)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -291,7 +291,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_adventure_template_entry_flavor_repository.h b/common/repositories/base/base_adventure_template_entry_flavor_repository.h index 808c3e9d5..8c6c250ba 100644 --- a/common/repositories/base/base_adventure_template_entry_flavor_repository.h +++ b/common/repositories/base/base_adventure_template_entry_flavor_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ADVENTURE_TEMPLATE_ENTRY_FLAVOR_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAdventureTemplateEntryFlavorRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -154,13 +154,13 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(adventure_template_entry_flavor_entry.id)); - update_values.push_back(columns[1] + " = '" + EscapeString(adventure_template_entry_flavor_entry.text) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(adventure_template_entry_flavor_entry.text) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), adventure_template_entry_flavor_entry.id ) @@ -177,13 +177,13 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(adventure_template_entry_flavor_entry.id)); - insert_values.push_back("'" + EscapeString(adventure_template_entry_flavor_entry.text) + "'"); + insert_values.push_back("'" + Strings::Escape(adventure_template_entry_flavor_entry.text) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -208,9 +208,9 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(adventure_template_entry_flavor_entry.id)); - insert_values.push_back("'" + EscapeString(adventure_template_entry_flavor_entry.text) + "'"); + insert_values.push_back("'" + Strings::Escape(adventure_template_entry_flavor_entry.text) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -219,7 +219,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_adventure_template_entry_repository.h b/common/repositories/base/base_adventure_template_entry_repository.h index 7ae32df88..959fb6e31 100644 --- a/common/repositories/base/base_adventure_template_entry_repository.h +++ b/common/repositories/base/base_adventure_template_entry_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ADVENTURE_TEMPLATE_ENTRY_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAdventureTemplateEntryRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -160,7 +160,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), adventure_template_entry_entry.id ) @@ -183,7 +183,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -210,7 +210,7 @@ public: insert_values.push_back(std::to_string(adventure_template_entry_entry.id)); insert_values.push_back(std::to_string(adventure_template_entry_entry.template_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -219,7 +219,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_adventure_template_repository.h b/common/repositories/base/base_adventure_template_repository.h index f9d2e150e..07c988a5d 100644 --- a/common/repositories/base/base_adventure_template_repository.h +++ b/common/repositories/base/base_adventure_template_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ADVENTURE_TEMPLATE_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAdventureTemplateRepository { @@ -139,12 +139,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -309,7 +309,7 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(adventure_template_entry.id)); - update_values.push_back(columns[1] + " = '" + EscapeString(adventure_template_entry.zone) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(adventure_template_entry.zone) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(adventure_template_entry.zone_version)); update_values.push_back(columns[3] + " = " + std::to_string(adventure_template_entry.is_hard)); update_values.push_back(columns[4] + " = " + std::to_string(adventure_template_entry.is_raid)); @@ -322,7 +322,7 @@ public: update_values.push_back(columns[11] + " = " + std::to_string(adventure_template_entry.assa_y)); update_values.push_back(columns[12] + " = " + std::to_string(adventure_template_entry.assa_z)); update_values.push_back(columns[13] + " = " + std::to_string(adventure_template_entry.assa_h)); - update_values.push_back(columns[14] + " = '" + EscapeString(adventure_template_entry.text) + "'"); + update_values.push_back(columns[14] + " = '" + Strings::Escape(adventure_template_entry.text) + "'"); update_values.push_back(columns[15] + " = " + std::to_string(adventure_template_entry.duration)); update_values.push_back(columns[16] + " = " + std::to_string(adventure_template_entry.zone_in_time)); update_values.push_back(columns[17] + " = " + std::to_string(adventure_template_entry.win_points)); @@ -346,7 +346,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), adventure_template_entry.id ) @@ -363,7 +363,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(adventure_template_entry.id)); - insert_values.push_back("'" + EscapeString(adventure_template_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(adventure_template_entry.zone) + "'"); insert_values.push_back(std::to_string(adventure_template_entry.zone_version)); insert_values.push_back(std::to_string(adventure_template_entry.is_hard)); insert_values.push_back(std::to_string(adventure_template_entry.is_raid)); @@ -376,7 +376,7 @@ public: insert_values.push_back(std::to_string(adventure_template_entry.assa_y)); insert_values.push_back(std::to_string(adventure_template_entry.assa_z)); insert_values.push_back(std::to_string(adventure_template_entry.assa_h)); - insert_values.push_back("'" + EscapeString(adventure_template_entry.text) + "'"); + insert_values.push_back("'" + Strings::Escape(adventure_template_entry.text) + "'"); insert_values.push_back(std::to_string(adventure_template_entry.duration)); insert_values.push_back(std::to_string(adventure_template_entry.zone_in_time)); insert_values.push_back(std::to_string(adventure_template_entry.win_points)); @@ -400,7 +400,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -425,7 +425,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(adventure_template_entry.id)); - insert_values.push_back("'" + EscapeString(adventure_template_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(adventure_template_entry.zone) + "'"); insert_values.push_back(std::to_string(adventure_template_entry.zone_version)); insert_values.push_back(std::to_string(adventure_template_entry.is_hard)); insert_values.push_back(std::to_string(adventure_template_entry.is_raid)); @@ -438,7 +438,7 @@ public: insert_values.push_back(std::to_string(adventure_template_entry.assa_y)); insert_values.push_back(std::to_string(adventure_template_entry.assa_z)); insert_values.push_back(std::to_string(adventure_template_entry.assa_h)); - insert_values.push_back("'" + EscapeString(adventure_template_entry.text) + "'"); + insert_values.push_back("'" + Strings::Escape(adventure_template_entry.text) + "'"); insert_values.push_back(std::to_string(adventure_template_entry.duration)); insert_values.push_back(std::to_string(adventure_template_entry.zone_in_time)); insert_values.push_back(std::to_string(adventure_template_entry.win_points)); @@ -458,7 +458,7 @@ public: insert_values.push_back(std::to_string(adventure_template_entry.graveyard_z)); insert_values.push_back(std::to_string(adventure_template_entry.graveyard_radius)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -467,7 +467,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_alternate_currency_repository.h b/common/repositories/base/base_alternate_currency_repository.h index 187309a05..3351b634a 100644 --- a/common/repositories/base/base_alternate_currency_repository.h +++ b/common/repositories/base/base_alternate_currency_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ALTERNATE_CURRENCY_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAlternateCurrencyRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -160,7 +160,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), alternate_currency_entry.id ) @@ -183,7 +183,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -210,7 +210,7 @@ public: insert_values.push_back(std::to_string(alternate_currency_entry.id)); insert_values.push_back(std::to_string(alternate_currency_entry.item_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -219,7 +219,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_auras_repository.h b/common/repositories/base/base_auras_repository.h index 98838bc51..9deb432c6 100644 --- a/common/repositories/base/base_auras_repository.h +++ b/common/repositories/base/base_auras_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_AURAS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseAurasRepository { @@ -73,12 +73,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -200,7 +200,7 @@ public: update_values.push_back(columns[0] + " = " + std::to_string(auras_entry.type)); update_values.push_back(columns[1] + " = " + std::to_string(auras_entry.npc_type)); - update_values.push_back(columns[2] + " = '" + EscapeString(auras_entry.name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(auras_entry.name) + "'"); update_values.push_back(columns[3] + " = " + std::to_string(auras_entry.spell_id)); update_values.push_back(columns[4] + " = " + std::to_string(auras_entry.distance)); update_values.push_back(columns[5] + " = " + std::to_string(auras_entry.aura_type)); @@ -214,7 +214,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), auras_entry.type ) @@ -232,7 +232,7 @@ public: insert_values.push_back(std::to_string(auras_entry.type)); insert_values.push_back(std::to_string(auras_entry.npc_type)); - insert_values.push_back("'" + EscapeString(auras_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(auras_entry.name) + "'"); insert_values.push_back(std::to_string(auras_entry.spell_id)); insert_values.push_back(std::to_string(auras_entry.distance)); insert_values.push_back(std::to_string(auras_entry.aura_type)); @@ -246,7 +246,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -272,7 +272,7 @@ public: insert_values.push_back(std::to_string(auras_entry.type)); insert_values.push_back(std::to_string(auras_entry.npc_type)); - insert_values.push_back("'" + EscapeString(auras_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(auras_entry.name) + "'"); insert_values.push_back(std::to_string(auras_entry.spell_id)); insert_values.push_back(std::to_string(auras_entry.distance)); insert_values.push_back(std::to_string(auras_entry.aura_type)); @@ -282,7 +282,7 @@ public: insert_values.push_back(std::to_string(auras_entry.icon)); insert_values.push_back(std::to_string(auras_entry.cast_time)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -291,7 +291,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_base_data_repository.h b/common/repositories/base/base_base_data_repository.h index aa848aa75..c215d1014 100644 --- a/common/repositories/base/base_base_data_repository.h +++ b/common/repositories/base/base_base_data_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_BASE_DATA_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseBaseDataRepository { @@ -70,12 +70,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -208,7 +208,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), base_data_entry.level ) @@ -239,7 +239,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -274,7 +274,7 @@ public: insert_values.push_back(std::to_string(base_data_entry.mana_fac)); insert_values.push_back(std::to_string(base_data_entry.end_fac)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -283,7 +283,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_blocked_spells_repository.h b/common/repositories/base/base_blocked_spells_repository.h index 31b47e448..1b8511d2c 100644 --- a/common/repositories/base/base_blocked_spells_repository.h +++ b/common/repositories/base/base_blocked_spells_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_BLOCKED_SPELLS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseBlockedSpellsRepository { @@ -76,12 +76,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -212,14 +212,14 @@ public: update_values.push_back(columns[7] + " = " + std::to_string(blocked_spells_entry.x_diff)); update_values.push_back(columns[8] + " = " + std::to_string(blocked_spells_entry.y_diff)); update_values.push_back(columns[9] + " = " + std::to_string(blocked_spells_entry.z_diff)); - update_values.push_back(columns[10] + " = '" + EscapeString(blocked_spells_entry.message) + "'"); - update_values.push_back(columns[11] + " = '" + EscapeString(blocked_spells_entry.description) + "'"); + update_values.push_back(columns[10] + " = '" + Strings::Escape(blocked_spells_entry.message) + "'"); + update_values.push_back(columns[11] + " = '" + Strings::Escape(blocked_spells_entry.description) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), blocked_spells_entry.id ) @@ -245,14 +245,14 @@ public: insert_values.push_back(std::to_string(blocked_spells_entry.x_diff)); insert_values.push_back(std::to_string(blocked_spells_entry.y_diff)); insert_values.push_back(std::to_string(blocked_spells_entry.z_diff)); - insert_values.push_back("'" + EscapeString(blocked_spells_entry.message) + "'"); - insert_values.push_back("'" + EscapeString(blocked_spells_entry.description) + "'"); + insert_values.push_back("'" + Strings::Escape(blocked_spells_entry.message) + "'"); + insert_values.push_back("'" + Strings::Escape(blocked_spells_entry.description) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -286,10 +286,10 @@ public: insert_values.push_back(std::to_string(blocked_spells_entry.x_diff)); insert_values.push_back(std::to_string(blocked_spells_entry.y_diff)); insert_values.push_back(std::to_string(blocked_spells_entry.z_diff)); - insert_values.push_back("'" + EscapeString(blocked_spells_entry.message) + "'"); - insert_values.push_back("'" + EscapeString(blocked_spells_entry.description) + "'"); + insert_values.push_back("'" + Strings::Escape(blocked_spells_entry.message) + "'"); + insert_values.push_back("'" + Strings::Escape(blocked_spells_entry.description) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -298,7 +298,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_books_repository.h b/common/repositories/base/base_books_repository.h index 11561eacc..b988d7ec8 100644 --- a/common/repositories/base/base_books_repository.h +++ b/common/repositories/base/base_books_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_BOOKS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseBooksRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -163,15 +163,15 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(books_entry.name) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(books_entry.txtfile) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(books_entry.name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(books_entry.txtfile) + "'"); update_values.push_back(columns[3] + " = " + std::to_string(books_entry.language)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), books_entry.id ) @@ -188,15 +188,15 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(books_entry.id)); - insert_values.push_back("'" + EscapeString(books_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(books_entry.txtfile) + "'"); + insert_values.push_back("'" + Strings::Escape(books_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(books_entry.txtfile) + "'"); insert_values.push_back(std::to_string(books_entry.language)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -221,11 +221,11 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(books_entry.id)); - insert_values.push_back("'" + EscapeString(books_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(books_entry.txtfile) + "'"); + insert_values.push_back("'" + Strings::Escape(books_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(books_entry.txtfile) + "'"); insert_values.push_back(std::to_string(books_entry.language)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -234,7 +234,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_bug_reports_repository.h b/common/repositories/base/base_bug_reports_repository.h index db65d5e05..e284c3f53 100644 --- a/common/repositories/base/base_bug_reports_repository.h +++ b/common/repositories/base/base_bug_reports_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_BUG_REPORTS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseBugReportsRepository { @@ -136,12 +136,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -303,43 +303,43 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(bug_reports_entry.zone) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(bug_reports_entry.zone) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(bug_reports_entry.client_version_id)); - update_values.push_back(columns[3] + " = '" + EscapeString(bug_reports_entry.client_version_name) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(bug_reports_entry.client_version_name) + "'"); update_values.push_back(columns[4] + " = " + std::to_string(bug_reports_entry.account_id)); update_values.push_back(columns[5] + " = " + std::to_string(bug_reports_entry.character_id)); - update_values.push_back(columns[6] + " = '" + EscapeString(bug_reports_entry.character_name) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(bug_reports_entry.character_name) + "'"); update_values.push_back(columns[7] + " = " + std::to_string(bug_reports_entry.reporter_spoof)); update_values.push_back(columns[8] + " = " + std::to_string(bug_reports_entry.category_id)); - update_values.push_back(columns[9] + " = '" + EscapeString(bug_reports_entry.category_name) + "'"); - update_values.push_back(columns[10] + " = '" + EscapeString(bug_reports_entry.reporter_name) + "'"); - update_values.push_back(columns[11] + " = '" + EscapeString(bug_reports_entry.ui_path) + "'"); + update_values.push_back(columns[9] + " = '" + Strings::Escape(bug_reports_entry.category_name) + "'"); + update_values.push_back(columns[10] + " = '" + Strings::Escape(bug_reports_entry.reporter_name) + "'"); + update_values.push_back(columns[11] + " = '" + Strings::Escape(bug_reports_entry.ui_path) + "'"); update_values.push_back(columns[12] + " = " + std::to_string(bug_reports_entry.pos_x)); update_values.push_back(columns[13] + " = " + std::to_string(bug_reports_entry.pos_y)); update_values.push_back(columns[14] + " = " + std::to_string(bug_reports_entry.pos_z)); update_values.push_back(columns[15] + " = " + std::to_string(bug_reports_entry.heading)); update_values.push_back(columns[16] + " = " + std::to_string(bug_reports_entry.time_played)); update_values.push_back(columns[17] + " = " + std::to_string(bug_reports_entry.target_id)); - update_values.push_back(columns[18] + " = '" + EscapeString(bug_reports_entry.target_name) + "'"); + update_values.push_back(columns[18] + " = '" + Strings::Escape(bug_reports_entry.target_name) + "'"); update_values.push_back(columns[19] + " = " + std::to_string(bug_reports_entry.optional_info_mask)); update_values.push_back(columns[20] + " = " + std::to_string(bug_reports_entry._can_duplicate)); update_values.push_back(columns[21] + " = " + std::to_string(bug_reports_entry._crash_bug)); update_values.push_back(columns[22] + " = " + std::to_string(bug_reports_entry._target_info)); update_values.push_back(columns[23] + " = " + std::to_string(bug_reports_entry._character_flags)); update_values.push_back(columns[24] + " = " + std::to_string(bug_reports_entry._unknown_value)); - update_values.push_back(columns[25] + " = '" + EscapeString(bug_reports_entry.bug_report) + "'"); - update_values.push_back(columns[26] + " = '" + EscapeString(bug_reports_entry.system_info) + "'"); + update_values.push_back(columns[25] + " = '" + Strings::Escape(bug_reports_entry.bug_report) + "'"); + update_values.push_back(columns[26] + " = '" + Strings::Escape(bug_reports_entry.system_info) + "'"); update_values.push_back(columns[27] + " = FROM_UNIXTIME(" + (bug_reports_entry.report_datetime > 0 ? std::to_string(bug_reports_entry.report_datetime) : "null") + ")"); update_values.push_back(columns[28] + " = " + std::to_string(bug_reports_entry.bug_status)); update_values.push_back(columns[29] + " = FROM_UNIXTIME(" + (bug_reports_entry.last_review > 0 ? std::to_string(bug_reports_entry.last_review) : "null") + ")"); - update_values.push_back(columns[30] + " = '" + EscapeString(bug_reports_entry.last_reviewer) + "'"); - update_values.push_back(columns[31] + " = '" + EscapeString(bug_reports_entry.reviewer_notes) + "'"); + update_values.push_back(columns[30] + " = '" + Strings::Escape(bug_reports_entry.last_reviewer) + "'"); + update_values.push_back(columns[31] + " = '" + Strings::Escape(bug_reports_entry.reviewer_notes) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), bug_reports_entry.id ) @@ -356,43 +356,43 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(bug_reports_entry.id)); - insert_values.push_back("'" + EscapeString(bug_reports_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.zone) + "'"); insert_values.push_back(std::to_string(bug_reports_entry.client_version_id)); - insert_values.push_back("'" + EscapeString(bug_reports_entry.client_version_name) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.client_version_name) + "'"); insert_values.push_back(std::to_string(bug_reports_entry.account_id)); insert_values.push_back(std::to_string(bug_reports_entry.character_id)); - insert_values.push_back("'" + EscapeString(bug_reports_entry.character_name) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.character_name) + "'"); insert_values.push_back(std::to_string(bug_reports_entry.reporter_spoof)); insert_values.push_back(std::to_string(bug_reports_entry.category_id)); - insert_values.push_back("'" + EscapeString(bug_reports_entry.category_name) + "'"); - insert_values.push_back("'" + EscapeString(bug_reports_entry.reporter_name) + "'"); - insert_values.push_back("'" + EscapeString(bug_reports_entry.ui_path) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.category_name) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.reporter_name) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.ui_path) + "'"); insert_values.push_back(std::to_string(bug_reports_entry.pos_x)); insert_values.push_back(std::to_string(bug_reports_entry.pos_y)); insert_values.push_back(std::to_string(bug_reports_entry.pos_z)); insert_values.push_back(std::to_string(bug_reports_entry.heading)); insert_values.push_back(std::to_string(bug_reports_entry.time_played)); insert_values.push_back(std::to_string(bug_reports_entry.target_id)); - insert_values.push_back("'" + EscapeString(bug_reports_entry.target_name) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.target_name) + "'"); insert_values.push_back(std::to_string(bug_reports_entry.optional_info_mask)); insert_values.push_back(std::to_string(bug_reports_entry._can_duplicate)); insert_values.push_back(std::to_string(bug_reports_entry._crash_bug)); insert_values.push_back(std::to_string(bug_reports_entry._target_info)); insert_values.push_back(std::to_string(bug_reports_entry._character_flags)); insert_values.push_back(std::to_string(bug_reports_entry._unknown_value)); - insert_values.push_back("'" + EscapeString(bug_reports_entry.bug_report) + "'"); - insert_values.push_back("'" + EscapeString(bug_reports_entry.system_info) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.bug_report) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.system_info) + "'"); insert_values.push_back("FROM_UNIXTIME(" + (bug_reports_entry.report_datetime > 0 ? std::to_string(bug_reports_entry.report_datetime) : "null") + ")"); insert_values.push_back(std::to_string(bug_reports_entry.bug_status)); insert_values.push_back("FROM_UNIXTIME(" + (bug_reports_entry.last_review > 0 ? std::to_string(bug_reports_entry.last_review) : "null") + ")"); - insert_values.push_back("'" + EscapeString(bug_reports_entry.last_reviewer) + "'"); - insert_values.push_back("'" + EscapeString(bug_reports_entry.reviewer_notes) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.last_reviewer) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.reviewer_notes) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -417,39 +417,39 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(bug_reports_entry.id)); - insert_values.push_back("'" + EscapeString(bug_reports_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.zone) + "'"); insert_values.push_back(std::to_string(bug_reports_entry.client_version_id)); - insert_values.push_back("'" + EscapeString(bug_reports_entry.client_version_name) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.client_version_name) + "'"); insert_values.push_back(std::to_string(bug_reports_entry.account_id)); insert_values.push_back(std::to_string(bug_reports_entry.character_id)); - insert_values.push_back("'" + EscapeString(bug_reports_entry.character_name) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.character_name) + "'"); insert_values.push_back(std::to_string(bug_reports_entry.reporter_spoof)); insert_values.push_back(std::to_string(bug_reports_entry.category_id)); - insert_values.push_back("'" + EscapeString(bug_reports_entry.category_name) + "'"); - insert_values.push_back("'" + EscapeString(bug_reports_entry.reporter_name) + "'"); - insert_values.push_back("'" + EscapeString(bug_reports_entry.ui_path) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.category_name) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.reporter_name) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.ui_path) + "'"); insert_values.push_back(std::to_string(bug_reports_entry.pos_x)); insert_values.push_back(std::to_string(bug_reports_entry.pos_y)); insert_values.push_back(std::to_string(bug_reports_entry.pos_z)); insert_values.push_back(std::to_string(bug_reports_entry.heading)); insert_values.push_back(std::to_string(bug_reports_entry.time_played)); insert_values.push_back(std::to_string(bug_reports_entry.target_id)); - insert_values.push_back("'" + EscapeString(bug_reports_entry.target_name) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.target_name) + "'"); insert_values.push_back(std::to_string(bug_reports_entry.optional_info_mask)); insert_values.push_back(std::to_string(bug_reports_entry._can_duplicate)); insert_values.push_back(std::to_string(bug_reports_entry._crash_bug)); insert_values.push_back(std::to_string(bug_reports_entry._target_info)); insert_values.push_back(std::to_string(bug_reports_entry._character_flags)); insert_values.push_back(std::to_string(bug_reports_entry._unknown_value)); - insert_values.push_back("'" + EscapeString(bug_reports_entry.bug_report) + "'"); - insert_values.push_back("'" + EscapeString(bug_reports_entry.system_info) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.bug_report) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.system_info) + "'"); insert_values.push_back("FROM_UNIXTIME(" + (bug_reports_entry.report_datetime > 0 ? std::to_string(bug_reports_entry.report_datetime) : "null") + ")"); insert_values.push_back(std::to_string(bug_reports_entry.bug_status)); insert_values.push_back("FROM_UNIXTIME(" + (bug_reports_entry.last_review > 0 ? std::to_string(bug_reports_entry.last_review) : "null") + ")"); - insert_values.push_back("'" + EscapeString(bug_reports_entry.last_reviewer) + "'"); - insert_values.push_back("'" + EscapeString(bug_reports_entry.reviewer_notes) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.last_reviewer) + "'"); + insert_values.push_back("'" + Strings::Escape(bug_reports_entry.reviewer_notes) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -458,7 +458,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_bugs_repository.h b/common/repositories/base/base_bugs_repository.h index 6fff42ed9..c1000cb4a 100644 --- a/common/repositories/base/base_bugs_repository.h +++ b/common/repositories/base/base_bugs_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_BUGS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseBugsRepository { @@ -79,12 +79,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -208,24 +208,24 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(bugs_entry.zone) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(bugs_entry.name) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(bugs_entry.ui) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(bugs_entry.zone) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(bugs_entry.name) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(bugs_entry.ui) + "'"); update_values.push_back(columns[4] + " = " + std::to_string(bugs_entry.x)); update_values.push_back(columns[5] + " = " + std::to_string(bugs_entry.y)); update_values.push_back(columns[6] + " = " + std::to_string(bugs_entry.z)); - update_values.push_back(columns[7] + " = '" + EscapeString(bugs_entry.type) + "'"); + update_values.push_back(columns[7] + " = '" + Strings::Escape(bugs_entry.type) + "'"); update_values.push_back(columns[8] + " = " + std::to_string(bugs_entry.flag)); - update_values.push_back(columns[9] + " = '" + EscapeString(bugs_entry.target) + "'"); - update_values.push_back(columns[10] + " = '" + EscapeString(bugs_entry.bug) + "'"); - update_values.push_back(columns[11] + " = '" + EscapeString(bugs_entry.date) + "'"); + update_values.push_back(columns[9] + " = '" + Strings::Escape(bugs_entry.target) + "'"); + update_values.push_back(columns[10] + " = '" + Strings::Escape(bugs_entry.bug) + "'"); + update_values.push_back(columns[11] + " = '" + Strings::Escape(bugs_entry.date) + "'"); update_values.push_back(columns[12] + " = " + std::to_string(bugs_entry.status)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), bugs_entry.id ) @@ -242,24 +242,24 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(bugs_entry.id)); - insert_values.push_back("'" + EscapeString(bugs_entry.zone) + "'"); - insert_values.push_back("'" + EscapeString(bugs_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(bugs_entry.ui) + "'"); + insert_values.push_back("'" + Strings::Escape(bugs_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(bugs_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(bugs_entry.ui) + "'"); insert_values.push_back(std::to_string(bugs_entry.x)); insert_values.push_back(std::to_string(bugs_entry.y)); insert_values.push_back(std::to_string(bugs_entry.z)); - insert_values.push_back("'" + EscapeString(bugs_entry.type) + "'"); + insert_values.push_back("'" + Strings::Escape(bugs_entry.type) + "'"); insert_values.push_back(std::to_string(bugs_entry.flag)); - insert_values.push_back("'" + EscapeString(bugs_entry.target) + "'"); - insert_values.push_back("'" + EscapeString(bugs_entry.bug) + "'"); - insert_values.push_back("'" + EscapeString(bugs_entry.date) + "'"); + insert_values.push_back("'" + Strings::Escape(bugs_entry.target) + "'"); + insert_values.push_back("'" + Strings::Escape(bugs_entry.bug) + "'"); + insert_values.push_back("'" + Strings::Escape(bugs_entry.date) + "'"); insert_values.push_back(std::to_string(bugs_entry.status)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -284,20 +284,20 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(bugs_entry.id)); - insert_values.push_back("'" + EscapeString(bugs_entry.zone) + "'"); - insert_values.push_back("'" + EscapeString(bugs_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(bugs_entry.ui) + "'"); + insert_values.push_back("'" + Strings::Escape(bugs_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(bugs_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(bugs_entry.ui) + "'"); insert_values.push_back(std::to_string(bugs_entry.x)); insert_values.push_back(std::to_string(bugs_entry.y)); insert_values.push_back(std::to_string(bugs_entry.z)); - insert_values.push_back("'" + EscapeString(bugs_entry.type) + "'"); + insert_values.push_back("'" + Strings::Escape(bugs_entry.type) + "'"); insert_values.push_back(std::to_string(bugs_entry.flag)); - insert_values.push_back("'" + EscapeString(bugs_entry.target) + "'"); - insert_values.push_back("'" + EscapeString(bugs_entry.bug) + "'"); - insert_values.push_back("'" + EscapeString(bugs_entry.date) + "'"); + insert_values.push_back("'" + Strings::Escape(bugs_entry.target) + "'"); + insert_values.push_back("'" + Strings::Escape(bugs_entry.bug) + "'"); + insert_values.push_back("'" + Strings::Escape(bugs_entry.date) + "'"); insert_values.push_back(std::to_string(bugs_entry.status)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -306,7 +306,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_buyer_repository.h b/common/repositories/base/base_buyer_repository.h index 1299f203a..d8e1b45f4 100644 --- a/common/repositories/base/base_buyer_repository.h +++ b/common/repositories/base/base_buyer_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_BUYER_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseBuyerRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -176,7 +176,7 @@ public: update_values.push_back(columns[0] + " = " + std::to_string(buyer_entry.charid)); update_values.push_back(columns[1] + " = " + std::to_string(buyer_entry.buyslot)); update_values.push_back(columns[2] + " = " + std::to_string(buyer_entry.itemid)); - update_values.push_back(columns[3] + " = '" + EscapeString(buyer_entry.itemname) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(buyer_entry.itemname) + "'"); update_values.push_back(columns[4] + " = " + std::to_string(buyer_entry.quantity)); update_values.push_back(columns[5] + " = " + std::to_string(buyer_entry.price)); @@ -184,7 +184,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), buyer_entry.charid ) @@ -203,7 +203,7 @@ public: insert_values.push_back(std::to_string(buyer_entry.charid)); insert_values.push_back(std::to_string(buyer_entry.buyslot)); insert_values.push_back(std::to_string(buyer_entry.itemid)); - insert_values.push_back("'" + EscapeString(buyer_entry.itemname) + "'"); + insert_values.push_back("'" + Strings::Escape(buyer_entry.itemname) + "'"); insert_values.push_back(std::to_string(buyer_entry.quantity)); insert_values.push_back(std::to_string(buyer_entry.price)); @@ -211,7 +211,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -238,11 +238,11 @@ public: insert_values.push_back(std::to_string(buyer_entry.charid)); insert_values.push_back(std::to_string(buyer_entry.buyslot)); insert_values.push_back(std::to_string(buyer_entry.itemid)); - insert_values.push_back("'" + EscapeString(buyer_entry.itemname) + "'"); + insert_values.push_back("'" + Strings::Escape(buyer_entry.itemname) + "'"); insert_values.push_back(std::to_string(buyer_entry.quantity)); insert_values.push_back(std::to_string(buyer_entry.price)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -251,7 +251,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_char_create_combinations_repository.h b/common/repositories/base/base_char_create_combinations_repository.h index 1548c96e3..0af778217 100644 --- a/common/repositories/base/base_char_create_combinations_repository.h +++ b/common/repositories/base/base_char_create_combinations_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHAR_CREATE_COMBINATIONS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharCreateCombinationsRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -184,7 +184,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), char_create_combinations_entry.race ) @@ -211,7 +211,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -242,7 +242,7 @@ public: insert_values.push_back(std::to_string(char_create_combinations_entry.start_zone)); insert_values.push_back(std::to_string(char_create_combinations_entry.expansions_req)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -251,7 +251,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_char_create_point_allocations_repository.h b/common/repositories/base/base_char_create_point_allocations_repository.h index 2ca6d2359..d43abd3b4 100644 --- a/common/repositories/base/base_char_create_point_allocations_repository.h +++ b/common/repositories/base/base_char_create_point_allocations_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHAR_CREATE_POINT_ALLOCATIONS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharCreatePointAllocationsRepository { @@ -85,12 +85,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -238,7 +238,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), char_create_point_allocations_entry.id ) @@ -274,7 +274,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -314,7 +314,7 @@ public: insert_values.push_back(std::to_string(char_create_point_allocations_entry.alloc_wis)); insert_values.push_back(std::to_string(char_create_point_allocations_entry.alloc_cha)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -323,7 +323,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_char_recipe_list_repository.h b/common/repositories/base/base_char_recipe_list_repository.h index 26b340f66..a77ed2e94 100644 --- a/common/repositories/base/base_char_recipe_list_repository.h +++ b/common/repositories/base/base_char_recipe_list_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHAR_RECIPE_LIST_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharRecipeListRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,7 +166,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), char_recipe_list_entry.char_id ) @@ -190,7 +190,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -218,7 +218,7 @@ public: insert_values.push_back(std::to_string(char_recipe_list_entry.recipe_id)); insert_values.push_back(std::to_string(char_recipe_list_entry.madecount)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_activities_repository.h b/common/repositories/base/base_character_activities_repository.h index 2b3441055..758047cfa 100644 --- a/common/repositories/base/base_character_activities_repository.h +++ b/common/repositories/base/base_character_activities_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_ACTIVITIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterActivitiesRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -178,7 +178,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_activities_entry.charid ) @@ -204,7 +204,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -234,7 +234,7 @@ public: insert_values.push_back(std::to_string(character_activities_entry.donecount)); insert_values.push_back(std::to_string(character_activities_entry.completed)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -243,7 +243,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_alt_currency_repository.h b/common/repositories/base/base_character_alt_currency_repository.h index 3dad9cbbb..d7eef3608 100644 --- a/common/repositories/base/base_character_alt_currency_repository.h +++ b/common/repositories/base/base_character_alt_currency_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_ALT_CURRENCY_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterAltCurrencyRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,7 +166,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_alt_currency_entry.char_id ) @@ -190,7 +190,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -218,7 +218,7 @@ public: insert_values.push_back(std::to_string(character_alt_currency_entry.currency_id)); insert_values.push_back(std::to_string(character_alt_currency_entry.amount)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_alternate_abilities_repository.h b/common/repositories/base/base_character_alternate_abilities_repository.h index ae91d1274..9e97ee405 100644 --- a/common/repositories/base/base_character_alternate_abilities_repository.h +++ b/common/repositories/base/base_character_alternate_abilities_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_ALTERNATE_ABILITIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterAlternateAbilitiesRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -172,7 +172,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_alternate_abilities_entry.id ) @@ -197,7 +197,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -226,7 +226,7 @@ public: insert_values.push_back(std::to_string(character_alternate_abilities_entry.aa_value)); insert_values.push_back(std::to_string(character_alternate_abilities_entry.charges)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_auras_repository.h b/common/repositories/base/base_character_auras_repository.h index 84b165619..15a48c35a 100644 --- a/common/repositories/base/base_character_auras_repository.h +++ b/common/repositories/base/base_character_auras_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_AURAS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterAurasRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,7 +166,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_auras_entry.id ) @@ -190,7 +190,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -218,7 +218,7 @@ public: insert_values.push_back(std::to_string(character_auras_entry.slot)); insert_values.push_back(std::to_string(character_auras_entry.spell_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_bandolier_repository.h b/common/repositories/base/base_character_bandolier_repository.h index be3adfb2d..ff61d626c 100644 --- a/common/repositories/base/base_character_bandolier_repository.h +++ b/common/repositories/base/base_character_bandolier_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_BANDOLIER_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterBandolierRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -178,13 +178,13 @@ public: update_values.push_back(columns[2] + " = " + std::to_string(character_bandolier_entry.bandolier_slot)); update_values.push_back(columns[3] + " = " + std::to_string(character_bandolier_entry.item_id)); update_values.push_back(columns[4] + " = " + std::to_string(character_bandolier_entry.icon)); - update_values.push_back(columns[5] + " = '" + EscapeString(character_bandolier_entry.bandolier_name) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(character_bandolier_entry.bandolier_name) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_bandolier_entry.id ) @@ -205,13 +205,13 @@ public: insert_values.push_back(std::to_string(character_bandolier_entry.bandolier_slot)); insert_values.push_back(std::to_string(character_bandolier_entry.item_id)); insert_values.push_back(std::to_string(character_bandolier_entry.icon)); - insert_values.push_back("'" + EscapeString(character_bandolier_entry.bandolier_name) + "'"); + insert_values.push_back("'" + Strings::Escape(character_bandolier_entry.bandolier_name) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -240,9 +240,9 @@ public: insert_values.push_back(std::to_string(character_bandolier_entry.bandolier_slot)); insert_values.push_back(std::to_string(character_bandolier_entry.item_id)); insert_values.push_back(std::to_string(character_bandolier_entry.icon)); - insert_values.push_back("'" + EscapeString(character_bandolier_entry.bandolier_name) + "'"); + insert_values.push_back("'" + Strings::Escape(character_bandolier_entry.bandolier_name) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -251,7 +251,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_bind_repository.h b/common/repositories/base/base_character_bind_repository.h index 4cc042596..96dde6255 100644 --- a/common/repositories/base/base_character_bind_repository.h +++ b/common/repositories/base/base_character_bind_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_BIND_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterBindRepository { @@ -64,12 +64,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -195,7 +195,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_bind_entry.id ) @@ -224,7 +224,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -257,7 +257,7 @@ public: insert_values.push_back(std::to_string(character_bind_entry.z)); insert_values.push_back(std::to_string(character_bind_entry.heading)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -266,7 +266,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_buffs_repository.h b/common/repositories/base/base_character_buffs_repository.h index 8205dac53..cc7010ced 100644 --- a/common/repositories/base/base_character_buffs_repository.h +++ b/common/repositories/base/base_character_buffs_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_BUFFS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterBuffsRepository { @@ -91,12 +91,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -232,7 +232,7 @@ public: update_values.push_back(columns[1] + " = " + std::to_string(character_buffs_entry.slot_id)); update_values.push_back(columns[2] + " = " + std::to_string(character_buffs_entry.spell_id)); update_values.push_back(columns[3] + " = " + std::to_string(character_buffs_entry.caster_level)); - update_values.push_back(columns[4] + " = '" + EscapeString(character_buffs_entry.caster_name) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(character_buffs_entry.caster_name) + "'"); update_values.push_back(columns[5] + " = " + std::to_string(character_buffs_entry.ticsremaining)); update_values.push_back(columns[6] + " = " + std::to_string(character_buffs_entry.counters)); update_values.push_back(columns[7] + " = " + std::to_string(character_buffs_entry.numhits)); @@ -250,7 +250,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_buffs_entry.character_id ) @@ -270,7 +270,7 @@ public: insert_values.push_back(std::to_string(character_buffs_entry.slot_id)); insert_values.push_back(std::to_string(character_buffs_entry.spell_id)); insert_values.push_back(std::to_string(character_buffs_entry.caster_level)); - insert_values.push_back("'" + EscapeString(character_buffs_entry.caster_name) + "'"); + insert_values.push_back("'" + Strings::Escape(character_buffs_entry.caster_name) + "'"); insert_values.push_back(std::to_string(character_buffs_entry.ticsremaining)); insert_values.push_back(std::to_string(character_buffs_entry.counters)); insert_values.push_back(std::to_string(character_buffs_entry.numhits)); @@ -288,7 +288,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -316,7 +316,7 @@ public: insert_values.push_back(std::to_string(character_buffs_entry.slot_id)); insert_values.push_back(std::to_string(character_buffs_entry.spell_id)); insert_values.push_back(std::to_string(character_buffs_entry.caster_level)); - insert_values.push_back("'" + EscapeString(character_buffs_entry.caster_name) + "'"); + insert_values.push_back("'" + Strings::Escape(character_buffs_entry.caster_name) + "'"); insert_values.push_back(std::to_string(character_buffs_entry.ticsremaining)); insert_values.push_back(std::to_string(character_buffs_entry.counters)); insert_values.push_back(std::to_string(character_buffs_entry.numhits)); @@ -330,7 +330,7 @@ public: insert_values.push_back(std::to_string(character_buffs_entry.ExtraDIChance)); insert_values.push_back(std::to_string(character_buffs_entry.instrument_mod)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -339,7 +339,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_corpse_items_repository.h b/common/repositories/base/base_character_corpse_items_repository.h index b12e4c95a..da601caf1 100644 --- a/common/repositories/base/base_character_corpse_items_repository.h +++ b/common/repositories/base/base_character_corpse_items_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_CORPSE_ITEMS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterCorpseItemsRepository { @@ -73,12 +73,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -214,7 +214,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_corpse_items_entry.corpse_id ) @@ -246,7 +246,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -282,7 +282,7 @@ public: insert_values.push_back(std::to_string(character_corpse_items_entry.aug_6)); insert_values.push_back(std::to_string(character_corpse_items_entry.attuned)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -291,7 +291,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_corpses_repository.h b/common/repositories/base/base_character_corpses_repository.h index e44604759..18a47c392 100644 --- a/common/repositories/base/base_character_corpses_repository.h +++ b/common/repositories/base/base_character_corpses_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_CORPSES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterCorpsesRepository { @@ -181,12 +181,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -379,7 +379,7 @@ public: auto columns = Columns(); update_values.push_back(columns[1] + " = " + std::to_string(character_corpses_entry.charid)); - update_values.push_back(columns[2] + " = '" + EscapeString(character_corpses_entry.charname) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(character_corpses_entry.charname) + "'"); update_values.push_back(columns[3] + " = " + std::to_string(character_corpses_entry.zone_id)); update_values.push_back(columns[4] + " = " + std::to_string(character_corpses_entry.instance_id)); update_values.push_back(columns[5] + " = " + std::to_string(character_corpses_entry.x)); @@ -429,7 +429,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_corpses_entry.id ) @@ -447,7 +447,7 @@ public: insert_values.push_back(std::to_string(character_corpses_entry.id)); insert_values.push_back(std::to_string(character_corpses_entry.charid)); - insert_values.push_back("'" + EscapeString(character_corpses_entry.charname) + "'"); + insert_values.push_back("'" + Strings::Escape(character_corpses_entry.charname) + "'"); insert_values.push_back(std::to_string(character_corpses_entry.zone_id)); insert_values.push_back(std::to_string(character_corpses_entry.instance_id)); insert_values.push_back(std::to_string(character_corpses_entry.x)); @@ -497,7 +497,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -523,7 +523,7 @@ public: insert_values.push_back(std::to_string(character_corpses_entry.id)); insert_values.push_back(std::to_string(character_corpses_entry.charid)); - insert_values.push_back("'" + EscapeString(character_corpses_entry.charname) + "'"); + insert_values.push_back("'" + Strings::Escape(character_corpses_entry.charname) + "'"); insert_values.push_back(std::to_string(character_corpses_entry.zone_id)); insert_values.push_back(std::to_string(character_corpses_entry.instance_id)); insert_values.push_back(std::to_string(character_corpses_entry.x)); @@ -569,7 +569,7 @@ public: insert_values.push_back(std::to_string(character_corpses_entry.wc_8)); insert_values.push_back(std::to_string(character_corpses_entry.wc_9)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -578,7 +578,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_currency_repository.h b/common/repositories/base/base_character_currency_repository.h index b1e561608..aeee5fad4 100644 --- a/common/repositories/base/base_character_currency_repository.h +++ b/common/repositories/base/base_character_currency_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_CURRENCY_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterCurrencyRepository { @@ -91,12 +91,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -250,7 +250,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_currency_entry.id ) @@ -288,7 +288,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -330,7 +330,7 @@ public: insert_values.push_back(std::to_string(character_currency_entry.ebon_crystals)); insert_values.push_back(std::to_string(character_currency_entry.career_ebon_crystals)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -339,7 +339,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_data_repository.h b/common/repositories/base/base_character_data_repository.h index d6c96e211..29d4ae70c 100644 --- a/common/repositories/base/base_character_data_repository.h +++ b/common/repositories/base/base_character_data_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_DATA_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterDataRepository { @@ -346,12 +346,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -654,10 +654,10 @@ public: auto columns = Columns(); update_values.push_back(columns[1] + " = " + std::to_string(character_data_entry.account_id)); - update_values.push_back(columns[2] + " = '" + EscapeString(character_data_entry.name) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(character_data_entry.last_name) + "'"); - update_values.push_back(columns[4] + " = '" + EscapeString(character_data_entry.title) + "'"); - update_values.push_back(columns[5] + " = '" + EscapeString(character_data_entry.suffix) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(character_data_entry.name) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(character_data_entry.last_name) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(character_data_entry.title) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(character_data_entry.suffix) + "'"); update_values.push_back(columns[6] + " = " + std::to_string(character_data_entry.zone_id)); update_values.push_back(columns[7] + " = " + std::to_string(character_data_entry.zone_instance)); update_values.push_back(columns[8] + " = " + std::to_string(character_data_entry.y)); @@ -744,7 +744,7 @@ public: update_values.push_back(columns[89] + " = " + std::to_string(character_data_entry.autosplit_enabled)); update_values.push_back(columns[90] + " = " + std::to_string(character_data_entry.lfp)); update_values.push_back(columns[91] + " = " + std::to_string(character_data_entry.lfg)); - update_values.push_back(columns[92] + " = '" + EscapeString(character_data_entry.mailkey) + "'"); + update_values.push_back(columns[92] + " = '" + Strings::Escape(character_data_entry.mailkey) + "'"); update_values.push_back(columns[93] + " = " + std::to_string(character_data_entry.xtargets)); update_values.push_back(columns[94] + " = " + std::to_string(character_data_entry.firstlogon)); update_values.push_back(columns[95] + " = " + std::to_string(character_data_entry.e_aa_effects)); @@ -759,7 +759,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_data_entry.id ) @@ -777,10 +777,10 @@ public: insert_values.push_back(std::to_string(character_data_entry.id)); insert_values.push_back(std::to_string(character_data_entry.account_id)); - insert_values.push_back("'" + EscapeString(character_data_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(character_data_entry.last_name) + "'"); - insert_values.push_back("'" + EscapeString(character_data_entry.title) + "'"); - insert_values.push_back("'" + EscapeString(character_data_entry.suffix) + "'"); + insert_values.push_back("'" + Strings::Escape(character_data_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(character_data_entry.last_name) + "'"); + insert_values.push_back("'" + Strings::Escape(character_data_entry.title) + "'"); + insert_values.push_back("'" + Strings::Escape(character_data_entry.suffix) + "'"); insert_values.push_back(std::to_string(character_data_entry.zone_id)); insert_values.push_back(std::to_string(character_data_entry.zone_instance)); insert_values.push_back(std::to_string(character_data_entry.y)); @@ -867,7 +867,7 @@ public: insert_values.push_back(std::to_string(character_data_entry.autosplit_enabled)); insert_values.push_back(std::to_string(character_data_entry.lfp)); insert_values.push_back(std::to_string(character_data_entry.lfg)); - insert_values.push_back("'" + EscapeString(character_data_entry.mailkey) + "'"); + insert_values.push_back("'" + Strings::Escape(character_data_entry.mailkey) + "'"); insert_values.push_back(std::to_string(character_data_entry.xtargets)); insert_values.push_back(std::to_string(character_data_entry.firstlogon)); insert_values.push_back(std::to_string(character_data_entry.e_aa_effects)); @@ -882,7 +882,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -908,10 +908,10 @@ public: insert_values.push_back(std::to_string(character_data_entry.id)); insert_values.push_back(std::to_string(character_data_entry.account_id)); - insert_values.push_back("'" + EscapeString(character_data_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(character_data_entry.last_name) + "'"); - insert_values.push_back("'" + EscapeString(character_data_entry.title) + "'"); - insert_values.push_back("'" + EscapeString(character_data_entry.suffix) + "'"); + insert_values.push_back("'" + Strings::Escape(character_data_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(character_data_entry.last_name) + "'"); + insert_values.push_back("'" + Strings::Escape(character_data_entry.title) + "'"); + insert_values.push_back("'" + Strings::Escape(character_data_entry.suffix) + "'"); insert_values.push_back(std::to_string(character_data_entry.zone_id)); insert_values.push_back(std::to_string(character_data_entry.zone_instance)); insert_values.push_back(std::to_string(character_data_entry.y)); @@ -998,7 +998,7 @@ public: insert_values.push_back(std::to_string(character_data_entry.autosplit_enabled)); insert_values.push_back(std::to_string(character_data_entry.lfp)); insert_values.push_back(std::to_string(character_data_entry.lfg)); - insert_values.push_back("'" + EscapeString(character_data_entry.mailkey) + "'"); + insert_values.push_back("'" + Strings::Escape(character_data_entry.mailkey) + "'"); insert_values.push_back(std::to_string(character_data_entry.xtargets)); insert_values.push_back(std::to_string(character_data_entry.firstlogon)); insert_values.push_back(std::to_string(character_data_entry.e_aa_effects)); @@ -1009,7 +1009,7 @@ public: insert_values.push_back(std::to_string(character_data_entry.e_last_invsnapshot)); insert_values.push_back("FROM_UNIXTIME(" + (character_data_entry.deleted_at > 0 ? std::to_string(character_data_entry.deleted_at) : "null") + ")"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -1018,7 +1018,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_disciplines_repository.h b/common/repositories/base/base_character_disciplines_repository.h index 42ab05fbb..0730e876d 100644 --- a/common/repositories/base/base_character_disciplines_repository.h +++ b/common/repositories/base/base_character_disciplines_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_DISCIPLINES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterDisciplinesRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,7 +166,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_disciplines_entry.id ) @@ -190,7 +190,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -218,7 +218,7 @@ public: insert_values.push_back(std::to_string(character_disciplines_entry.slot_id)); insert_values.push_back(std::to_string(character_disciplines_entry.disc_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_exp_modifiers_repository.h b/common/repositories/base/base_character_exp_modifiers_repository.h index 51cf134ad..2e367d703 100644 --- a/common/repositories/base/base_character_exp_modifiers_repository.h +++ b/common/repositories/base/base_character_exp_modifiers_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_EXP_MODIFIERS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterExpModifiersRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -172,7 +172,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_exp_modifiers_entry.character_id ) @@ -197,7 +197,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -226,7 +226,7 @@ public: insert_values.push_back(std::to_string(character_exp_modifiers_entry.aa_modifier)); insert_values.push_back(std::to_string(character_exp_modifiers_entry.exp_modifier)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_expedition_lockouts_repository.h b/common/repositories/base/base_character_expedition_lockouts_repository.h index a8c4e9fd8..b3bc5e4a1 100644 --- a/common/repositories/base/base_character_expedition_lockouts_repository.h +++ b/common/repositories/base/base_character_expedition_lockouts_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_EXPEDITION_LOCKOUTS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterExpeditionLockoutsRepository { @@ -61,12 +61,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -179,17 +179,17 @@ public: auto columns = Columns(); update_values.push_back(columns[1] + " = " + std::to_string(character_expedition_lockouts_entry.character_id)); - update_values.push_back(columns[2] + " = '" + EscapeString(character_expedition_lockouts_entry.expedition_name) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(character_expedition_lockouts_entry.event_name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(character_expedition_lockouts_entry.expedition_name) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(character_expedition_lockouts_entry.event_name) + "'"); update_values.push_back(columns[4] + " = FROM_UNIXTIME(" + (character_expedition_lockouts_entry.expire_time > 0 ? std::to_string(character_expedition_lockouts_entry.expire_time) : "null") + ")"); update_values.push_back(columns[5] + " = " + std::to_string(character_expedition_lockouts_entry.duration)); - update_values.push_back(columns[6] + " = '" + EscapeString(character_expedition_lockouts_entry.from_expedition_uuid) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(character_expedition_lockouts_entry.from_expedition_uuid) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_expedition_lockouts_entry.id ) @@ -207,17 +207,17 @@ public: insert_values.push_back(std::to_string(character_expedition_lockouts_entry.id)); insert_values.push_back(std::to_string(character_expedition_lockouts_entry.character_id)); - insert_values.push_back("'" + EscapeString(character_expedition_lockouts_entry.expedition_name) + "'"); - insert_values.push_back("'" + EscapeString(character_expedition_lockouts_entry.event_name) + "'"); + insert_values.push_back("'" + Strings::Escape(character_expedition_lockouts_entry.expedition_name) + "'"); + insert_values.push_back("'" + Strings::Escape(character_expedition_lockouts_entry.event_name) + "'"); insert_values.push_back("FROM_UNIXTIME(" + (character_expedition_lockouts_entry.expire_time > 0 ? std::to_string(character_expedition_lockouts_entry.expire_time) : "null") + ")"); insert_values.push_back(std::to_string(character_expedition_lockouts_entry.duration)); - insert_values.push_back("'" + EscapeString(character_expedition_lockouts_entry.from_expedition_uuid) + "'"); + insert_values.push_back("'" + Strings::Escape(character_expedition_lockouts_entry.from_expedition_uuid) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -243,13 +243,13 @@ public: insert_values.push_back(std::to_string(character_expedition_lockouts_entry.id)); insert_values.push_back(std::to_string(character_expedition_lockouts_entry.character_id)); - insert_values.push_back("'" + EscapeString(character_expedition_lockouts_entry.expedition_name) + "'"); - insert_values.push_back("'" + EscapeString(character_expedition_lockouts_entry.event_name) + "'"); + insert_values.push_back("'" + Strings::Escape(character_expedition_lockouts_entry.expedition_name) + "'"); + insert_values.push_back("'" + Strings::Escape(character_expedition_lockouts_entry.event_name) + "'"); insert_values.push_back("FROM_UNIXTIME(" + (character_expedition_lockouts_entry.expire_time > 0 ? std::to_string(character_expedition_lockouts_entry.expire_time) : "null") + ")"); insert_values.push_back(std::to_string(character_expedition_lockouts_entry.duration)); - insert_values.push_back("'" + EscapeString(character_expedition_lockouts_entry.from_expedition_uuid) + "'"); + insert_values.push_back("'" + Strings::Escape(character_expedition_lockouts_entry.from_expedition_uuid) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -258,7 +258,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_inspect_messages_repository.h b/common/repositories/base/base_character_inspect_messages_repository.h index 70f381879..de2789c94 100644 --- a/common/repositories/base/base_character_inspect_messages_repository.h +++ b/common/repositories/base/base_character_inspect_messages_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_INSPECT_MESSAGES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterInspectMessagesRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -154,13 +154,13 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(character_inspect_messages_entry.id)); - update_values.push_back(columns[1] + " = '" + EscapeString(character_inspect_messages_entry.inspect_message) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(character_inspect_messages_entry.inspect_message) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_inspect_messages_entry.id ) @@ -177,13 +177,13 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(character_inspect_messages_entry.id)); - insert_values.push_back("'" + EscapeString(character_inspect_messages_entry.inspect_message) + "'"); + insert_values.push_back("'" + Strings::Escape(character_inspect_messages_entry.inspect_message) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -208,9 +208,9 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(character_inspect_messages_entry.id)); - insert_values.push_back("'" + EscapeString(character_inspect_messages_entry.inspect_message) + "'"); + insert_values.push_back("'" + Strings::Escape(character_inspect_messages_entry.inspect_message) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -219,7 +219,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_instance_safereturns_repository.h b/common/repositories/base/base_character_instance_safereturns_repository.h index 780633f5f..f751f7b0a 100644 --- a/common/repositories/base/base_character_instance_safereturns_repository.h +++ b/common/repositories/base/base_character_instance_safereturns_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_INSTANCE_SAFERETURNS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterInstanceSafereturnsRepository { @@ -67,12 +67,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -201,7 +201,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_instance_safereturns_entry.id ) @@ -231,7 +231,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -265,7 +265,7 @@ public: insert_values.push_back(std::to_string(character_instance_safereturns_entry.safe_z)); insert_values.push_back(std::to_string(character_instance_safereturns_entry.safe_heading)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -274,7 +274,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_item_recast_repository.h b/common/repositories/base/base_character_item_recast_repository.h index c38f1e1dc..ae8ee8591 100644 --- a/common/repositories/base/base_character_item_recast_repository.h +++ b/common/repositories/base/base_character_item_recast_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_ITEM_RECAST_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterItemRecastRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,7 +166,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_item_recast_entry.id ) @@ -190,7 +190,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -218,7 +218,7 @@ public: insert_values.push_back(std::to_string(character_item_recast_entry.recast_type)); insert_values.push_back(std::to_string(character_item_recast_entry.timestamp)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_languages_repository.h b/common/repositories/base/base_character_languages_repository.h index 169dd6f6a..a4048695a 100644 --- a/common/repositories/base/base_character_languages_repository.h +++ b/common/repositories/base/base_character_languages_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_LANGUAGES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterLanguagesRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -165,7 +165,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_languages_entry.id ) @@ -189,7 +189,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -217,7 +217,7 @@ public: insert_values.push_back(std::to_string(character_languages_entry.lang_id)); insert_values.push_back(std::to_string(character_languages_entry.value)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -226,7 +226,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_leadership_abilities_repository.h b/common/repositories/base/base_character_leadership_abilities_repository.h index 0de0b5e8e..af1b8f8e0 100644 --- a/common/repositories/base/base_character_leadership_abilities_repository.h +++ b/common/repositories/base/base_character_leadership_abilities_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_LEADERSHIP_ABILITIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterLeadershipAbilitiesRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,7 +166,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_leadership_abilities_entry.id ) @@ -190,7 +190,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -218,7 +218,7 @@ public: insert_values.push_back(std::to_string(character_leadership_abilities_entry.slot)); insert_values.push_back(std::to_string(character_leadership_abilities_entry.rank)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_material_repository.h b/common/repositories/base/base_character_material_repository.h index 7744aaa75..a67972896 100644 --- a/common/repositories/base/base_character_material_repository.h +++ b/common/repositories/base/base_character_material_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_MATERIAL_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterMaterialRepository { @@ -61,12 +61,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -189,7 +189,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_material_entry.id ) @@ -217,7 +217,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -249,7 +249,7 @@ public: insert_values.push_back(std::to_string(character_material_entry.use_tint)); insert_values.push_back(std::to_string(character_material_entry.color)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -258,7 +258,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_memmed_spells_repository.h b/common/repositories/base/base_character_memmed_spells_repository.h index 7ee116cc7..fd4b9de05 100644 --- a/common/repositories/base/base_character_memmed_spells_repository.h +++ b/common/repositories/base/base_character_memmed_spells_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_MEMMED_SPELLS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterMemmedSpellsRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,7 +166,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_memmed_spells_entry.id ) @@ -190,7 +190,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -218,7 +218,7 @@ public: insert_values.push_back(std::to_string(character_memmed_spells_entry.slot_id)); insert_values.push_back(std::to_string(character_memmed_spells_entry.spell_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_pet_buffs_repository.h b/common/repositories/base/base_character_pet_buffs_repository.h index 1c0c23a9e..f06c62093 100644 --- a/common/repositories/base/base_character_pet_buffs_repository.h +++ b/common/repositories/base/base_character_pet_buffs_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_PET_BUFFS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterPetBuffsRepository { @@ -73,12 +73,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -203,7 +203,7 @@ public: update_values.push_back(columns[2] + " = " + std::to_string(character_pet_buffs_entry.slot)); update_values.push_back(columns[3] + " = " + std::to_string(character_pet_buffs_entry.spell_id)); update_values.push_back(columns[4] + " = " + std::to_string(character_pet_buffs_entry.caster_level)); - update_values.push_back(columns[5] + " = '" + EscapeString(character_pet_buffs_entry.castername) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(character_pet_buffs_entry.castername) + "'"); update_values.push_back(columns[6] + " = " + std::to_string(character_pet_buffs_entry.ticsremaining)); update_values.push_back(columns[7] + " = " + std::to_string(character_pet_buffs_entry.counters)); update_values.push_back(columns[8] + " = " + std::to_string(character_pet_buffs_entry.numhits)); @@ -214,7 +214,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_pet_buffs_entry.char_id ) @@ -235,7 +235,7 @@ public: insert_values.push_back(std::to_string(character_pet_buffs_entry.slot)); insert_values.push_back(std::to_string(character_pet_buffs_entry.spell_id)); insert_values.push_back(std::to_string(character_pet_buffs_entry.caster_level)); - insert_values.push_back("'" + EscapeString(character_pet_buffs_entry.castername) + "'"); + insert_values.push_back("'" + Strings::Escape(character_pet_buffs_entry.castername) + "'"); insert_values.push_back(std::to_string(character_pet_buffs_entry.ticsremaining)); insert_values.push_back(std::to_string(character_pet_buffs_entry.counters)); insert_values.push_back(std::to_string(character_pet_buffs_entry.numhits)); @@ -246,7 +246,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -275,14 +275,14 @@ public: insert_values.push_back(std::to_string(character_pet_buffs_entry.slot)); insert_values.push_back(std::to_string(character_pet_buffs_entry.spell_id)); insert_values.push_back(std::to_string(character_pet_buffs_entry.caster_level)); - insert_values.push_back("'" + EscapeString(character_pet_buffs_entry.castername) + "'"); + insert_values.push_back("'" + Strings::Escape(character_pet_buffs_entry.castername) + "'"); insert_values.push_back(std::to_string(character_pet_buffs_entry.ticsremaining)); insert_values.push_back(std::to_string(character_pet_buffs_entry.counters)); insert_values.push_back(std::to_string(character_pet_buffs_entry.numhits)); insert_values.push_back(std::to_string(character_pet_buffs_entry.rune)); insert_values.push_back(std::to_string(character_pet_buffs_entry.instrument_mod)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -291,7 +291,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_pet_info_repository.h b/common/repositories/base/base_character_pet_info_repository.h index 63105d84f..9268560ea 100644 --- a/common/repositories/base/base_character_pet_info_repository.h +++ b/common/repositories/base/base_character_pet_info_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_PET_INFO_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterPetInfoRepository { @@ -67,12 +67,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -190,7 +190,7 @@ public: update_values.push_back(columns[0] + " = " + std::to_string(character_pet_info_entry.char_id)); update_values.push_back(columns[1] + " = " + std::to_string(character_pet_info_entry.pet)); - update_values.push_back(columns[2] + " = '" + EscapeString(character_pet_info_entry.petname) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(character_pet_info_entry.petname) + "'"); update_values.push_back(columns[3] + " = " + std::to_string(character_pet_info_entry.petpower)); update_values.push_back(columns[4] + " = " + std::to_string(character_pet_info_entry.spell_id)); update_values.push_back(columns[5] + " = " + std::to_string(character_pet_info_entry.hp)); @@ -202,7 +202,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_pet_info_entry.char_id ) @@ -220,7 +220,7 @@ public: insert_values.push_back(std::to_string(character_pet_info_entry.char_id)); insert_values.push_back(std::to_string(character_pet_info_entry.pet)); - insert_values.push_back("'" + EscapeString(character_pet_info_entry.petname) + "'"); + insert_values.push_back("'" + Strings::Escape(character_pet_info_entry.petname) + "'"); insert_values.push_back(std::to_string(character_pet_info_entry.petpower)); insert_values.push_back(std::to_string(character_pet_info_entry.spell_id)); insert_values.push_back(std::to_string(character_pet_info_entry.hp)); @@ -232,7 +232,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -258,7 +258,7 @@ public: insert_values.push_back(std::to_string(character_pet_info_entry.char_id)); insert_values.push_back(std::to_string(character_pet_info_entry.pet)); - insert_values.push_back("'" + EscapeString(character_pet_info_entry.petname) + "'"); + insert_values.push_back("'" + Strings::Escape(character_pet_info_entry.petname) + "'"); insert_values.push_back(std::to_string(character_pet_info_entry.petpower)); insert_values.push_back(std::to_string(character_pet_info_entry.spell_id)); insert_values.push_back(std::to_string(character_pet_info_entry.hp)); @@ -266,7 +266,7 @@ public: insert_values.push_back(std::to_string(character_pet_info_entry.size)); insert_values.push_back(std::to_string(character_pet_info_entry.taunting)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -275,7 +275,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_pet_inventory_repository.h b/common/repositories/base/base_character_pet_inventory_repository.h index 0f12b9704..2918822e6 100644 --- a/common/repositories/base/base_character_pet_inventory_repository.h +++ b/common/repositories/base/base_character_pet_inventory_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_PET_INVENTORY_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterPetInventoryRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -172,7 +172,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_pet_inventory_entry.char_id ) @@ -197,7 +197,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -226,7 +226,7 @@ public: insert_values.push_back(std::to_string(character_pet_inventory_entry.slot)); insert_values.push_back(std::to_string(character_pet_inventory_entry.item_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_potionbelt_repository.h b/common/repositories/base/base_character_potionbelt_repository.h index d8faca194..a083e2e7a 100644 --- a/common/repositories/base/base_character_potionbelt_repository.h +++ b/common/repositories/base/base_character_potionbelt_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_POTIONBELT_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterPotionbeltRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -172,7 +172,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_potionbelt_entry.id ) @@ -197,7 +197,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -226,7 +226,7 @@ public: insert_values.push_back(std::to_string(character_potionbelt_entry.item_id)); insert_values.push_back(std::to_string(character_potionbelt_entry.icon)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_skills_repository.h b/common/repositories/base/base_character_skills_repository.h index 0bd5eac23..627c9ee3e 100644 --- a/common/repositories/base/base_character_skills_repository.h +++ b/common/repositories/base/base_character_skills_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_SKILLS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterSkillsRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -165,7 +165,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_skills_entry.id ) @@ -189,7 +189,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -217,7 +217,7 @@ public: insert_values.push_back(std::to_string(character_skills_entry.skill_id)); insert_values.push_back(std::to_string(character_skills_entry.value)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -226,7 +226,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_spells_repository.h b/common/repositories/base/base_character_spells_repository.h index f9465f3df..b5b072a56 100644 --- a/common/repositories/base/base_character_spells_repository.h +++ b/common/repositories/base/base_character_spells_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_SPELLS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterSpellsRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -165,7 +165,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_spells_entry.id ) @@ -189,7 +189,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -217,7 +217,7 @@ public: insert_values.push_back(std::to_string(character_spells_entry.slot_id)); insert_values.push_back(std::to_string(character_spells_entry.spell_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -226,7 +226,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_task_timers_repository.h b/common/repositories/base/base_character_task_timers_repository.h index 73ea29182..e22853195 100644 --- a/common/repositories/base/base_character_task_timers_repository.h +++ b/common/repositories/base/base_character_task_timers_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_TASK_TIMERS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterTaskTimersRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -177,7 +177,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_task_timers_entry.id ) @@ -203,7 +203,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -233,7 +233,7 @@ public: insert_values.push_back(std::to_string(character_task_timers_entry.timer_type)); insert_values.push_back("FROM_UNIXTIME(" + (character_task_timers_entry.expire_time > 0 ? std::to_string(character_task_timers_entry.expire_time) : "null") + ")"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -242,7 +242,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_character_tasks_repository.h b/common/repositories/base/base_character_tasks_repository.h index 251389557..2f74b3ed6 100644 --- a/common/repositories/base/base_character_tasks_repository.h +++ b/common/repositories/base/base_character_tasks_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CHARACTER_TASKS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCharacterTasksRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -178,7 +178,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), character_tasks_entry.charid ) @@ -204,7 +204,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -234,7 +234,7 @@ public: insert_values.push_back(std::to_string(character_tasks_entry.type)); insert_values.push_back(std::to_string(character_tasks_entry.acceptedtime)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -243,7 +243,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_completed_shared_task_activity_state_repository.h b/common/repositories/base/base_completed_shared_task_activity_state_repository.h index 83244b31d..545b001ee 100644 --- a/common/repositories/base/base_completed_shared_task_activity_state_repository.h +++ b/common/repositories/base/base_completed_shared_task_activity_state_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_COMPLETED_SHARED_TASK_ACTIVITY_STATE_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCompletedSharedTaskActivityStateRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -178,7 +178,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), completed_shared_task_activity_state_entry.shared_task_id ) @@ -204,7 +204,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -234,7 +234,7 @@ public: insert_values.push_back("FROM_UNIXTIME(" + (completed_shared_task_activity_state_entry.updated_time > 0 ? std::to_string(completed_shared_task_activity_state_entry.updated_time) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (completed_shared_task_activity_state_entry.completed_time > 0 ? std::to_string(completed_shared_task_activity_state_entry.completed_time) : "null") + ")"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -243,7 +243,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_completed_shared_task_members_repository.h b/common/repositories/base/base_completed_shared_task_members_repository.h index 05f72ce3a..31a9d10f2 100644 --- a/common/repositories/base/base_completed_shared_task_members_repository.h +++ b/common/repositories/base/base_completed_shared_task_members_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_COMPLETED_SHARED_TASK_MEMBERS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCompletedSharedTaskMembersRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,7 +166,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), completed_shared_task_members_entry.shared_task_id ) @@ -190,7 +190,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -218,7 +218,7 @@ public: insert_values.push_back(std::to_string(completed_shared_task_members_entry.character_id)); insert_values.push_back(std::to_string(completed_shared_task_members_entry.is_leader)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_completed_shared_tasks_repository.h b/common/repositories/base/base_completed_shared_tasks_repository.h index 9c1e3a87d..eaa98328e 100644 --- a/common/repositories/base/base_completed_shared_tasks_repository.h +++ b/common/repositories/base/base_completed_shared_tasks_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_COMPLETED_SHARED_TASKS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCompletedSharedTasksRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -184,7 +184,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), completed_shared_tasks_entry.id ) @@ -211,7 +211,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -242,7 +242,7 @@ public: insert_values.push_back("FROM_UNIXTIME(" + (completed_shared_tasks_entry.completion_time > 0 ? std::to_string(completed_shared_tasks_entry.completion_time) : "null") + ")"); insert_values.push_back(std::to_string(completed_shared_tasks_entry.is_locked)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -251,7 +251,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_completed_tasks_repository.h b/common/repositories/base/base_completed_tasks_repository.h index f6f84bfe9..a5f5856e9 100644 --- a/common/repositories/base/base_completed_tasks_repository.h +++ b/common/repositories/base/base_completed_tasks_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_COMPLETED_TASKS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseCompletedTasksRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -172,7 +172,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), completed_tasks_entry.charid ) @@ -197,7 +197,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -226,7 +226,7 @@ public: insert_values.push_back(std::to_string(completed_tasks_entry.taskid)); insert_values.push_back(std::to_string(completed_tasks_entry.activityid)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_content_flags_repository.h b/common/repositories/base/base_content_flags_repository.h index 79374fd37..eebe55172 100644 --- a/common/repositories/base/base_content_flags_repository.h +++ b/common/repositories/base/base_content_flags_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_CONTENT_FLAGS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseContentFlagsRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -163,15 +163,15 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(content_flags_entry.flag_name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(content_flags_entry.flag_name) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(content_flags_entry.enabled)); - update_values.push_back(columns[3] + " = '" + EscapeString(content_flags_entry.notes) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(content_flags_entry.notes) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), content_flags_entry.id ) @@ -188,15 +188,15 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(content_flags_entry.id)); - insert_values.push_back("'" + EscapeString(content_flags_entry.flag_name) + "'"); + insert_values.push_back("'" + Strings::Escape(content_flags_entry.flag_name) + "'"); insert_values.push_back(std::to_string(content_flags_entry.enabled)); - insert_values.push_back("'" + EscapeString(content_flags_entry.notes) + "'"); + insert_values.push_back("'" + Strings::Escape(content_flags_entry.notes) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -221,11 +221,11 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(content_flags_entry.id)); - insert_values.push_back("'" + EscapeString(content_flags_entry.flag_name) + "'"); + insert_values.push_back("'" + Strings::Escape(content_flags_entry.flag_name) + "'"); insert_values.push_back(std::to_string(content_flags_entry.enabled)); - insert_values.push_back("'" + EscapeString(content_flags_entry.notes) + "'"); + insert_values.push_back("'" + Strings::Escape(content_flags_entry.notes) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -234,7 +234,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_damageshieldtypes_repository.h b/common/repositories/base/base_damageshieldtypes_repository.h index 052b2e8e7..064ac61f4 100644 --- a/common/repositories/base/base_damageshieldtypes_repository.h +++ b/common/repositories/base/base_damageshieldtypes_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_DAMAGESHIELDTYPES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseDamageshieldtypesRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -160,7 +160,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), damageshieldtypes_entry.spellid ) @@ -183,7 +183,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -210,7 +210,7 @@ public: insert_values.push_back(std::to_string(damageshieldtypes_entry.spellid)); insert_values.push_back(std::to_string(damageshieldtypes_entry.type)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -219,7 +219,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_data_buckets_repository.h b/common/repositories/base/base_data_buckets_repository.h index e144cc3db..f6314899e 100644 --- a/common/repositories/base/base_data_buckets_repository.h +++ b/common/repositories/base/base_data_buckets_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_DATA_BUCKETS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseDataBucketsRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -163,15 +163,15 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(data_buckets_entry.key) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(data_buckets_entry.value) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(data_buckets_entry.key) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(data_buckets_entry.value) + "'"); update_values.push_back(columns[3] + " = " + std::to_string(data_buckets_entry.expires)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), data_buckets_entry.id ) @@ -188,15 +188,15 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(data_buckets_entry.id)); - insert_values.push_back("'" + EscapeString(data_buckets_entry.key) + "'"); - insert_values.push_back("'" + EscapeString(data_buckets_entry.value) + "'"); + insert_values.push_back("'" + Strings::Escape(data_buckets_entry.key) + "'"); + insert_values.push_back("'" + Strings::Escape(data_buckets_entry.value) + "'"); insert_values.push_back(std::to_string(data_buckets_entry.expires)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -221,11 +221,11 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(data_buckets_entry.id)); - insert_values.push_back("'" + EscapeString(data_buckets_entry.key) + "'"); - insert_values.push_back("'" + EscapeString(data_buckets_entry.value) + "'"); + insert_values.push_back("'" + Strings::Escape(data_buckets_entry.key) + "'"); + insert_values.push_back("'" + Strings::Escape(data_buckets_entry.value) + "'"); insert_values.push_back(std::to_string(data_buckets_entry.expires)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -234,7 +234,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_db_str_repository.h b/common/repositories/base/base_db_str_repository.h index 0d84d757d..bc0f5d551 100644 --- a/common/repositories/base/base_db_str_repository.h +++ b/common/repositories/base/base_db_str_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_DB_STR_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseDbStrRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -160,13 +160,13 @@ public: update_values.push_back(columns[0] + " = " + std::to_string(db_str_entry.id)); update_values.push_back(columns[1] + " = " + std::to_string(db_str_entry.type)); - update_values.push_back(columns[2] + " = '" + EscapeString(db_str_entry.value) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(db_str_entry.value) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), db_str_entry.id ) @@ -184,13 +184,13 @@ public: insert_values.push_back(std::to_string(db_str_entry.id)); insert_values.push_back(std::to_string(db_str_entry.type)); - insert_values.push_back("'" + EscapeString(db_str_entry.value) + "'"); + insert_values.push_back("'" + Strings::Escape(db_str_entry.value) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -216,9 +216,9 @@ public: insert_values.push_back(std::to_string(db_str_entry.id)); insert_values.push_back(std::to_string(db_str_entry.type)); - insert_values.push_back("'" + EscapeString(db_str_entry.value) + "'"); + insert_values.push_back("'" + Strings::Escape(db_str_entry.value) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_discord_webhooks_repository.h b/common/repositories/base/base_discord_webhooks_repository.h index f5d84f525..88d6b049e 100644 --- a/common/repositories/base/base_discord_webhooks_repository.h +++ b/common/repositories/base/base_discord_webhooks_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_DISCORD_WEBHOOKS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseDiscordWebhooksRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -168,8 +168,8 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(discord_webhooks_entry.webhook_name) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(discord_webhooks_entry.webhook_url) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(discord_webhooks_entry.webhook_name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(discord_webhooks_entry.webhook_url) + "'"); update_values.push_back(columns[3] + " = FROM_UNIXTIME(" + (discord_webhooks_entry.created_at > 0 ? std::to_string(discord_webhooks_entry.created_at) : "null") + ")"); update_values.push_back(columns[4] + " = FROM_UNIXTIME(" + (discord_webhooks_entry.deleted_at > 0 ? std::to_string(discord_webhooks_entry.deleted_at) : "null") + ")"); @@ -177,7 +177,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), discord_webhooks_entry.id ) @@ -194,8 +194,8 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(discord_webhooks_entry.id)); - insert_values.push_back("'" + EscapeString(discord_webhooks_entry.webhook_name) + "'"); - insert_values.push_back("'" + EscapeString(discord_webhooks_entry.webhook_url) + "'"); + insert_values.push_back("'" + Strings::Escape(discord_webhooks_entry.webhook_name) + "'"); + insert_values.push_back("'" + Strings::Escape(discord_webhooks_entry.webhook_url) + "'"); insert_values.push_back("FROM_UNIXTIME(" + (discord_webhooks_entry.created_at > 0 ? std::to_string(discord_webhooks_entry.created_at) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (discord_webhooks_entry.deleted_at > 0 ? std::to_string(discord_webhooks_entry.deleted_at) : "null") + ")"); @@ -203,7 +203,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -228,12 +228,12 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(discord_webhooks_entry.id)); - insert_values.push_back("'" + EscapeString(discord_webhooks_entry.webhook_name) + "'"); - insert_values.push_back("'" + EscapeString(discord_webhooks_entry.webhook_url) + "'"); + insert_values.push_back("'" + Strings::Escape(discord_webhooks_entry.webhook_name) + "'"); + insert_values.push_back("'" + Strings::Escape(discord_webhooks_entry.webhook_url) + "'"); insert_values.push_back("FROM_UNIXTIME(" + (discord_webhooks_entry.created_at > 0 ? std::to_string(discord_webhooks_entry.created_at) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (discord_webhooks_entry.deleted_at > 0 ? std::to_string(discord_webhooks_entry.deleted_at) : "null") + ")"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -242,7 +242,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_discovered_items_repository.h b/common/repositories/base/base_discovered_items_repository.h index 4ee1e2e77..024000e13 100644 --- a/common/repositories/base/base_discovered_items_repository.h +++ b/common/repositories/base/base_discovered_items_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_DISCOVERED_ITEMS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseDiscoveredItemsRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -164,7 +164,7 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(discovered_items_entry.item_id)); - update_values.push_back(columns[1] + " = '" + EscapeString(discovered_items_entry.char_name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(discovered_items_entry.char_name) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(discovered_items_entry.discovered_date)); update_values.push_back(columns[3] + " = " + std::to_string(discovered_items_entry.account_status)); @@ -172,7 +172,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), discovered_items_entry.item_id ) @@ -189,7 +189,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(discovered_items_entry.item_id)); - insert_values.push_back("'" + EscapeString(discovered_items_entry.char_name) + "'"); + insert_values.push_back("'" + Strings::Escape(discovered_items_entry.char_name) + "'"); insert_values.push_back(std::to_string(discovered_items_entry.discovered_date)); insert_values.push_back(std::to_string(discovered_items_entry.account_status)); @@ -197,7 +197,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -222,11 +222,11 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(discovered_items_entry.item_id)); - insert_values.push_back("'" + EscapeString(discovered_items_entry.char_name) + "'"); + insert_values.push_back("'" + Strings::Escape(discovered_items_entry.char_name) + "'"); insert_values.push_back(std::to_string(discovered_items_entry.discovered_date)); insert_values.push_back(std::to_string(discovered_items_entry.account_status)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_doors_repository.h b/common/repositories/base/base_doors_repository.h index ff224387d..723b822e3 100644 --- a/common/repositories/base/base_doors_repository.h +++ b/common/repositories/base/base_doors_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_DOORS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseDoorsRepository { @@ -145,12 +145,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -319,9 +319,9 @@ public: auto columns = Columns(); update_values.push_back(columns[1] + " = " + std::to_string(doors_entry.doorid)); - update_values.push_back(columns[2] + " = '" + EscapeString(doors_entry.zone) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(doors_entry.zone) + "'"); update_values.push_back(columns[3] + " = " + std::to_string(doors_entry.version)); - update_values.push_back(columns[4] + " = '" + EscapeString(doors_entry.name) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(doors_entry.name) + "'"); update_values.push_back(columns[5] + " = " + std::to_string(doors_entry.pos_y)); update_values.push_back(columns[6] + " = " + std::to_string(doors_entry.pos_x)); update_values.push_back(columns[7] + " = " + std::to_string(doors_entry.pos_z)); @@ -336,7 +336,7 @@ public: update_values.push_back(columns[16] + " = " + std::to_string(doors_entry.disable_timer)); update_values.push_back(columns[17] + " = " + std::to_string(doors_entry.doorisopen)); update_values.push_back(columns[18] + " = " + std::to_string(doors_entry.door_param)); - update_values.push_back(columns[19] + " = '" + EscapeString(doors_entry.dest_zone) + "'"); + update_values.push_back(columns[19] + " = '" + Strings::Escape(doors_entry.dest_zone) + "'"); update_values.push_back(columns[20] + " = " + std::to_string(doors_entry.dest_instance)); update_values.push_back(columns[21] + " = " + std::to_string(doors_entry.dest_x)); update_values.push_back(columns[22] + " = " + std::to_string(doors_entry.dest_y)); @@ -350,14 +350,14 @@ public: update_values.push_back(columns[30] + " = " + std::to_string(doors_entry.is_ldon_door)); update_values.push_back(columns[31] + " = " + std::to_string(doors_entry.min_expansion)); update_values.push_back(columns[32] + " = " + std::to_string(doors_entry.max_expansion)); - update_values.push_back(columns[33] + " = '" + EscapeString(doors_entry.content_flags) + "'"); - update_values.push_back(columns[34] + " = '" + EscapeString(doors_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[33] + " = '" + Strings::Escape(doors_entry.content_flags) + "'"); + update_values.push_back(columns[34] + " = '" + Strings::Escape(doors_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), doors_entry.id ) @@ -375,9 +375,9 @@ public: insert_values.push_back(std::to_string(doors_entry.id)); insert_values.push_back(std::to_string(doors_entry.doorid)); - insert_values.push_back("'" + EscapeString(doors_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(doors_entry.zone) + "'"); insert_values.push_back(std::to_string(doors_entry.version)); - insert_values.push_back("'" + EscapeString(doors_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(doors_entry.name) + "'"); insert_values.push_back(std::to_string(doors_entry.pos_y)); insert_values.push_back(std::to_string(doors_entry.pos_x)); insert_values.push_back(std::to_string(doors_entry.pos_z)); @@ -392,7 +392,7 @@ public: insert_values.push_back(std::to_string(doors_entry.disable_timer)); insert_values.push_back(std::to_string(doors_entry.doorisopen)); insert_values.push_back(std::to_string(doors_entry.door_param)); - insert_values.push_back("'" + EscapeString(doors_entry.dest_zone) + "'"); + insert_values.push_back("'" + Strings::Escape(doors_entry.dest_zone) + "'"); insert_values.push_back(std::to_string(doors_entry.dest_instance)); insert_values.push_back(std::to_string(doors_entry.dest_x)); insert_values.push_back(std::to_string(doors_entry.dest_y)); @@ -406,14 +406,14 @@ public: insert_values.push_back(std::to_string(doors_entry.is_ldon_door)); insert_values.push_back(std::to_string(doors_entry.min_expansion)); insert_values.push_back(std::to_string(doors_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(doors_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(doors_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(doors_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(doors_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -439,9 +439,9 @@ public: insert_values.push_back(std::to_string(doors_entry.id)); insert_values.push_back(std::to_string(doors_entry.doorid)); - insert_values.push_back("'" + EscapeString(doors_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(doors_entry.zone) + "'"); insert_values.push_back(std::to_string(doors_entry.version)); - insert_values.push_back("'" + EscapeString(doors_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(doors_entry.name) + "'"); insert_values.push_back(std::to_string(doors_entry.pos_y)); insert_values.push_back(std::to_string(doors_entry.pos_x)); insert_values.push_back(std::to_string(doors_entry.pos_z)); @@ -456,7 +456,7 @@ public: insert_values.push_back(std::to_string(doors_entry.disable_timer)); insert_values.push_back(std::to_string(doors_entry.doorisopen)); insert_values.push_back(std::to_string(doors_entry.door_param)); - insert_values.push_back("'" + EscapeString(doors_entry.dest_zone) + "'"); + insert_values.push_back("'" + Strings::Escape(doors_entry.dest_zone) + "'"); insert_values.push_back(std::to_string(doors_entry.dest_instance)); insert_values.push_back(std::to_string(doors_entry.dest_x)); insert_values.push_back(std::to_string(doors_entry.dest_y)); @@ -470,10 +470,10 @@ public: insert_values.push_back(std::to_string(doors_entry.is_ldon_door)); insert_values.push_back(std::to_string(doors_entry.min_expansion)); insert_values.push_back(std::to_string(doors_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(doors_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(doors_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(doors_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(doors_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -482,7 +482,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_dynamic_zone_members_repository.h b/common/repositories/base/base_dynamic_zone_members_repository.h index 4a9547140..42c37bc53 100644 --- a/common/repositories/base/base_dynamic_zone_members_repository.h +++ b/common/repositories/base/base_dynamic_zone_members_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_DYNAMIC_ZONE_MEMBERS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseDynamicZoneMembersRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -165,7 +165,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), dynamic_zone_members_entry.id ) @@ -189,7 +189,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -217,7 +217,7 @@ public: insert_values.push_back(std::to_string(dynamic_zone_members_entry.dynamic_zone_id)); insert_values.push_back(std::to_string(dynamic_zone_members_entry.character_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -226,7 +226,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_dynamic_zones_repository.h b/common/repositories/base/base_dynamic_zones_repository.h index 5cf186cf2..55217dafe 100644 --- a/common/repositories/base/base_dynamic_zones_repository.h +++ b/common/repositories/base/base_dynamic_zones_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_DYNAMIC_ZONES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseDynamicZonesRepository { @@ -106,12 +106,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -255,8 +255,8 @@ public: update_values.push_back(columns[1] + " = " + std::to_string(dynamic_zones_entry.instance_id)); update_values.push_back(columns[2] + " = " + std::to_string(dynamic_zones_entry.type)); - update_values.push_back(columns[3] + " = '" + EscapeString(dynamic_zones_entry.uuid) + "'"); - update_values.push_back(columns[4] + " = '" + EscapeString(dynamic_zones_entry.name) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(dynamic_zones_entry.uuid) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(dynamic_zones_entry.name) + "'"); update_values.push_back(columns[5] + " = " + std::to_string(dynamic_zones_entry.leader_id)); update_values.push_back(columns[6] + " = " + std::to_string(dynamic_zones_entry.min_players)); update_values.push_back(columns[7] + " = " + std::to_string(dynamic_zones_entry.max_players)); @@ -279,7 +279,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), dynamic_zones_entry.id ) @@ -298,8 +298,8 @@ public: insert_values.push_back(std::to_string(dynamic_zones_entry.id)); insert_values.push_back(std::to_string(dynamic_zones_entry.instance_id)); insert_values.push_back(std::to_string(dynamic_zones_entry.type)); - insert_values.push_back("'" + EscapeString(dynamic_zones_entry.uuid) + "'"); - insert_values.push_back("'" + EscapeString(dynamic_zones_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(dynamic_zones_entry.uuid) + "'"); + insert_values.push_back("'" + Strings::Escape(dynamic_zones_entry.name) + "'"); insert_values.push_back(std::to_string(dynamic_zones_entry.leader_id)); insert_values.push_back(std::to_string(dynamic_zones_entry.min_players)); insert_values.push_back(std::to_string(dynamic_zones_entry.max_players)); @@ -322,7 +322,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -349,8 +349,8 @@ public: insert_values.push_back(std::to_string(dynamic_zones_entry.id)); insert_values.push_back(std::to_string(dynamic_zones_entry.instance_id)); insert_values.push_back(std::to_string(dynamic_zones_entry.type)); - insert_values.push_back("'" + EscapeString(dynamic_zones_entry.uuid) + "'"); - insert_values.push_back("'" + EscapeString(dynamic_zones_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(dynamic_zones_entry.uuid) + "'"); + insert_values.push_back("'" + Strings::Escape(dynamic_zones_entry.name) + "'"); insert_values.push_back(std::to_string(dynamic_zones_entry.leader_id)); insert_values.push_back(std::to_string(dynamic_zones_entry.min_players)); insert_values.push_back(std::to_string(dynamic_zones_entry.max_players)); @@ -369,7 +369,7 @@ public: insert_values.push_back(std::to_string(dynamic_zones_entry.zone_in_heading)); insert_values.push_back(std::to_string(dynamic_zones_entry.has_zone_in)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -378,7 +378,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_eventlog_repository.h b/common/repositories/base/base_eventlog_repository.h index 328c6ad4c..c89f34584 100644 --- a/common/repositories/base/base_eventlog_repository.h +++ b/common/repositories/base/base_eventlog_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_EVENTLOG_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseEventlogRepository { @@ -70,12 +70,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -193,21 +193,21 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(eventlog_entry.accountname) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(eventlog_entry.accountname) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(eventlog_entry.accountid)); update_values.push_back(columns[3] + " = " + std::to_string(eventlog_entry.status)); - update_values.push_back(columns[4] + " = '" + EscapeString(eventlog_entry.charname) + "'"); - update_values.push_back(columns[5] + " = '" + EscapeString(eventlog_entry.target) + "'"); - update_values.push_back(columns[6] + " = '" + EscapeString(eventlog_entry.time) + "'"); - update_values.push_back(columns[7] + " = '" + EscapeString(eventlog_entry.descriptiontype) + "'"); - update_values.push_back(columns[8] + " = '" + EscapeString(eventlog_entry.description) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(eventlog_entry.charname) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(eventlog_entry.target) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(eventlog_entry.time) + "'"); + update_values.push_back(columns[7] + " = '" + Strings::Escape(eventlog_entry.descriptiontype) + "'"); + update_values.push_back(columns[8] + " = '" + Strings::Escape(eventlog_entry.description) + "'"); update_values.push_back(columns[9] + " = " + std::to_string(eventlog_entry.event_nid)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), eventlog_entry.id ) @@ -224,21 +224,21 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(eventlog_entry.id)); - insert_values.push_back("'" + EscapeString(eventlog_entry.accountname) + "'"); + insert_values.push_back("'" + Strings::Escape(eventlog_entry.accountname) + "'"); insert_values.push_back(std::to_string(eventlog_entry.accountid)); insert_values.push_back(std::to_string(eventlog_entry.status)); - insert_values.push_back("'" + EscapeString(eventlog_entry.charname) + "'"); - insert_values.push_back("'" + EscapeString(eventlog_entry.target) + "'"); - insert_values.push_back("'" + EscapeString(eventlog_entry.time) + "'"); - insert_values.push_back("'" + EscapeString(eventlog_entry.descriptiontype) + "'"); - insert_values.push_back("'" + EscapeString(eventlog_entry.description) + "'"); + insert_values.push_back("'" + Strings::Escape(eventlog_entry.charname) + "'"); + insert_values.push_back("'" + Strings::Escape(eventlog_entry.target) + "'"); + insert_values.push_back("'" + Strings::Escape(eventlog_entry.time) + "'"); + insert_values.push_back("'" + Strings::Escape(eventlog_entry.descriptiontype) + "'"); + insert_values.push_back("'" + Strings::Escape(eventlog_entry.description) + "'"); insert_values.push_back(std::to_string(eventlog_entry.event_nid)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -263,17 +263,17 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(eventlog_entry.id)); - insert_values.push_back("'" + EscapeString(eventlog_entry.accountname) + "'"); + insert_values.push_back("'" + Strings::Escape(eventlog_entry.accountname) + "'"); insert_values.push_back(std::to_string(eventlog_entry.accountid)); insert_values.push_back(std::to_string(eventlog_entry.status)); - insert_values.push_back("'" + EscapeString(eventlog_entry.charname) + "'"); - insert_values.push_back("'" + EscapeString(eventlog_entry.target) + "'"); - insert_values.push_back("'" + EscapeString(eventlog_entry.time) + "'"); - insert_values.push_back("'" + EscapeString(eventlog_entry.descriptiontype) + "'"); - insert_values.push_back("'" + EscapeString(eventlog_entry.description) + "'"); + insert_values.push_back("'" + Strings::Escape(eventlog_entry.charname) + "'"); + insert_values.push_back("'" + Strings::Escape(eventlog_entry.target) + "'"); + insert_values.push_back("'" + Strings::Escape(eventlog_entry.time) + "'"); + insert_values.push_back("'" + Strings::Escape(eventlog_entry.descriptiontype) + "'"); + insert_values.push_back("'" + Strings::Escape(eventlog_entry.description) + "'"); insert_values.push_back(std::to_string(eventlog_entry.event_nid)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -282,7 +282,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_expedition_lockouts_repository.h b/common/repositories/base/base_expedition_lockouts_repository.h index b148b1b2d..58d4915a6 100644 --- a/common/repositories/base/base_expedition_lockouts_repository.h +++ b/common/repositories/base/base_expedition_lockouts_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_EXPEDITION_LOCKOUTS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseExpeditionLockoutsRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -174,16 +174,16 @@ public: auto columns = Columns(); update_values.push_back(columns[1] + " = " + std::to_string(expedition_lockouts_entry.expedition_id)); - update_values.push_back(columns[2] + " = '" + EscapeString(expedition_lockouts_entry.event_name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(expedition_lockouts_entry.event_name) + "'"); update_values.push_back(columns[3] + " = FROM_UNIXTIME(" + (expedition_lockouts_entry.expire_time > 0 ? std::to_string(expedition_lockouts_entry.expire_time) : "null") + ")"); update_values.push_back(columns[4] + " = " + std::to_string(expedition_lockouts_entry.duration)); - update_values.push_back(columns[5] + " = '" + EscapeString(expedition_lockouts_entry.from_expedition_uuid) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(expedition_lockouts_entry.from_expedition_uuid) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), expedition_lockouts_entry.id ) @@ -201,16 +201,16 @@ public: insert_values.push_back(std::to_string(expedition_lockouts_entry.id)); insert_values.push_back(std::to_string(expedition_lockouts_entry.expedition_id)); - insert_values.push_back("'" + EscapeString(expedition_lockouts_entry.event_name) + "'"); + insert_values.push_back("'" + Strings::Escape(expedition_lockouts_entry.event_name) + "'"); insert_values.push_back("FROM_UNIXTIME(" + (expedition_lockouts_entry.expire_time > 0 ? std::to_string(expedition_lockouts_entry.expire_time) : "null") + ")"); insert_values.push_back(std::to_string(expedition_lockouts_entry.duration)); - insert_values.push_back("'" + EscapeString(expedition_lockouts_entry.from_expedition_uuid) + "'"); + insert_values.push_back("'" + Strings::Escape(expedition_lockouts_entry.from_expedition_uuid) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -236,12 +236,12 @@ public: insert_values.push_back(std::to_string(expedition_lockouts_entry.id)); insert_values.push_back(std::to_string(expedition_lockouts_entry.expedition_id)); - insert_values.push_back("'" + EscapeString(expedition_lockouts_entry.event_name) + "'"); + insert_values.push_back("'" + Strings::Escape(expedition_lockouts_entry.event_name) + "'"); insert_values.push_back("FROM_UNIXTIME(" + (expedition_lockouts_entry.expire_time > 0 ? std::to_string(expedition_lockouts_entry.expire_time) : "null") + ")"); insert_values.push_back(std::to_string(expedition_lockouts_entry.duration)); - insert_values.push_back("'" + EscapeString(expedition_lockouts_entry.from_expedition_uuid) + "'"); + insert_values.push_back("'" + Strings::Escape(expedition_lockouts_entry.from_expedition_uuid) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -250,7 +250,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_expeditions_repository.h b/common/repositories/base/base_expeditions_repository.h index 6e4cbdc0b..87efe42bf 100644 --- a/common/repositories/base/base_expeditions_repository.h +++ b/common/repositories/base/base_expeditions_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_EXPEDITIONS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseExpeditionsRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -171,7 +171,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), expeditions_entry.id ) @@ -196,7 +196,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -225,7 +225,7 @@ public: insert_values.push_back(std::to_string(expeditions_entry.add_replay_on_join)); insert_values.push_back(std::to_string(expeditions_entry.is_locked)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -234,7 +234,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_faction_base_data_repository.h b/common/repositories/base/base_faction_base_data_repository.h index cdf0f463d..393604e06 100644 --- a/common/repositories/base/base_faction_base_data_repository.h +++ b/common/repositories/base/base_faction_base_data_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_FACTION_BASE_DATA_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseFactionBaseDataRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -184,7 +184,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), faction_base_data_entry.client_faction_id ) @@ -211,7 +211,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -242,7 +242,7 @@ public: insert_values.push_back(std::to_string(faction_base_data_entry.unk_hero2)); insert_values.push_back(std::to_string(faction_base_data_entry.unk_hero3)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -251,7 +251,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_faction_list_mod_repository.h b/common/repositories/base/base_faction_list_mod_repository.h index 2a03a0a02..461393cc4 100644 --- a/common/repositories/base/base_faction_list_mod_repository.h +++ b/common/repositories/base/base_faction_list_mod_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_FACTION_LIST_MOD_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseFactionListModRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -165,13 +165,13 @@ public: update_values.push_back(columns[1] + " = " + std::to_string(faction_list_mod_entry.faction_id)); update_values.push_back(columns[2] + " = " + std::to_string(faction_list_mod_entry.mod)); - update_values.push_back(columns[3] + " = '" + EscapeString(faction_list_mod_entry.mod_name) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(faction_list_mod_entry.mod_name) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), faction_list_mod_entry.id ) @@ -190,13 +190,13 @@ public: insert_values.push_back(std::to_string(faction_list_mod_entry.id)); insert_values.push_back(std::to_string(faction_list_mod_entry.faction_id)); insert_values.push_back(std::to_string(faction_list_mod_entry.mod)); - insert_values.push_back("'" + EscapeString(faction_list_mod_entry.mod_name) + "'"); + insert_values.push_back("'" + Strings::Escape(faction_list_mod_entry.mod_name) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -223,9 +223,9 @@ public: insert_values.push_back(std::to_string(faction_list_mod_entry.id)); insert_values.push_back(std::to_string(faction_list_mod_entry.faction_id)); insert_values.push_back(std::to_string(faction_list_mod_entry.mod)); - insert_values.push_back("'" + EscapeString(faction_list_mod_entry.mod_name) + "'"); + insert_values.push_back("'" + Strings::Escape(faction_list_mod_entry.mod_name) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -234,7 +234,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_faction_list_repository.h b/common/repositories/base/base_faction_list_repository.h index 51068b19b..11a8620ee 100644 --- a/common/repositories/base/base_faction_list_repository.h +++ b/common/repositories/base/base_faction_list_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_FACTION_LIST_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseFactionListRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -159,14 +159,14 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(faction_list_entry.id)); - update_values.push_back(columns[1] + " = '" + EscapeString(faction_list_entry.name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(faction_list_entry.name) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(faction_list_entry.base)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), faction_list_entry.id ) @@ -183,14 +183,14 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(faction_list_entry.id)); - insert_values.push_back("'" + EscapeString(faction_list_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(faction_list_entry.name) + "'"); insert_values.push_back(std::to_string(faction_list_entry.base)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -215,10 +215,10 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(faction_list_entry.id)); - insert_values.push_back("'" + EscapeString(faction_list_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(faction_list_entry.name) + "'"); insert_values.push_back(std::to_string(faction_list_entry.base)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_faction_values_repository.h b/common/repositories/base/base_faction_values_repository.h index ef25a0147..7868b7c88 100644 --- a/common/repositories/base/base_faction_values_repository.h +++ b/common/repositories/base/base_faction_values_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_FACTION_VALUES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseFactionValuesRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -172,7 +172,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), faction_values_entry.char_id ) @@ -197,7 +197,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -226,7 +226,7 @@ public: insert_values.push_back(std::to_string(faction_values_entry.current_value)); insert_values.push_back(std::to_string(faction_values_entry.temp)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_fishing_repository.h b/common/repositories/base/base_fishing_repository.h index ba0f9eb11..c6368a0f6 100644 --- a/common/repositories/base/base_fishing_repository.h +++ b/common/repositories/base/base_fishing_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_FISHING_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseFishingRepository { @@ -73,12 +73,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -206,14 +206,14 @@ public: update_values.push_back(columns[6] + " = " + std::to_string(fishing_entry.npc_chance)); update_values.push_back(columns[7] + " = " + std::to_string(fishing_entry.min_expansion)); update_values.push_back(columns[8] + " = " + std::to_string(fishing_entry.max_expansion)); - update_values.push_back(columns[9] + " = '" + EscapeString(fishing_entry.content_flags) + "'"); - update_values.push_back(columns[10] + " = '" + EscapeString(fishing_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[9] + " = '" + Strings::Escape(fishing_entry.content_flags) + "'"); + update_values.push_back(columns[10] + " = '" + Strings::Escape(fishing_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), fishing_entry.id ) @@ -238,14 +238,14 @@ public: insert_values.push_back(std::to_string(fishing_entry.npc_chance)); insert_values.push_back(std::to_string(fishing_entry.min_expansion)); insert_values.push_back(std::to_string(fishing_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(fishing_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(fishing_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(fishing_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(fishing_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -278,10 +278,10 @@ public: insert_values.push_back(std::to_string(fishing_entry.npc_chance)); insert_values.push_back(std::to_string(fishing_entry.min_expansion)); insert_values.push_back(std::to_string(fishing_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(fishing_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(fishing_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(fishing_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(fishing_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -290,7 +290,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_forage_repository.h b/common/repositories/base/base_forage_repository.h index 166ee7cd4..2e7a781fc 100644 --- a/common/repositories/base/base_forage_repository.h +++ b/common/repositories/base/base_forage_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_FORAGE_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseForageRepository { @@ -67,12 +67,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -194,14 +194,14 @@ public: update_values.push_back(columns[4] + " = " + std::to_string(forage_entry.chance)); update_values.push_back(columns[5] + " = " + std::to_string(forage_entry.min_expansion)); update_values.push_back(columns[6] + " = " + std::to_string(forage_entry.max_expansion)); - update_values.push_back(columns[7] + " = '" + EscapeString(forage_entry.content_flags) + "'"); - update_values.push_back(columns[8] + " = '" + EscapeString(forage_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[7] + " = '" + Strings::Escape(forage_entry.content_flags) + "'"); + update_values.push_back(columns[8] + " = '" + Strings::Escape(forage_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), forage_entry.id ) @@ -224,14 +224,14 @@ public: insert_values.push_back(std::to_string(forage_entry.chance)); insert_values.push_back(std::to_string(forage_entry.min_expansion)); insert_values.push_back(std::to_string(forage_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(forage_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(forage_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(forage_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(forage_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -262,10 +262,10 @@ public: insert_values.push_back(std::to_string(forage_entry.chance)); insert_values.push_back(std::to_string(forage_entry.min_expansion)); insert_values.push_back(std::to_string(forage_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(forage_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(forage_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(forage_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(forage_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -274,7 +274,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_friends_repository.h b/common/repositories/base/base_friends_repository.h index 27115b76d..16c7273be 100644 --- a/common/repositories/base/base_friends_repository.h +++ b/common/repositories/base/base_friends_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_FRIENDS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseFriendsRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -160,13 +160,13 @@ public: update_values.push_back(columns[0] + " = " + std::to_string(friends_entry.charid)); update_values.push_back(columns[1] + " = " + std::to_string(friends_entry.type)); - update_values.push_back(columns[2] + " = '" + EscapeString(friends_entry.name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(friends_entry.name) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), friends_entry.charid ) @@ -184,13 +184,13 @@ public: insert_values.push_back(std::to_string(friends_entry.charid)); insert_values.push_back(std::to_string(friends_entry.type)); - insert_values.push_back("'" + EscapeString(friends_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(friends_entry.name) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -216,9 +216,9 @@ public: insert_values.push_back(std::to_string(friends_entry.charid)); insert_values.push_back(std::to_string(friends_entry.type)); - insert_values.push_back("'" + EscapeString(friends_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(friends_entry.name) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_global_loot_repository.h b/common/repositories/base/base_global_loot_repository.h index dbee15a9e..5a138f1ab 100644 --- a/common/repositories/base/base_global_loot_repository.h +++ b/common/repositories/base/base_global_loot_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_GLOBAL_LOOT_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseGlobalLootRepository { @@ -91,12 +91,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -228,28 +228,28 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(global_loot_entry.description) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(global_loot_entry.description) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(global_loot_entry.loottable_id)); update_values.push_back(columns[3] + " = " + std::to_string(global_loot_entry.enabled)); update_values.push_back(columns[4] + " = " + std::to_string(global_loot_entry.min_level)); update_values.push_back(columns[5] + " = " + std::to_string(global_loot_entry.max_level)); update_values.push_back(columns[6] + " = " + std::to_string(global_loot_entry.rare)); update_values.push_back(columns[7] + " = " + std::to_string(global_loot_entry.raid)); - update_values.push_back(columns[8] + " = '" + EscapeString(global_loot_entry.race) + "'"); - update_values.push_back(columns[9] + " = '" + EscapeString(global_loot_entry.class_) + "'"); - update_values.push_back(columns[10] + " = '" + EscapeString(global_loot_entry.bodytype) + "'"); - update_values.push_back(columns[11] + " = '" + EscapeString(global_loot_entry.zone) + "'"); + update_values.push_back(columns[8] + " = '" + Strings::Escape(global_loot_entry.race) + "'"); + update_values.push_back(columns[9] + " = '" + Strings::Escape(global_loot_entry.class_) + "'"); + update_values.push_back(columns[10] + " = '" + Strings::Escape(global_loot_entry.bodytype) + "'"); + update_values.push_back(columns[11] + " = '" + Strings::Escape(global_loot_entry.zone) + "'"); update_values.push_back(columns[12] + " = " + std::to_string(global_loot_entry.hot_zone)); update_values.push_back(columns[13] + " = " + std::to_string(global_loot_entry.min_expansion)); update_values.push_back(columns[14] + " = " + std::to_string(global_loot_entry.max_expansion)); - update_values.push_back(columns[15] + " = '" + EscapeString(global_loot_entry.content_flags) + "'"); - update_values.push_back(columns[16] + " = '" + EscapeString(global_loot_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[15] + " = '" + Strings::Escape(global_loot_entry.content_flags) + "'"); + update_values.push_back(columns[16] + " = '" + Strings::Escape(global_loot_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), global_loot_entry.id ) @@ -266,28 +266,28 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(global_loot_entry.id)); - insert_values.push_back("'" + EscapeString(global_loot_entry.description) + "'"); + insert_values.push_back("'" + Strings::Escape(global_loot_entry.description) + "'"); insert_values.push_back(std::to_string(global_loot_entry.loottable_id)); insert_values.push_back(std::to_string(global_loot_entry.enabled)); insert_values.push_back(std::to_string(global_loot_entry.min_level)); insert_values.push_back(std::to_string(global_loot_entry.max_level)); insert_values.push_back(std::to_string(global_loot_entry.rare)); insert_values.push_back(std::to_string(global_loot_entry.raid)); - insert_values.push_back("'" + EscapeString(global_loot_entry.race) + "'"); - insert_values.push_back("'" + EscapeString(global_loot_entry.class_) + "'"); - insert_values.push_back("'" + EscapeString(global_loot_entry.bodytype) + "'"); - insert_values.push_back("'" + EscapeString(global_loot_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(global_loot_entry.race) + "'"); + insert_values.push_back("'" + Strings::Escape(global_loot_entry.class_) + "'"); + insert_values.push_back("'" + Strings::Escape(global_loot_entry.bodytype) + "'"); + insert_values.push_back("'" + Strings::Escape(global_loot_entry.zone) + "'"); insert_values.push_back(std::to_string(global_loot_entry.hot_zone)); insert_values.push_back(std::to_string(global_loot_entry.min_expansion)); insert_values.push_back(std::to_string(global_loot_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(global_loot_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(global_loot_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(global_loot_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(global_loot_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -312,24 +312,24 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(global_loot_entry.id)); - insert_values.push_back("'" + EscapeString(global_loot_entry.description) + "'"); + insert_values.push_back("'" + Strings::Escape(global_loot_entry.description) + "'"); insert_values.push_back(std::to_string(global_loot_entry.loottable_id)); insert_values.push_back(std::to_string(global_loot_entry.enabled)); insert_values.push_back(std::to_string(global_loot_entry.min_level)); insert_values.push_back(std::to_string(global_loot_entry.max_level)); insert_values.push_back(std::to_string(global_loot_entry.rare)); insert_values.push_back(std::to_string(global_loot_entry.raid)); - insert_values.push_back("'" + EscapeString(global_loot_entry.race) + "'"); - insert_values.push_back("'" + EscapeString(global_loot_entry.class_) + "'"); - insert_values.push_back("'" + EscapeString(global_loot_entry.bodytype) + "'"); - insert_values.push_back("'" + EscapeString(global_loot_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(global_loot_entry.race) + "'"); + insert_values.push_back("'" + Strings::Escape(global_loot_entry.class_) + "'"); + insert_values.push_back("'" + Strings::Escape(global_loot_entry.bodytype) + "'"); + insert_values.push_back("'" + Strings::Escape(global_loot_entry.zone) + "'"); insert_values.push_back(std::to_string(global_loot_entry.hot_zone)); insert_values.push_back(std::to_string(global_loot_entry.min_expansion)); insert_values.push_back(std::to_string(global_loot_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(global_loot_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(global_loot_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(global_loot_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(global_loot_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -338,7 +338,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_gm_ips_repository.h b/common/repositories/base/base_gm_ips_repository.h index 84f18734d..cd09ca728 100644 --- a/common/repositories/base/base_gm_ips_repository.h +++ b/common/repositories/base/base_gm_ips_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_GM_IPS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseGmIpsRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -158,15 +158,15 @@ public: auto columns = Columns(); - update_values.push_back(columns[0] + " = '" + EscapeString(gm_ips_entry.name) + "'"); + update_values.push_back(columns[0] + " = '" + Strings::Escape(gm_ips_entry.name) + "'"); update_values.push_back(columns[1] + " = " + std::to_string(gm_ips_entry.account_id)); - update_values.push_back(columns[2] + " = '" + EscapeString(gm_ips_entry.ip_address) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(gm_ips_entry.ip_address) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), gm_ips_entry.account_id ) @@ -182,15 +182,15 @@ public: { std::vector insert_values; - insert_values.push_back("'" + EscapeString(gm_ips_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(gm_ips_entry.name) + "'"); insert_values.push_back(std::to_string(gm_ips_entry.account_id)); - insert_values.push_back("'" + EscapeString(gm_ips_entry.ip_address) + "'"); + insert_values.push_back("'" + Strings::Escape(gm_ips_entry.ip_address) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -214,11 +214,11 @@ public: for (auto &gm_ips_entry: gm_ips_entries) { std::vector insert_values; - insert_values.push_back("'" + EscapeString(gm_ips_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(gm_ips_entry.name) + "'"); insert_values.push_back(std::to_string(gm_ips_entry.account_id)); - insert_values.push_back("'" + EscapeString(gm_ips_entry.ip_address) + "'"); + insert_values.push_back("'" + Strings::Escape(gm_ips_entry.ip_address) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_goallists_repository.h b/common/repositories/base/base_goallists_repository.h index 79e0919ca..2a72c5da4 100644 --- a/common/repositories/base/base_goallists_repository.h +++ b/common/repositories/base/base_goallists_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_GOALLISTS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseGoallistsRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -160,7 +160,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), goallists_entry.listid ) @@ -183,7 +183,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -210,7 +210,7 @@ public: insert_values.push_back(std::to_string(goallists_entry.listid)); insert_values.push_back(std::to_string(goallists_entry.entry)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -219,7 +219,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_graveyard_repository.h b/common/repositories/base/base_graveyard_repository.h index 2df4c292d..20b3fcd16 100644 --- a/common/repositories/base/base_graveyard_repository.h +++ b/common/repositories/base/base_graveyard_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_GRAVEYARD_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseGraveyardRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -183,7 +183,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), graveyard_entry.id ) @@ -210,7 +210,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -241,7 +241,7 @@ public: insert_values.push_back(std::to_string(graveyard_entry.z)); insert_values.push_back(std::to_string(graveyard_entry.heading)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -250,7 +250,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_grid_entries_repository.h b/common/repositories/base/base_grid_entries_repository.h index 6b0f3fcd2..0c8290fd1 100644 --- a/common/repositories/base/base_grid_entries_repository.h +++ b/common/repositories/base/base_grid_entries_repository.h @@ -30,7 +30,7 @@ #define EQEMU_BASE_GRID_ENTRIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" class BaseGridEntriesRepository { public: @@ -68,7 +68,7 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string InsertColumnsRaw() @@ -83,7 +83,7 @@ public: insert_columns.push_back(column); } - return std::string(implode(", ", insert_columns)); + return std::string(Strings::Implode(", ", insert_columns)); } static std::string TableName() @@ -207,7 +207,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), grid_entries_entry.number ) @@ -233,7 +233,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -263,7 +263,7 @@ public: insert_values.push_back(std::to_string(grid_entries_entry.pause)); insert_values.push_back(std::to_string(grid_entries_entry.centerpoint)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -272,7 +272,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_grid_repository.h b/common/repositories/base/base_grid_repository.h index be0574fc0..261108b01 100644 --- a/common/repositories/base/base_grid_repository.h +++ b/common/repositories/base/base_grid_repository.h @@ -30,7 +30,7 @@ #define EQEMU_BASE_GRID_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" class BaseGridRepository { public: @@ -58,7 +58,7 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string InsertColumnsRaw() @@ -73,7 +73,7 @@ public: insert_columns.push_back(column); } - return std::string(implode(", ", insert_columns)); + return std::string(Strings::Implode(", ", insert_columns)); } static std::string TableName() @@ -185,7 +185,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), grid_entry.id ) @@ -209,7 +209,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -237,7 +237,7 @@ public: insert_values.push_back(std::to_string(grid_entry.type)); insert_values.push_back(std::to_string(grid_entry.type2)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -246,7 +246,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_ground_spawns_repository.h b/common/repositories/base/base_ground_spawns_repository.h index 715dfa14b..f14f50d4c 100644 --- a/common/repositories/base/base_ground_spawns_repository.h +++ b/common/repositories/base/base_ground_spawns_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_GROUND_SPAWNS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseGroundSpawnsRepository { @@ -94,12 +94,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -241,21 +241,21 @@ public: update_values.push_back(columns[6] + " = " + std::to_string(ground_spawns_entry.min_x)); update_values.push_back(columns[7] + " = " + std::to_string(ground_spawns_entry.min_y)); update_values.push_back(columns[8] + " = " + std::to_string(ground_spawns_entry.heading)); - update_values.push_back(columns[9] + " = '" + EscapeString(ground_spawns_entry.name) + "'"); + update_values.push_back(columns[9] + " = '" + Strings::Escape(ground_spawns_entry.name) + "'"); update_values.push_back(columns[10] + " = " + std::to_string(ground_spawns_entry.item)); update_values.push_back(columns[11] + " = " + std::to_string(ground_spawns_entry.max_allowed)); - update_values.push_back(columns[12] + " = '" + EscapeString(ground_spawns_entry.comment) + "'"); + update_values.push_back(columns[12] + " = '" + Strings::Escape(ground_spawns_entry.comment) + "'"); update_values.push_back(columns[13] + " = " + std::to_string(ground_spawns_entry.respawn_timer)); update_values.push_back(columns[14] + " = " + std::to_string(ground_spawns_entry.min_expansion)); update_values.push_back(columns[15] + " = " + std::to_string(ground_spawns_entry.max_expansion)); - update_values.push_back(columns[16] + " = '" + EscapeString(ground_spawns_entry.content_flags) + "'"); - update_values.push_back(columns[17] + " = '" + EscapeString(ground_spawns_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[16] + " = '" + Strings::Escape(ground_spawns_entry.content_flags) + "'"); + update_values.push_back(columns[17] + " = '" + Strings::Escape(ground_spawns_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), ground_spawns_entry.id ) @@ -280,21 +280,21 @@ public: insert_values.push_back(std::to_string(ground_spawns_entry.min_x)); insert_values.push_back(std::to_string(ground_spawns_entry.min_y)); insert_values.push_back(std::to_string(ground_spawns_entry.heading)); - insert_values.push_back("'" + EscapeString(ground_spawns_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(ground_spawns_entry.name) + "'"); insert_values.push_back(std::to_string(ground_spawns_entry.item)); insert_values.push_back(std::to_string(ground_spawns_entry.max_allowed)); - insert_values.push_back("'" + EscapeString(ground_spawns_entry.comment) + "'"); + insert_values.push_back("'" + Strings::Escape(ground_spawns_entry.comment) + "'"); insert_values.push_back(std::to_string(ground_spawns_entry.respawn_timer)); insert_values.push_back(std::to_string(ground_spawns_entry.min_expansion)); insert_values.push_back(std::to_string(ground_spawns_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(ground_spawns_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(ground_spawns_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(ground_spawns_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(ground_spawns_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -327,17 +327,17 @@ public: insert_values.push_back(std::to_string(ground_spawns_entry.min_x)); insert_values.push_back(std::to_string(ground_spawns_entry.min_y)); insert_values.push_back(std::to_string(ground_spawns_entry.heading)); - insert_values.push_back("'" + EscapeString(ground_spawns_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(ground_spawns_entry.name) + "'"); insert_values.push_back(std::to_string(ground_spawns_entry.item)); insert_values.push_back(std::to_string(ground_spawns_entry.max_allowed)); - insert_values.push_back("'" + EscapeString(ground_spawns_entry.comment) + "'"); + insert_values.push_back("'" + Strings::Escape(ground_spawns_entry.comment) + "'"); insert_values.push_back(std::to_string(ground_spawns_entry.respawn_timer)); insert_values.push_back(std::to_string(ground_spawns_entry.min_expansion)); insert_values.push_back(std::to_string(ground_spawns_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(ground_spawns_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(ground_spawns_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(ground_spawns_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(ground_spawns_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -346,7 +346,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_group_id_repository.h b/common/repositories/base/base_group_id_repository.h index ce18b2298..1ef14a1e5 100644 --- a/common/repositories/base/base_group_id_repository.h +++ b/common/repositories/base/base_group_id_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_GROUP_ID_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseGroupIdRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -165,14 +165,14 @@ public: update_values.push_back(columns[0] + " = " + std::to_string(group_id_entry.groupid)); update_values.push_back(columns[1] + " = " + std::to_string(group_id_entry.charid)); - update_values.push_back(columns[2] + " = '" + EscapeString(group_id_entry.name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(group_id_entry.name) + "'"); update_values.push_back(columns[3] + " = " + std::to_string(group_id_entry.ismerc)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), group_id_entry.groupid ) @@ -190,14 +190,14 @@ public: insert_values.push_back(std::to_string(group_id_entry.groupid)); insert_values.push_back(std::to_string(group_id_entry.charid)); - insert_values.push_back("'" + EscapeString(group_id_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(group_id_entry.name) + "'"); insert_values.push_back(std::to_string(group_id_entry.ismerc)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -223,10 +223,10 @@ public: insert_values.push_back(std::to_string(group_id_entry.groupid)); insert_values.push_back(std::to_string(group_id_entry.charid)); - insert_values.push_back("'" + EscapeString(group_id_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(group_id_entry.name) + "'"); insert_values.push_back(std::to_string(group_id_entry.ismerc)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_group_leaders_repository.h b/common/repositories/base/base_group_leaders_repository.h index 15bd6af3b..02b226445 100644 --- a/common/repositories/base/base_group_leaders_repository.h +++ b/common/repositories/base/base_group_leaders_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_GROUP_LEADERS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseGroupLeadersRepository { @@ -67,12 +67,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -189,20 +189,20 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(group_leaders_entry.gid)); - update_values.push_back(columns[1] + " = '" + EscapeString(group_leaders_entry.leadername) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(group_leaders_entry.marknpc) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(group_leaders_entry.leadershipaa) + "'"); - update_values.push_back(columns[4] + " = '" + EscapeString(group_leaders_entry.maintank) + "'"); - update_values.push_back(columns[5] + " = '" + EscapeString(group_leaders_entry.assist) + "'"); - update_values.push_back(columns[6] + " = '" + EscapeString(group_leaders_entry.puller) + "'"); - update_values.push_back(columns[7] + " = '" + EscapeString(group_leaders_entry.mentoree) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(group_leaders_entry.leadername) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(group_leaders_entry.marknpc) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(group_leaders_entry.leadershipaa) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(group_leaders_entry.maintank) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(group_leaders_entry.assist) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(group_leaders_entry.puller) + "'"); + update_values.push_back(columns[7] + " = '" + Strings::Escape(group_leaders_entry.mentoree) + "'"); update_values.push_back(columns[8] + " = " + std::to_string(group_leaders_entry.mentor_percent)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), group_leaders_entry.gid ) @@ -219,20 +219,20 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(group_leaders_entry.gid)); - insert_values.push_back("'" + EscapeString(group_leaders_entry.leadername) + "'"); - insert_values.push_back("'" + EscapeString(group_leaders_entry.marknpc) + "'"); - insert_values.push_back("'" + EscapeString(group_leaders_entry.leadershipaa) + "'"); - insert_values.push_back("'" + EscapeString(group_leaders_entry.maintank) + "'"); - insert_values.push_back("'" + EscapeString(group_leaders_entry.assist) + "'"); - insert_values.push_back("'" + EscapeString(group_leaders_entry.puller) + "'"); - insert_values.push_back("'" + EscapeString(group_leaders_entry.mentoree) + "'"); + insert_values.push_back("'" + Strings::Escape(group_leaders_entry.leadername) + "'"); + insert_values.push_back("'" + Strings::Escape(group_leaders_entry.marknpc) + "'"); + insert_values.push_back("'" + Strings::Escape(group_leaders_entry.leadershipaa) + "'"); + insert_values.push_back("'" + Strings::Escape(group_leaders_entry.maintank) + "'"); + insert_values.push_back("'" + Strings::Escape(group_leaders_entry.assist) + "'"); + insert_values.push_back("'" + Strings::Escape(group_leaders_entry.puller) + "'"); + insert_values.push_back("'" + Strings::Escape(group_leaders_entry.mentoree) + "'"); insert_values.push_back(std::to_string(group_leaders_entry.mentor_percent)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -257,16 +257,16 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(group_leaders_entry.gid)); - insert_values.push_back("'" + EscapeString(group_leaders_entry.leadername) + "'"); - insert_values.push_back("'" + EscapeString(group_leaders_entry.marknpc) + "'"); - insert_values.push_back("'" + EscapeString(group_leaders_entry.leadershipaa) + "'"); - insert_values.push_back("'" + EscapeString(group_leaders_entry.maintank) + "'"); - insert_values.push_back("'" + EscapeString(group_leaders_entry.assist) + "'"); - insert_values.push_back("'" + EscapeString(group_leaders_entry.puller) + "'"); - insert_values.push_back("'" + EscapeString(group_leaders_entry.mentoree) + "'"); + insert_values.push_back("'" + Strings::Escape(group_leaders_entry.leadername) + "'"); + insert_values.push_back("'" + Strings::Escape(group_leaders_entry.marknpc) + "'"); + insert_values.push_back("'" + Strings::Escape(group_leaders_entry.leadershipaa) + "'"); + insert_values.push_back("'" + Strings::Escape(group_leaders_entry.maintank) + "'"); + insert_values.push_back("'" + Strings::Escape(group_leaders_entry.assist) + "'"); + insert_values.push_back("'" + Strings::Escape(group_leaders_entry.puller) + "'"); + insert_values.push_back("'" + Strings::Escape(group_leaders_entry.mentoree) + "'"); insert_values.push_back(std::to_string(group_leaders_entry.mentor_percent)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -275,7 +275,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_guild_members_repository.h b/common/repositories/base/base_guild_members_repository.h index df522d479..83959aca4 100644 --- a/common/repositories/base/base_guild_members_repository.h +++ b/common/repositories/base/base_guild_members_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_GUILD_MEMBERS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseGuildMembersRepository { @@ -67,12 +67,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -195,14 +195,14 @@ public: update_values.push_back(columns[4] + " = " + std::to_string(guild_members_entry.total_tribute)); update_values.push_back(columns[5] + " = " + std::to_string(guild_members_entry.last_tribute)); update_values.push_back(columns[6] + " = " + std::to_string(guild_members_entry.banker)); - update_values.push_back(columns[7] + " = '" + EscapeString(guild_members_entry.public_note) + "'"); + update_values.push_back(columns[7] + " = '" + Strings::Escape(guild_members_entry.public_note) + "'"); update_values.push_back(columns[8] + " = " + std::to_string(guild_members_entry.alt)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), guild_members_entry.char_id ) @@ -225,14 +225,14 @@ public: insert_values.push_back(std::to_string(guild_members_entry.total_tribute)); insert_values.push_back(std::to_string(guild_members_entry.last_tribute)); insert_values.push_back(std::to_string(guild_members_entry.banker)); - insert_values.push_back("'" + EscapeString(guild_members_entry.public_note) + "'"); + insert_values.push_back("'" + Strings::Escape(guild_members_entry.public_note) + "'"); insert_values.push_back(std::to_string(guild_members_entry.alt)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -263,10 +263,10 @@ public: insert_values.push_back(std::to_string(guild_members_entry.total_tribute)); insert_values.push_back(std::to_string(guild_members_entry.last_tribute)); insert_values.push_back(std::to_string(guild_members_entry.banker)); - insert_values.push_back("'" + EscapeString(guild_members_entry.public_note) + "'"); + insert_values.push_back("'" + Strings::Escape(guild_members_entry.public_note) + "'"); insert_values.push_back(std::to_string(guild_members_entry.alt)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -275,7 +275,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_guild_ranks_repository.h b/common/repositories/base/base_guild_ranks_repository.h index c777fd1e7..a15768b20 100644 --- a/common/repositories/base/base_guild_ranks_repository.h +++ b/common/repositories/base/base_guild_ranks_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_GUILD_RANKS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseGuildRanksRepository { @@ -73,12 +73,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -200,7 +200,7 @@ public: update_values.push_back(columns[0] + " = " + std::to_string(guild_ranks_entry.guild_id)); update_values.push_back(columns[1] + " = " + std::to_string(guild_ranks_entry.rank)); - update_values.push_back(columns[2] + " = '" + EscapeString(guild_ranks_entry.title) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(guild_ranks_entry.title) + "'"); update_values.push_back(columns[3] + " = " + std::to_string(guild_ranks_entry.can_hear)); update_values.push_back(columns[4] + " = " + std::to_string(guild_ranks_entry.can_speak)); update_values.push_back(columns[5] + " = " + std::to_string(guild_ranks_entry.can_invite)); @@ -214,7 +214,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), guild_ranks_entry.guild_id ) @@ -232,7 +232,7 @@ public: insert_values.push_back(std::to_string(guild_ranks_entry.guild_id)); insert_values.push_back(std::to_string(guild_ranks_entry.rank)); - insert_values.push_back("'" + EscapeString(guild_ranks_entry.title) + "'"); + insert_values.push_back("'" + Strings::Escape(guild_ranks_entry.title) + "'"); insert_values.push_back(std::to_string(guild_ranks_entry.can_hear)); insert_values.push_back(std::to_string(guild_ranks_entry.can_speak)); insert_values.push_back(std::to_string(guild_ranks_entry.can_invite)); @@ -246,7 +246,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -272,7 +272,7 @@ public: insert_values.push_back(std::to_string(guild_ranks_entry.guild_id)); insert_values.push_back(std::to_string(guild_ranks_entry.rank)); - insert_values.push_back("'" + EscapeString(guild_ranks_entry.title) + "'"); + insert_values.push_back("'" + Strings::Escape(guild_ranks_entry.title) + "'"); insert_values.push_back(std::to_string(guild_ranks_entry.can_hear)); insert_values.push_back(std::to_string(guild_ranks_entry.can_speak)); insert_values.push_back(std::to_string(guild_ranks_entry.can_invite)); @@ -282,7 +282,7 @@ public: insert_values.push_back(std::to_string(guild_ranks_entry.can_motd)); insert_values.push_back(std::to_string(guild_ranks_entry.can_warpeace)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -291,7 +291,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_guild_relations_repository.h b/common/repositories/base/base_guild_relations_repository.h index 869acc23e..0901102a6 100644 --- a/common/repositories/base/base_guild_relations_repository.h +++ b/common/repositories/base/base_guild_relations_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_GUILD_RELATIONS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseGuildRelationsRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,7 +166,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), guild_relations_entry.guild1 ) @@ -190,7 +190,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -218,7 +218,7 @@ public: insert_values.push_back(std::to_string(guild_relations_entry.guild2)); insert_values.push_back(std::to_string(guild_relations_entry.relation)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_guilds_repository.h b/common/repositories/base/base_guilds_repository.h index e4f1a6700..1a926a194 100644 --- a/common/repositories/base/base_guilds_repository.h +++ b/common/repositories/base/base_guilds_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_GUILDS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseGuildsRepository { @@ -67,12 +67,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -188,20 +188,20 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(guilds_entry.name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(guilds_entry.name) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(guilds_entry.leader)); update_values.push_back(columns[3] + " = " + std::to_string(guilds_entry.minstatus)); - update_values.push_back(columns[4] + " = '" + EscapeString(guilds_entry.motd) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(guilds_entry.motd) + "'"); update_values.push_back(columns[5] + " = " + std::to_string(guilds_entry.tribute)); - update_values.push_back(columns[6] + " = '" + EscapeString(guilds_entry.motd_setter) + "'"); - update_values.push_back(columns[7] + " = '" + EscapeString(guilds_entry.channel) + "'"); - update_values.push_back(columns[8] + " = '" + EscapeString(guilds_entry.url) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(guilds_entry.motd_setter) + "'"); + update_values.push_back(columns[7] + " = '" + Strings::Escape(guilds_entry.channel) + "'"); + update_values.push_back(columns[8] + " = '" + Strings::Escape(guilds_entry.url) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), guilds_entry.id ) @@ -218,20 +218,20 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(guilds_entry.id)); - insert_values.push_back("'" + EscapeString(guilds_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(guilds_entry.name) + "'"); insert_values.push_back(std::to_string(guilds_entry.leader)); insert_values.push_back(std::to_string(guilds_entry.minstatus)); - insert_values.push_back("'" + EscapeString(guilds_entry.motd) + "'"); + insert_values.push_back("'" + Strings::Escape(guilds_entry.motd) + "'"); insert_values.push_back(std::to_string(guilds_entry.tribute)); - insert_values.push_back("'" + EscapeString(guilds_entry.motd_setter) + "'"); - insert_values.push_back("'" + EscapeString(guilds_entry.channel) + "'"); - insert_values.push_back("'" + EscapeString(guilds_entry.url) + "'"); + insert_values.push_back("'" + Strings::Escape(guilds_entry.motd_setter) + "'"); + insert_values.push_back("'" + Strings::Escape(guilds_entry.channel) + "'"); + insert_values.push_back("'" + Strings::Escape(guilds_entry.url) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -256,16 +256,16 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(guilds_entry.id)); - insert_values.push_back("'" + EscapeString(guilds_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(guilds_entry.name) + "'"); insert_values.push_back(std::to_string(guilds_entry.leader)); insert_values.push_back(std::to_string(guilds_entry.minstatus)); - insert_values.push_back("'" + EscapeString(guilds_entry.motd) + "'"); + insert_values.push_back("'" + Strings::Escape(guilds_entry.motd) + "'"); insert_values.push_back(std::to_string(guilds_entry.tribute)); - insert_values.push_back("'" + EscapeString(guilds_entry.motd_setter) + "'"); - insert_values.push_back("'" + EscapeString(guilds_entry.channel) + "'"); - insert_values.push_back("'" + EscapeString(guilds_entry.url) + "'"); + insert_values.push_back("'" + Strings::Escape(guilds_entry.motd_setter) + "'"); + insert_values.push_back("'" + Strings::Escape(guilds_entry.channel) + "'"); + insert_values.push_back("'" + Strings::Escape(guilds_entry.url) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -274,7 +274,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_hackers_repository.h b/common/repositories/base/base_hackers_repository.h index d8f01dced..0c5e31423 100644 --- a/common/repositories/base/base_hackers_repository.h +++ b/common/repositories/base/base_hackers_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_HACKERS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseHackersRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -173,17 +173,17 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(hackers_entry.account) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(hackers_entry.name) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(hackers_entry.hacked) + "'"); - update_values.push_back(columns[4] + " = '" + EscapeString(hackers_entry.zone) + "'"); - update_values.push_back(columns[5] + " = '" + EscapeString(hackers_entry.date) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(hackers_entry.account) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(hackers_entry.name) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(hackers_entry.hacked) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(hackers_entry.zone) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(hackers_entry.date) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), hackers_entry.id ) @@ -200,17 +200,17 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(hackers_entry.id)); - insert_values.push_back("'" + EscapeString(hackers_entry.account) + "'"); - insert_values.push_back("'" + EscapeString(hackers_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(hackers_entry.hacked) + "'"); - insert_values.push_back("'" + EscapeString(hackers_entry.zone) + "'"); - insert_values.push_back("'" + EscapeString(hackers_entry.date) + "'"); + insert_values.push_back("'" + Strings::Escape(hackers_entry.account) + "'"); + insert_values.push_back("'" + Strings::Escape(hackers_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(hackers_entry.hacked) + "'"); + insert_values.push_back("'" + Strings::Escape(hackers_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(hackers_entry.date) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -235,13 +235,13 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(hackers_entry.id)); - insert_values.push_back("'" + EscapeString(hackers_entry.account) + "'"); - insert_values.push_back("'" + EscapeString(hackers_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(hackers_entry.hacked) + "'"); - insert_values.push_back("'" + EscapeString(hackers_entry.zone) + "'"); - insert_values.push_back("'" + EscapeString(hackers_entry.date) + "'"); + insert_values.push_back("'" + Strings::Escape(hackers_entry.account) + "'"); + insert_values.push_back("'" + Strings::Escape(hackers_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(hackers_entry.hacked) + "'"); + insert_values.push_back("'" + Strings::Escape(hackers_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(hackers_entry.date) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -250,7 +250,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_horses_repository.h b/common/repositories/base/base_horses_repository.h index 5fdb0234c..ddfc92537 100644 --- a/common/repositories/base/base_horses_repository.h +++ b/common/repositories/base/base_horses_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_HORSES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseHorsesRepository { @@ -61,12 +61,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -178,18 +178,18 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(horses_entry.filename) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(horses_entry.filename) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(horses_entry.race)); update_values.push_back(columns[3] + " = " + std::to_string(horses_entry.gender)); update_values.push_back(columns[4] + " = " + std::to_string(horses_entry.texture)); update_values.push_back(columns[5] + " = " + std::to_string(horses_entry.mountspeed)); - update_values.push_back(columns[6] + " = '" + EscapeString(horses_entry.notes) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(horses_entry.notes) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), horses_entry.id ) @@ -206,18 +206,18 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(horses_entry.id)); - insert_values.push_back("'" + EscapeString(horses_entry.filename) + "'"); + insert_values.push_back("'" + Strings::Escape(horses_entry.filename) + "'"); insert_values.push_back(std::to_string(horses_entry.race)); insert_values.push_back(std::to_string(horses_entry.gender)); insert_values.push_back(std::to_string(horses_entry.texture)); insert_values.push_back(std::to_string(horses_entry.mountspeed)); - insert_values.push_back("'" + EscapeString(horses_entry.notes) + "'"); + insert_values.push_back("'" + Strings::Escape(horses_entry.notes) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -242,14 +242,14 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(horses_entry.id)); - insert_values.push_back("'" + EscapeString(horses_entry.filename) + "'"); + insert_values.push_back("'" + Strings::Escape(horses_entry.filename) + "'"); insert_values.push_back(std::to_string(horses_entry.race)); insert_values.push_back(std::to_string(horses_entry.gender)); insert_values.push_back(std::to_string(horses_entry.texture)); insert_values.push_back(std::to_string(horses_entry.mountspeed)); - insert_values.push_back("'" + EscapeString(horses_entry.notes) + "'"); + insert_values.push_back("'" + Strings::Escape(horses_entry.notes) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -258,7 +258,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_instance_list_player_repository.h b/common/repositories/base/base_instance_list_player_repository.h index 4ef1123ec..25cdb4dd8 100644 --- a/common/repositories/base/base_instance_list_player_repository.h +++ b/common/repositories/base/base_instance_list_player_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_INSTANCE_LIST_PLAYER_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseInstanceListPlayerRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -160,7 +160,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), instance_list_player_entry.id ) @@ -183,7 +183,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -210,7 +210,7 @@ public: insert_values.push_back(std::to_string(instance_list_player_entry.id)); insert_values.push_back(std::to_string(instance_list_player_entry.charid)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -219,7 +219,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_instance_list_repository.h b/common/repositories/base/base_instance_list_repository.h index 9b23c50e6..5399d822b 100644 --- a/common/repositories/base/base_instance_list_repository.h +++ b/common/repositories/base/base_instance_list_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_INSTANCE_LIST_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseInstanceListRepository { @@ -61,12 +61,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -189,7 +189,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), instance_list_entry.id ) @@ -217,7 +217,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -249,7 +249,7 @@ public: insert_values.push_back(std::to_string(instance_list_entry.duration)); insert_values.push_back(std::to_string(instance_list_entry.never_expires)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -258,7 +258,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_inventory_repository.h b/common/repositories/base/base_inventory_repository.h index 07a4f282e..122c818aa 100644 --- a/common/repositories/base/base_inventory_repository.h +++ b/common/repositories/base/base_inventory_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_INVENTORY_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseInventoryRepository { @@ -88,12 +88,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -235,7 +235,7 @@ public: update_values.push_back(columns[9] + " = " + std::to_string(inventory_entry.augslot5)); update_values.push_back(columns[10] + " = " + std::to_string(inventory_entry.augslot6)); update_values.push_back(columns[11] + " = " + std::to_string(inventory_entry.instnodrop)); - update_values.push_back(columns[12] + " = '" + EscapeString(inventory_entry.custom_data) + "'"); + update_values.push_back(columns[12] + " = '" + Strings::Escape(inventory_entry.custom_data) + "'"); update_values.push_back(columns[13] + " = " + std::to_string(inventory_entry.ornamenticon)); update_values.push_back(columns[14] + " = " + std::to_string(inventory_entry.ornamentidfile)); update_values.push_back(columns[15] + " = " + std::to_string(inventory_entry.ornament_hero_model)); @@ -244,7 +244,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), inventory_entry.charid ) @@ -272,7 +272,7 @@ public: insert_values.push_back(std::to_string(inventory_entry.augslot5)); insert_values.push_back(std::to_string(inventory_entry.augslot6)); insert_values.push_back(std::to_string(inventory_entry.instnodrop)); - insert_values.push_back("'" + EscapeString(inventory_entry.custom_data) + "'"); + insert_values.push_back("'" + Strings::Escape(inventory_entry.custom_data) + "'"); insert_values.push_back(std::to_string(inventory_entry.ornamenticon)); insert_values.push_back(std::to_string(inventory_entry.ornamentidfile)); insert_values.push_back(std::to_string(inventory_entry.ornament_hero_model)); @@ -281,7 +281,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -317,12 +317,12 @@ public: insert_values.push_back(std::to_string(inventory_entry.augslot5)); insert_values.push_back(std::to_string(inventory_entry.augslot6)); insert_values.push_back(std::to_string(inventory_entry.instnodrop)); - insert_values.push_back("'" + EscapeString(inventory_entry.custom_data) + "'"); + insert_values.push_back("'" + Strings::Escape(inventory_entry.custom_data) + "'"); insert_values.push_back(std::to_string(inventory_entry.ornamenticon)); insert_values.push_back(std::to_string(inventory_entry.ornamentidfile)); insert_values.push_back(std::to_string(inventory_entry.ornament_hero_model)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -331,7 +331,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_inventory_snapshots_repository.h b/common/repositories/base/base_inventory_snapshots_repository.h index 58e2685ea..3171fda7d 100644 --- a/common/repositories/base/base_inventory_snapshots_repository.h +++ b/common/repositories/base/base_inventory_snapshots_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_INVENTORY_SNAPSHOTS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseInventorySnapshotsRepository { @@ -91,12 +91,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -241,7 +241,7 @@ public: update_values.push_back(columns[10] + " = " + std::to_string(inventory_snapshots_entry.augslot5)); update_values.push_back(columns[11] + " = " + std::to_string(inventory_snapshots_entry.augslot6)); update_values.push_back(columns[12] + " = " + std::to_string(inventory_snapshots_entry.instnodrop)); - update_values.push_back(columns[13] + " = '" + EscapeString(inventory_snapshots_entry.custom_data) + "'"); + update_values.push_back(columns[13] + " = '" + Strings::Escape(inventory_snapshots_entry.custom_data) + "'"); update_values.push_back(columns[14] + " = " + std::to_string(inventory_snapshots_entry.ornamenticon)); update_values.push_back(columns[15] + " = " + std::to_string(inventory_snapshots_entry.ornamentidfile)); update_values.push_back(columns[16] + " = " + std::to_string(inventory_snapshots_entry.ornament_hero_model)); @@ -250,7 +250,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), inventory_snapshots_entry.time_index ) @@ -279,7 +279,7 @@ public: insert_values.push_back(std::to_string(inventory_snapshots_entry.augslot5)); insert_values.push_back(std::to_string(inventory_snapshots_entry.augslot6)); insert_values.push_back(std::to_string(inventory_snapshots_entry.instnodrop)); - insert_values.push_back("'" + EscapeString(inventory_snapshots_entry.custom_data) + "'"); + insert_values.push_back("'" + Strings::Escape(inventory_snapshots_entry.custom_data) + "'"); insert_values.push_back(std::to_string(inventory_snapshots_entry.ornamenticon)); insert_values.push_back(std::to_string(inventory_snapshots_entry.ornamentidfile)); insert_values.push_back(std::to_string(inventory_snapshots_entry.ornament_hero_model)); @@ -288,7 +288,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -325,12 +325,12 @@ public: insert_values.push_back(std::to_string(inventory_snapshots_entry.augslot5)); insert_values.push_back(std::to_string(inventory_snapshots_entry.augslot6)); insert_values.push_back(std::to_string(inventory_snapshots_entry.instnodrop)); - insert_values.push_back("'" + EscapeString(inventory_snapshots_entry.custom_data) + "'"); + insert_values.push_back("'" + Strings::Escape(inventory_snapshots_entry.custom_data) + "'"); insert_values.push_back(std::to_string(inventory_snapshots_entry.ornamenticon)); insert_values.push_back(std::to_string(inventory_snapshots_entry.ornamentidfile)); insert_values.push_back(std::to_string(inventory_snapshots_entry.ornament_hero_model)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -339,7 +339,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_ip_exemptions_repository.h b/common/repositories/base/base_ip_exemptions_repository.h index 1cc185992..424620b4a 100644 --- a/common/repositories/base/base_ip_exemptions_repository.h +++ b/common/repositories/base/base_ip_exemptions_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_IP_EXEMPTIONS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseIpExemptionsRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -158,14 +158,14 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(ip_exemptions_entry.exemption_ip) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(ip_exemptions_entry.exemption_ip) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(ip_exemptions_entry.exemption_amount)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), ip_exemptions_entry.exemption_id ) @@ -182,14 +182,14 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(ip_exemptions_entry.exemption_id)); - insert_values.push_back("'" + EscapeString(ip_exemptions_entry.exemption_ip) + "'"); + insert_values.push_back("'" + Strings::Escape(ip_exemptions_entry.exemption_ip) + "'"); insert_values.push_back(std::to_string(ip_exemptions_entry.exemption_amount)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -214,10 +214,10 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(ip_exemptions_entry.exemption_id)); - insert_values.push_back("'" + EscapeString(ip_exemptions_entry.exemption_ip) + "'"); + insert_values.push_back("'" + Strings::Escape(ip_exemptions_entry.exemption_ip) + "'"); insert_values.push_back(std::to_string(ip_exemptions_entry.exemption_amount)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -226,7 +226,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_item_tick_repository.h b/common/repositories/base/base_item_tick_repository.h index e70289fc4..e73df8cfb 100644 --- a/common/repositories/base/base_item_tick_repository.h +++ b/common/repositories/base/base_item_tick_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ITEM_TICK_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseItemTickRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -176,14 +176,14 @@ public: update_values.push_back(columns[0] + " = " + std::to_string(item_tick_entry.it_itemid)); update_values.push_back(columns[1] + " = " + std::to_string(item_tick_entry.it_chance)); update_values.push_back(columns[2] + " = " + std::to_string(item_tick_entry.it_level)); - update_values.push_back(columns[4] + " = '" + EscapeString(item_tick_entry.it_qglobal) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(item_tick_entry.it_qglobal) + "'"); update_values.push_back(columns[5] + " = " + std::to_string(item_tick_entry.it_bagslot)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), item_tick_entry.it_id ) @@ -203,14 +203,14 @@ public: insert_values.push_back(std::to_string(item_tick_entry.it_chance)); insert_values.push_back(std::to_string(item_tick_entry.it_level)); insert_values.push_back(std::to_string(item_tick_entry.it_id)); - insert_values.push_back("'" + EscapeString(item_tick_entry.it_qglobal) + "'"); + insert_values.push_back("'" + Strings::Escape(item_tick_entry.it_qglobal) + "'"); insert_values.push_back(std::to_string(item_tick_entry.it_bagslot)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -238,10 +238,10 @@ public: insert_values.push_back(std::to_string(item_tick_entry.it_chance)); insert_values.push_back(std::to_string(item_tick_entry.it_level)); insert_values.push_back(std::to_string(item_tick_entry.it_id)); - insert_values.push_back("'" + EscapeString(item_tick_entry.it_qglobal) + "'"); + insert_values.push_back("'" + Strings::Escape(item_tick_entry.it_qglobal) + "'"); insert_values.push_back(std::to_string(item_tick_entry.it_bagslot)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -250,7 +250,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_items_repository.h b/common/repositories/base/base_items_repository.h index b89de9bae..3c4bac737 100644 --- a/common/repositories/base/base_items_repository.h +++ b/common/repositories/base/base_items_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ITEMS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseItemsRepository { @@ -895,12 +895,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -1570,7 +1570,7 @@ public: update_values.push_back(columns[0] + " = " + std::to_string(items_entry.id)); update_values.push_back(columns[1] + " = " + std::to_string(items_entry.minstatus)); - update_values.push_back(columns[2] + " = '" + EscapeString(items_entry.Name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(items_entry.Name) + "'"); update_values.push_back(columns[3] + " = " + std::to_string(items_entry.aagi)); update_values.push_back(columns[4] + " = " + std::to_string(items_entry.ac)); update_values.push_back(columns[5] + " = " + std::to_string(items_entry.accuracy)); @@ -1610,11 +1610,11 @@ public: update_values.push_back(columns[39] + " = " + std::to_string(items_entry.book)); update_values.push_back(columns[40] + " = " + std::to_string(items_entry.casttime)); update_values.push_back(columns[41] + " = " + std::to_string(items_entry.casttime_)); - update_values.push_back(columns[42] + " = '" + EscapeString(items_entry.charmfile) + "'"); - update_values.push_back(columns[43] + " = '" + EscapeString(items_entry.charmfileid) + "'"); + update_values.push_back(columns[42] + " = '" + Strings::Escape(items_entry.charmfile) + "'"); + update_values.push_back(columns[43] + " = '" + Strings::Escape(items_entry.charmfileid) + "'"); update_values.push_back(columns[44] + " = " + std::to_string(items_entry.classes)); update_values.push_back(columns[45] + " = " + std::to_string(items_entry.color)); - update_values.push_back(columns[46] + " = '" + EscapeString(items_entry.combateffects) + "'"); + update_values.push_back(columns[46] + " = '" + Strings::Escape(items_entry.combateffects) + "'"); update_values.push_back(columns[47] + " = " + std::to_string(items_entry.extradmgskill)); update_values.push_back(columns[48] + " = " + std::to_string(items_entry.extradmgamt)); update_values.push_back(columns[49] + " = " + std::to_string(items_entry.price)); @@ -1639,7 +1639,7 @@ public: update_values.push_back(columns[68] + " = " + std::to_string(items_entry.factionmod2)); update_values.push_back(columns[69] + " = " + std::to_string(items_entry.factionmod3)); update_values.push_back(columns[70] + " = " + std::to_string(items_entry.factionmod4)); - update_values.push_back(columns[71] + " = '" + EscapeString(items_entry.filename) + "'"); + update_values.push_back(columns[71] + " = '" + Strings::Escape(items_entry.filename) + "'"); update_values.push_back(columns[72] + " = " + std::to_string(items_entry.focuseffect)); update_values.push_back(columns[73] + " = " + std::to_string(items_entry.fr)); update_values.push_back(columns[74] + " = " + std::to_string(items_entry.fvnodrop)); @@ -1648,14 +1648,14 @@ public: update_values.push_back(columns[77] + " = " + std::to_string(items_entry.hp)); update_values.push_back(columns[78] + " = " + std::to_string(items_entry.regen)); update_values.push_back(columns[79] + " = " + std::to_string(items_entry.icon)); - update_values.push_back(columns[80] + " = '" + EscapeString(items_entry.idfile) + "'"); + update_values.push_back(columns[80] + " = '" + Strings::Escape(items_entry.idfile) + "'"); update_values.push_back(columns[81] + " = " + std::to_string(items_entry.itemclass)); update_values.push_back(columns[82] + " = " + std::to_string(items_entry.itemtype)); update_values.push_back(columns[83] + " = " + std::to_string(items_entry.ldonprice)); update_values.push_back(columns[84] + " = " + std::to_string(items_entry.ldontheme)); update_values.push_back(columns[85] + " = " + std::to_string(items_entry.ldonsold)); update_values.push_back(columns[86] + " = " + std::to_string(items_entry.light)); - update_values.push_back(columns[87] + " = '" + EscapeString(items_entry.lore) + "'"); + update_values.push_back(columns[87] + " = '" + Strings::Escape(items_entry.lore) + "'"); update_values.push_back(columns[88] + " = " + std::to_string(items_entry.loregroup)); update_values.push_back(columns[89] + " = " + std::to_string(items_entry.magic)); update_values.push_back(columns[90] + " = " + std::to_string(items_entry.mana)); @@ -1703,7 +1703,7 @@ public: update_values.push_back(columns[132] + " = " + std::to_string(items_entry.attuneable)); update_values.push_back(columns[133] + " = " + std::to_string(items_entry.nopet)); update_values.push_back(columns[134] + " = FROM_UNIXTIME(" + (items_entry.updated > 0 ? std::to_string(items_entry.updated) : "null") + ")"); - update_values.push_back(columns[135] + " = '" + EscapeString(items_entry.comment) + "'"); + update_values.push_back(columns[135] + " = '" + Strings::Escape(items_entry.comment) + "'"); update_values.push_back(columns[136] + " = " + std::to_string(items_entry.UNK127)); update_values.push_back(columns[137] + " = " + std::to_string(items_entry.pointtype)); update_values.push_back(columns[138] + " = " + std::to_string(items_entry.potionbelt)); @@ -1711,7 +1711,7 @@ public: update_values.push_back(columns[140] + " = " + std::to_string(items_entry.stacksize)); update_values.push_back(columns[141] + " = " + std::to_string(items_entry.notransfer)); update_values.push_back(columns[142] + " = " + std::to_string(items_entry.stackable)); - update_values.push_back(columns[143] + " = '" + EscapeString(items_entry.UNK134) + "'"); + update_values.push_back(columns[143] + " = '" + Strings::Escape(items_entry.UNK134) + "'"); update_values.push_back(columns[144] + " = " + std::to_string(items_entry.UNK137)); update_values.push_back(columns[145] + " = " + std::to_string(items_entry.proceffect)); update_values.push_back(columns[146] + " = " + std::to_string(items_entry.proctype)); @@ -1734,10 +1734,10 @@ public: update_values.push_back(columns[163] + " = " + std::to_string(items_entry.UNK157)); update_values.push_back(columns[164] + " = FROM_UNIXTIME(" + (items_entry.serialized > 0 ? std::to_string(items_entry.serialized) : "null") + ")"); update_values.push_back(columns[165] + " = FROM_UNIXTIME(" + (items_entry.verified > 0 ? std::to_string(items_entry.verified) : "null") + ")"); - update_values.push_back(columns[166] + " = '" + EscapeString(items_entry.serialization) + "'"); - update_values.push_back(columns[167] + " = '" + EscapeString(items_entry.source) + "'"); + update_values.push_back(columns[166] + " = '" + Strings::Escape(items_entry.serialization) + "'"); + update_values.push_back(columns[167] + " = '" + Strings::Escape(items_entry.source) + "'"); update_values.push_back(columns[168] + " = " + std::to_string(items_entry.UNK033)); - update_values.push_back(columns[169] + " = '" + EscapeString(items_entry.lorefile) + "'"); + update_values.push_back(columns[169] + " = '" + Strings::Escape(items_entry.lorefile) + "'"); update_values.push_back(columns[170] + " = " + std::to_string(items_entry.UNK014)); update_values.push_back(columns[171] + " = " + std::to_string(items_entry.svcorruption)); update_values.push_back(columns[172] + " = " + std::to_string(items_entry.skillmodmax)); @@ -1751,36 +1751,36 @@ public: update_values.push_back(columns[180] + " = " + std::to_string(items_entry.UNK120)); update_values.push_back(columns[181] + " = " + std::to_string(items_entry.UNK121)); update_values.push_back(columns[182] + " = " + std::to_string(items_entry.questitemflag)); - update_values.push_back(columns[183] + " = '" + EscapeString(items_entry.UNK132) + "'"); + update_values.push_back(columns[183] + " = '" + Strings::Escape(items_entry.UNK132) + "'"); update_values.push_back(columns[184] + " = " + std::to_string(items_entry.clickunk5)); - update_values.push_back(columns[185] + " = '" + EscapeString(items_entry.clickunk6) + "'"); + update_values.push_back(columns[185] + " = '" + Strings::Escape(items_entry.clickunk6) + "'"); update_values.push_back(columns[186] + " = " + std::to_string(items_entry.clickunk7)); update_values.push_back(columns[187] + " = " + std::to_string(items_entry.procunk1)); update_values.push_back(columns[188] + " = " + std::to_string(items_entry.procunk2)); update_values.push_back(columns[189] + " = " + std::to_string(items_entry.procunk3)); update_values.push_back(columns[190] + " = " + std::to_string(items_entry.procunk4)); - update_values.push_back(columns[191] + " = '" + EscapeString(items_entry.procunk6) + "'"); + update_values.push_back(columns[191] + " = '" + Strings::Escape(items_entry.procunk6) + "'"); update_values.push_back(columns[192] + " = " + std::to_string(items_entry.procunk7)); update_values.push_back(columns[193] + " = " + std::to_string(items_entry.wornunk1)); update_values.push_back(columns[194] + " = " + std::to_string(items_entry.wornunk2)); update_values.push_back(columns[195] + " = " + std::to_string(items_entry.wornunk3)); update_values.push_back(columns[196] + " = " + std::to_string(items_entry.wornunk4)); update_values.push_back(columns[197] + " = " + std::to_string(items_entry.wornunk5)); - update_values.push_back(columns[198] + " = '" + EscapeString(items_entry.wornunk6) + "'"); + update_values.push_back(columns[198] + " = '" + Strings::Escape(items_entry.wornunk6) + "'"); update_values.push_back(columns[199] + " = " + std::to_string(items_entry.wornunk7)); update_values.push_back(columns[200] + " = " + std::to_string(items_entry.focusunk1)); update_values.push_back(columns[201] + " = " + std::to_string(items_entry.focusunk2)); update_values.push_back(columns[202] + " = " + std::to_string(items_entry.focusunk3)); update_values.push_back(columns[203] + " = " + std::to_string(items_entry.focusunk4)); update_values.push_back(columns[204] + " = " + std::to_string(items_entry.focusunk5)); - update_values.push_back(columns[205] + " = '" + EscapeString(items_entry.focusunk6) + "'"); + update_values.push_back(columns[205] + " = '" + Strings::Escape(items_entry.focusunk6) + "'"); update_values.push_back(columns[206] + " = " + std::to_string(items_entry.focusunk7)); update_values.push_back(columns[207] + " = " + std::to_string(items_entry.scrollunk1)); update_values.push_back(columns[208] + " = " + std::to_string(items_entry.scrollunk2)); update_values.push_back(columns[209] + " = " + std::to_string(items_entry.scrollunk3)); update_values.push_back(columns[210] + " = " + std::to_string(items_entry.scrollunk4)); update_values.push_back(columns[211] + " = " + std::to_string(items_entry.scrollunk5)); - update_values.push_back(columns[212] + " = '" + EscapeString(items_entry.scrollunk6) + "'"); + update_values.push_back(columns[212] + " = '" + Strings::Escape(items_entry.scrollunk6) + "'"); update_values.push_back(columns[213] + " = " + std::to_string(items_entry.scrollunk7)); update_values.push_back(columns[214] + " = " + std::to_string(items_entry.UNK193)); update_values.push_back(columns[215] + " = " + std::to_string(items_entry.purity)); @@ -1788,11 +1788,11 @@ public: update_values.push_back(columns[217] + " = " + std::to_string(items_entry.evoid)); update_values.push_back(columns[218] + " = " + std::to_string(items_entry.evolvinglevel)); update_values.push_back(columns[219] + " = " + std::to_string(items_entry.evomax)); - update_values.push_back(columns[220] + " = '" + EscapeString(items_entry.clickname) + "'"); - update_values.push_back(columns[221] + " = '" + EscapeString(items_entry.procname) + "'"); - update_values.push_back(columns[222] + " = '" + EscapeString(items_entry.wornname) + "'"); - update_values.push_back(columns[223] + " = '" + EscapeString(items_entry.focusname) + "'"); - update_values.push_back(columns[224] + " = '" + EscapeString(items_entry.scrollname) + "'"); + update_values.push_back(columns[220] + " = '" + Strings::Escape(items_entry.clickname) + "'"); + update_values.push_back(columns[221] + " = '" + Strings::Escape(items_entry.procname) + "'"); + update_values.push_back(columns[222] + " = '" + Strings::Escape(items_entry.wornname) + "'"); + update_values.push_back(columns[223] + " = '" + Strings::Escape(items_entry.focusname) + "'"); + update_values.push_back(columns[224] + " = '" + Strings::Escape(items_entry.scrollname) + "'"); update_values.push_back(columns[225] + " = " + std::to_string(items_entry.dsmitigation)); update_values.push_back(columns[226] + " = " + std::to_string(items_entry.heroic_str)); update_values.push_back(columns[227] + " = " + std::to_string(items_entry.heroic_int)); @@ -1811,7 +1811,7 @@ public: update_values.push_back(columns[240] + " = " + std::to_string(items_entry.spelldmg)); update_values.push_back(columns[241] + " = " + std::to_string(items_entry.clairvoyance)); update_values.push_back(columns[242] + " = " + std::to_string(items_entry.backstabdmg)); - update_values.push_back(columns[243] + " = '" + EscapeString(items_entry.created) + "'"); + update_values.push_back(columns[243] + " = '" + Strings::Escape(items_entry.created) + "'"); update_values.push_back(columns[244] + " = " + std::to_string(items_entry.elitematerial)); update_values.push_back(columns[245] + " = " + std::to_string(items_entry.ldonsellbackrate)); update_values.push_back(columns[246] + " = " + std::to_string(items_entry.scriptfileid)); @@ -1826,7 +1826,7 @@ public: update_values.push_back(columns[255] + " = " + std::to_string(items_entry.bardunk3)); update_values.push_back(columns[256] + " = " + std::to_string(items_entry.bardunk4)); update_values.push_back(columns[257] + " = " + std::to_string(items_entry.bardunk5)); - update_values.push_back(columns[258] + " = '" + EscapeString(items_entry.bardname) + "'"); + update_values.push_back(columns[258] + " = '" + Strings::Escape(items_entry.bardname) + "'"); update_values.push_back(columns[259] + " = " + std::to_string(items_entry.bardunk7)); update_values.push_back(columns[260] + " = " + std::to_string(items_entry.UNK214)); update_values.push_back(columns[261] + " = " + std::to_string(items_entry.subtype)); @@ -1858,7 +1858,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), items_entry.id ) @@ -1876,7 +1876,7 @@ public: insert_values.push_back(std::to_string(items_entry.id)); insert_values.push_back(std::to_string(items_entry.minstatus)); - insert_values.push_back("'" + EscapeString(items_entry.Name) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.Name) + "'"); insert_values.push_back(std::to_string(items_entry.aagi)); insert_values.push_back(std::to_string(items_entry.ac)); insert_values.push_back(std::to_string(items_entry.accuracy)); @@ -1916,11 +1916,11 @@ public: insert_values.push_back(std::to_string(items_entry.book)); insert_values.push_back(std::to_string(items_entry.casttime)); insert_values.push_back(std::to_string(items_entry.casttime_)); - insert_values.push_back("'" + EscapeString(items_entry.charmfile) + "'"); - insert_values.push_back("'" + EscapeString(items_entry.charmfileid) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.charmfile) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.charmfileid) + "'"); insert_values.push_back(std::to_string(items_entry.classes)); insert_values.push_back(std::to_string(items_entry.color)); - insert_values.push_back("'" + EscapeString(items_entry.combateffects) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.combateffects) + "'"); insert_values.push_back(std::to_string(items_entry.extradmgskill)); insert_values.push_back(std::to_string(items_entry.extradmgamt)); insert_values.push_back(std::to_string(items_entry.price)); @@ -1945,7 +1945,7 @@ public: insert_values.push_back(std::to_string(items_entry.factionmod2)); insert_values.push_back(std::to_string(items_entry.factionmod3)); insert_values.push_back(std::to_string(items_entry.factionmod4)); - insert_values.push_back("'" + EscapeString(items_entry.filename) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.filename) + "'"); insert_values.push_back(std::to_string(items_entry.focuseffect)); insert_values.push_back(std::to_string(items_entry.fr)); insert_values.push_back(std::to_string(items_entry.fvnodrop)); @@ -1954,14 +1954,14 @@ public: insert_values.push_back(std::to_string(items_entry.hp)); insert_values.push_back(std::to_string(items_entry.regen)); insert_values.push_back(std::to_string(items_entry.icon)); - insert_values.push_back("'" + EscapeString(items_entry.idfile) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.idfile) + "'"); insert_values.push_back(std::to_string(items_entry.itemclass)); insert_values.push_back(std::to_string(items_entry.itemtype)); insert_values.push_back(std::to_string(items_entry.ldonprice)); insert_values.push_back(std::to_string(items_entry.ldontheme)); insert_values.push_back(std::to_string(items_entry.ldonsold)); insert_values.push_back(std::to_string(items_entry.light)); - insert_values.push_back("'" + EscapeString(items_entry.lore) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.lore) + "'"); insert_values.push_back(std::to_string(items_entry.loregroup)); insert_values.push_back(std::to_string(items_entry.magic)); insert_values.push_back(std::to_string(items_entry.mana)); @@ -2009,7 +2009,7 @@ public: insert_values.push_back(std::to_string(items_entry.attuneable)); insert_values.push_back(std::to_string(items_entry.nopet)); insert_values.push_back("FROM_UNIXTIME(" + (items_entry.updated > 0 ? std::to_string(items_entry.updated) : "null") + ")"); - insert_values.push_back("'" + EscapeString(items_entry.comment) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.comment) + "'"); insert_values.push_back(std::to_string(items_entry.UNK127)); insert_values.push_back(std::to_string(items_entry.pointtype)); insert_values.push_back(std::to_string(items_entry.potionbelt)); @@ -2017,7 +2017,7 @@ public: insert_values.push_back(std::to_string(items_entry.stacksize)); insert_values.push_back(std::to_string(items_entry.notransfer)); insert_values.push_back(std::to_string(items_entry.stackable)); - insert_values.push_back("'" + EscapeString(items_entry.UNK134) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.UNK134) + "'"); insert_values.push_back(std::to_string(items_entry.UNK137)); insert_values.push_back(std::to_string(items_entry.proceffect)); insert_values.push_back(std::to_string(items_entry.proctype)); @@ -2040,10 +2040,10 @@ public: insert_values.push_back(std::to_string(items_entry.UNK157)); insert_values.push_back("FROM_UNIXTIME(" + (items_entry.serialized > 0 ? std::to_string(items_entry.serialized) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (items_entry.verified > 0 ? std::to_string(items_entry.verified) : "null") + ")"); - insert_values.push_back("'" + EscapeString(items_entry.serialization) + "'"); - insert_values.push_back("'" + EscapeString(items_entry.source) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.serialization) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.source) + "'"); insert_values.push_back(std::to_string(items_entry.UNK033)); - insert_values.push_back("'" + EscapeString(items_entry.lorefile) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.lorefile) + "'"); insert_values.push_back(std::to_string(items_entry.UNK014)); insert_values.push_back(std::to_string(items_entry.svcorruption)); insert_values.push_back(std::to_string(items_entry.skillmodmax)); @@ -2057,36 +2057,36 @@ public: insert_values.push_back(std::to_string(items_entry.UNK120)); insert_values.push_back(std::to_string(items_entry.UNK121)); insert_values.push_back(std::to_string(items_entry.questitemflag)); - insert_values.push_back("'" + EscapeString(items_entry.UNK132) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.UNK132) + "'"); insert_values.push_back(std::to_string(items_entry.clickunk5)); - insert_values.push_back("'" + EscapeString(items_entry.clickunk6) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.clickunk6) + "'"); insert_values.push_back(std::to_string(items_entry.clickunk7)); insert_values.push_back(std::to_string(items_entry.procunk1)); insert_values.push_back(std::to_string(items_entry.procunk2)); insert_values.push_back(std::to_string(items_entry.procunk3)); insert_values.push_back(std::to_string(items_entry.procunk4)); - insert_values.push_back("'" + EscapeString(items_entry.procunk6) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.procunk6) + "'"); insert_values.push_back(std::to_string(items_entry.procunk7)); insert_values.push_back(std::to_string(items_entry.wornunk1)); insert_values.push_back(std::to_string(items_entry.wornunk2)); insert_values.push_back(std::to_string(items_entry.wornunk3)); insert_values.push_back(std::to_string(items_entry.wornunk4)); insert_values.push_back(std::to_string(items_entry.wornunk5)); - insert_values.push_back("'" + EscapeString(items_entry.wornunk6) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.wornunk6) + "'"); insert_values.push_back(std::to_string(items_entry.wornunk7)); insert_values.push_back(std::to_string(items_entry.focusunk1)); insert_values.push_back(std::to_string(items_entry.focusunk2)); insert_values.push_back(std::to_string(items_entry.focusunk3)); insert_values.push_back(std::to_string(items_entry.focusunk4)); insert_values.push_back(std::to_string(items_entry.focusunk5)); - insert_values.push_back("'" + EscapeString(items_entry.focusunk6) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.focusunk6) + "'"); insert_values.push_back(std::to_string(items_entry.focusunk7)); insert_values.push_back(std::to_string(items_entry.scrollunk1)); insert_values.push_back(std::to_string(items_entry.scrollunk2)); insert_values.push_back(std::to_string(items_entry.scrollunk3)); insert_values.push_back(std::to_string(items_entry.scrollunk4)); insert_values.push_back(std::to_string(items_entry.scrollunk5)); - insert_values.push_back("'" + EscapeString(items_entry.scrollunk6) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.scrollunk6) + "'"); insert_values.push_back(std::to_string(items_entry.scrollunk7)); insert_values.push_back(std::to_string(items_entry.UNK193)); insert_values.push_back(std::to_string(items_entry.purity)); @@ -2094,11 +2094,11 @@ public: insert_values.push_back(std::to_string(items_entry.evoid)); insert_values.push_back(std::to_string(items_entry.evolvinglevel)); insert_values.push_back(std::to_string(items_entry.evomax)); - insert_values.push_back("'" + EscapeString(items_entry.clickname) + "'"); - insert_values.push_back("'" + EscapeString(items_entry.procname) + "'"); - insert_values.push_back("'" + EscapeString(items_entry.wornname) + "'"); - insert_values.push_back("'" + EscapeString(items_entry.focusname) + "'"); - insert_values.push_back("'" + EscapeString(items_entry.scrollname) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.clickname) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.procname) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.wornname) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.focusname) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.scrollname) + "'"); insert_values.push_back(std::to_string(items_entry.dsmitigation)); insert_values.push_back(std::to_string(items_entry.heroic_str)); insert_values.push_back(std::to_string(items_entry.heroic_int)); @@ -2117,7 +2117,7 @@ public: insert_values.push_back(std::to_string(items_entry.spelldmg)); insert_values.push_back(std::to_string(items_entry.clairvoyance)); insert_values.push_back(std::to_string(items_entry.backstabdmg)); - insert_values.push_back("'" + EscapeString(items_entry.created) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.created) + "'"); insert_values.push_back(std::to_string(items_entry.elitematerial)); insert_values.push_back(std::to_string(items_entry.ldonsellbackrate)); insert_values.push_back(std::to_string(items_entry.scriptfileid)); @@ -2132,7 +2132,7 @@ public: insert_values.push_back(std::to_string(items_entry.bardunk3)); insert_values.push_back(std::to_string(items_entry.bardunk4)); insert_values.push_back(std::to_string(items_entry.bardunk5)); - insert_values.push_back("'" + EscapeString(items_entry.bardname) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.bardname) + "'"); insert_values.push_back(std::to_string(items_entry.bardunk7)); insert_values.push_back(std::to_string(items_entry.UNK214)); insert_values.push_back(std::to_string(items_entry.subtype)); @@ -2164,7 +2164,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -2190,7 +2190,7 @@ public: insert_values.push_back(std::to_string(items_entry.id)); insert_values.push_back(std::to_string(items_entry.minstatus)); - insert_values.push_back("'" + EscapeString(items_entry.Name) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.Name) + "'"); insert_values.push_back(std::to_string(items_entry.aagi)); insert_values.push_back(std::to_string(items_entry.ac)); insert_values.push_back(std::to_string(items_entry.accuracy)); @@ -2230,11 +2230,11 @@ public: insert_values.push_back(std::to_string(items_entry.book)); insert_values.push_back(std::to_string(items_entry.casttime)); insert_values.push_back(std::to_string(items_entry.casttime_)); - insert_values.push_back("'" + EscapeString(items_entry.charmfile) + "'"); - insert_values.push_back("'" + EscapeString(items_entry.charmfileid) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.charmfile) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.charmfileid) + "'"); insert_values.push_back(std::to_string(items_entry.classes)); insert_values.push_back(std::to_string(items_entry.color)); - insert_values.push_back("'" + EscapeString(items_entry.combateffects) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.combateffects) + "'"); insert_values.push_back(std::to_string(items_entry.extradmgskill)); insert_values.push_back(std::to_string(items_entry.extradmgamt)); insert_values.push_back(std::to_string(items_entry.price)); @@ -2259,7 +2259,7 @@ public: insert_values.push_back(std::to_string(items_entry.factionmod2)); insert_values.push_back(std::to_string(items_entry.factionmod3)); insert_values.push_back(std::to_string(items_entry.factionmod4)); - insert_values.push_back("'" + EscapeString(items_entry.filename) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.filename) + "'"); insert_values.push_back(std::to_string(items_entry.focuseffect)); insert_values.push_back(std::to_string(items_entry.fr)); insert_values.push_back(std::to_string(items_entry.fvnodrop)); @@ -2268,14 +2268,14 @@ public: insert_values.push_back(std::to_string(items_entry.hp)); insert_values.push_back(std::to_string(items_entry.regen)); insert_values.push_back(std::to_string(items_entry.icon)); - insert_values.push_back("'" + EscapeString(items_entry.idfile) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.idfile) + "'"); insert_values.push_back(std::to_string(items_entry.itemclass)); insert_values.push_back(std::to_string(items_entry.itemtype)); insert_values.push_back(std::to_string(items_entry.ldonprice)); insert_values.push_back(std::to_string(items_entry.ldontheme)); insert_values.push_back(std::to_string(items_entry.ldonsold)); insert_values.push_back(std::to_string(items_entry.light)); - insert_values.push_back("'" + EscapeString(items_entry.lore) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.lore) + "'"); insert_values.push_back(std::to_string(items_entry.loregroup)); insert_values.push_back(std::to_string(items_entry.magic)); insert_values.push_back(std::to_string(items_entry.mana)); @@ -2323,7 +2323,7 @@ public: insert_values.push_back(std::to_string(items_entry.attuneable)); insert_values.push_back(std::to_string(items_entry.nopet)); insert_values.push_back("FROM_UNIXTIME(" + (items_entry.updated > 0 ? std::to_string(items_entry.updated) : "null") + ")"); - insert_values.push_back("'" + EscapeString(items_entry.comment) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.comment) + "'"); insert_values.push_back(std::to_string(items_entry.UNK127)); insert_values.push_back(std::to_string(items_entry.pointtype)); insert_values.push_back(std::to_string(items_entry.potionbelt)); @@ -2331,7 +2331,7 @@ public: insert_values.push_back(std::to_string(items_entry.stacksize)); insert_values.push_back(std::to_string(items_entry.notransfer)); insert_values.push_back(std::to_string(items_entry.stackable)); - insert_values.push_back("'" + EscapeString(items_entry.UNK134) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.UNK134) + "'"); insert_values.push_back(std::to_string(items_entry.UNK137)); insert_values.push_back(std::to_string(items_entry.proceffect)); insert_values.push_back(std::to_string(items_entry.proctype)); @@ -2354,10 +2354,10 @@ public: insert_values.push_back(std::to_string(items_entry.UNK157)); insert_values.push_back("FROM_UNIXTIME(" + (items_entry.serialized > 0 ? std::to_string(items_entry.serialized) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (items_entry.verified > 0 ? std::to_string(items_entry.verified) : "null") + ")"); - insert_values.push_back("'" + EscapeString(items_entry.serialization) + "'"); - insert_values.push_back("'" + EscapeString(items_entry.source) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.serialization) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.source) + "'"); insert_values.push_back(std::to_string(items_entry.UNK033)); - insert_values.push_back("'" + EscapeString(items_entry.lorefile) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.lorefile) + "'"); insert_values.push_back(std::to_string(items_entry.UNK014)); insert_values.push_back(std::to_string(items_entry.svcorruption)); insert_values.push_back(std::to_string(items_entry.skillmodmax)); @@ -2371,36 +2371,36 @@ public: insert_values.push_back(std::to_string(items_entry.UNK120)); insert_values.push_back(std::to_string(items_entry.UNK121)); insert_values.push_back(std::to_string(items_entry.questitemflag)); - insert_values.push_back("'" + EscapeString(items_entry.UNK132) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.UNK132) + "'"); insert_values.push_back(std::to_string(items_entry.clickunk5)); - insert_values.push_back("'" + EscapeString(items_entry.clickunk6) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.clickunk6) + "'"); insert_values.push_back(std::to_string(items_entry.clickunk7)); insert_values.push_back(std::to_string(items_entry.procunk1)); insert_values.push_back(std::to_string(items_entry.procunk2)); insert_values.push_back(std::to_string(items_entry.procunk3)); insert_values.push_back(std::to_string(items_entry.procunk4)); - insert_values.push_back("'" + EscapeString(items_entry.procunk6) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.procunk6) + "'"); insert_values.push_back(std::to_string(items_entry.procunk7)); insert_values.push_back(std::to_string(items_entry.wornunk1)); insert_values.push_back(std::to_string(items_entry.wornunk2)); insert_values.push_back(std::to_string(items_entry.wornunk3)); insert_values.push_back(std::to_string(items_entry.wornunk4)); insert_values.push_back(std::to_string(items_entry.wornunk5)); - insert_values.push_back("'" + EscapeString(items_entry.wornunk6) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.wornunk6) + "'"); insert_values.push_back(std::to_string(items_entry.wornunk7)); insert_values.push_back(std::to_string(items_entry.focusunk1)); insert_values.push_back(std::to_string(items_entry.focusunk2)); insert_values.push_back(std::to_string(items_entry.focusunk3)); insert_values.push_back(std::to_string(items_entry.focusunk4)); insert_values.push_back(std::to_string(items_entry.focusunk5)); - insert_values.push_back("'" + EscapeString(items_entry.focusunk6) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.focusunk6) + "'"); insert_values.push_back(std::to_string(items_entry.focusunk7)); insert_values.push_back(std::to_string(items_entry.scrollunk1)); insert_values.push_back(std::to_string(items_entry.scrollunk2)); insert_values.push_back(std::to_string(items_entry.scrollunk3)); insert_values.push_back(std::to_string(items_entry.scrollunk4)); insert_values.push_back(std::to_string(items_entry.scrollunk5)); - insert_values.push_back("'" + EscapeString(items_entry.scrollunk6) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.scrollunk6) + "'"); insert_values.push_back(std::to_string(items_entry.scrollunk7)); insert_values.push_back(std::to_string(items_entry.UNK193)); insert_values.push_back(std::to_string(items_entry.purity)); @@ -2408,11 +2408,11 @@ public: insert_values.push_back(std::to_string(items_entry.evoid)); insert_values.push_back(std::to_string(items_entry.evolvinglevel)); insert_values.push_back(std::to_string(items_entry.evomax)); - insert_values.push_back("'" + EscapeString(items_entry.clickname) + "'"); - insert_values.push_back("'" + EscapeString(items_entry.procname) + "'"); - insert_values.push_back("'" + EscapeString(items_entry.wornname) + "'"); - insert_values.push_back("'" + EscapeString(items_entry.focusname) + "'"); - insert_values.push_back("'" + EscapeString(items_entry.scrollname) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.clickname) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.procname) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.wornname) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.focusname) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.scrollname) + "'"); insert_values.push_back(std::to_string(items_entry.dsmitigation)); insert_values.push_back(std::to_string(items_entry.heroic_str)); insert_values.push_back(std::to_string(items_entry.heroic_int)); @@ -2431,7 +2431,7 @@ public: insert_values.push_back(std::to_string(items_entry.spelldmg)); insert_values.push_back(std::to_string(items_entry.clairvoyance)); insert_values.push_back(std::to_string(items_entry.backstabdmg)); - insert_values.push_back("'" + EscapeString(items_entry.created) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.created) + "'"); insert_values.push_back(std::to_string(items_entry.elitematerial)); insert_values.push_back(std::to_string(items_entry.ldonsellbackrate)); insert_values.push_back(std::to_string(items_entry.scriptfileid)); @@ -2446,7 +2446,7 @@ public: insert_values.push_back(std::to_string(items_entry.bardunk3)); insert_values.push_back(std::to_string(items_entry.bardunk4)); insert_values.push_back(std::to_string(items_entry.bardunk5)); - insert_values.push_back("'" + EscapeString(items_entry.bardname) + "'"); + insert_values.push_back("'" + Strings::Escape(items_entry.bardname) + "'"); insert_values.push_back(std::to_string(items_entry.bardunk7)); insert_values.push_back(std::to_string(items_entry.UNK214)); insert_values.push_back(std::to_string(items_entry.subtype)); @@ -2474,7 +2474,7 @@ public: insert_values.push_back(std::to_string(items_entry.UNK241)); insert_values.push_back(std::to_string(items_entry.epicitem)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -2483,7 +2483,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_launcher_repository.h b/common/repositories/base/base_launcher_repository.h index 047f027ce..11ee44c89 100644 --- a/common/repositories/base/base_launcher_repository.h +++ b/common/repositories/base/base_launcher_repository.h @@ -30,7 +30,7 @@ #define EQEMU_BASE_LAUNCHER_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" class BaseLauncherRepository { public: @@ -54,7 +54,7 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string InsertColumnsRaw() @@ -69,7 +69,7 @@ public: insert_columns.push_back(column); } - return std::string(implode(", ", insert_columns)); + return std::string(Strings::Implode(", ", insert_columns)); } static std::string TableName() @@ -168,14 +168,14 @@ public: auto columns = Columns(); - update_values.push_back(columns[0] + " = '" + EscapeString(launcher_entry.name) + "'"); + update_values.push_back(columns[0] + " = '" + Strings::Escape(launcher_entry.name) + "'"); update_values.push_back(columns[1] + " = " + std::to_string(launcher_entry.dynamics)); auto results = database.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), launcher_entry.name ) @@ -190,14 +190,14 @@ public: { std::vector insert_values; - insert_values.push_back("'" + EscapeString(launcher_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(launcher_entry.name) + "'"); insert_values.push_back(std::to_string(launcher_entry.dynamics)); auto results = database.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -220,10 +220,10 @@ public: for (auto &launcher_entry: launcher_entries) { std::vector insert_values; - insert_values.push_back("'" + EscapeString(launcher_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(launcher_entry.name) + "'"); insert_values.push_back(std::to_string(launcher_entry.dynamics)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -232,7 +232,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_ldon_trap_entries_repository.h b/common/repositories/base/base_ldon_trap_entries_repository.h index ea1dd3c43..95dacb130 100644 --- a/common/repositories/base/base_ldon_trap_entries_repository.h +++ b/common/repositories/base/base_ldon_trap_entries_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_LDON_TRAP_ENTRIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseLdonTrapEntriesRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -160,7 +160,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), ldon_trap_entries_entry.id ) @@ -183,7 +183,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -210,7 +210,7 @@ public: insert_values.push_back(std::to_string(ldon_trap_entries_entry.id)); insert_values.push_back(std::to_string(ldon_trap_entries_entry.trap_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -219,7 +219,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_ldon_trap_templates_repository.h b/common/repositories/base/base_ldon_trap_templates_repository.h index b4905a521..ee7a865ca 100644 --- a/common/repositories/base/base_ldon_trap_templates_repository.h +++ b/common/repositories/base/base_ldon_trap_templates_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_LDON_TRAP_TEMPLATES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseLdonTrapTemplatesRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -178,7 +178,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), ldon_trap_templates_entry.id ) @@ -204,7 +204,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -234,7 +234,7 @@ public: insert_values.push_back(std::to_string(ldon_trap_templates_entry.skill)); insert_values.push_back(std::to_string(ldon_trap_templates_entry.locked)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -243,7 +243,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_level_exp_mods_repository.h b/common/repositories/base/base_level_exp_mods_repository.h index 3d1f57854..c8f636616 100644 --- a/common/repositories/base/base_level_exp_mods_repository.h +++ b/common/repositories/base/base_level_exp_mods_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_LEVEL_EXP_MODS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseLevelExpModsRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,7 +166,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), level_exp_mods_entry.level ) @@ -190,7 +190,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -218,7 +218,7 @@ public: insert_values.push_back(std::to_string(level_exp_mods_entry.exp_mod)); insert_values.push_back(std::to_string(level_exp_mods_entry.aa_exp_mod)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_lfguild_repository.h b/common/repositories/base/base_lfguild_repository.h index 1ca4f0214..75bc6665a 100644 --- a/common/repositories/base/base_lfguild_repository.h +++ b/common/repositories/base/base_lfguild_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_LFGUILD_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseLfguildRepository { @@ -67,12 +67,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -189,8 +189,8 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(lfguild_entry.type)); - update_values.push_back(columns[1] + " = '" + EscapeString(lfguild_entry.name) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(lfguild_entry.comment) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(lfguild_entry.name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(lfguild_entry.comment) + "'"); update_values.push_back(columns[3] + " = " + std::to_string(lfguild_entry.fromlevel)); update_values.push_back(columns[4] + " = " + std::to_string(lfguild_entry.tolevel)); update_values.push_back(columns[5] + " = " + std::to_string(lfguild_entry.classes)); @@ -202,7 +202,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), lfguild_entry.type ) @@ -219,8 +219,8 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(lfguild_entry.type)); - insert_values.push_back("'" + EscapeString(lfguild_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(lfguild_entry.comment) + "'"); + insert_values.push_back("'" + Strings::Escape(lfguild_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(lfguild_entry.comment) + "'"); insert_values.push_back(std::to_string(lfguild_entry.fromlevel)); insert_values.push_back(std::to_string(lfguild_entry.tolevel)); insert_values.push_back(std::to_string(lfguild_entry.classes)); @@ -232,7 +232,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -257,8 +257,8 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(lfguild_entry.type)); - insert_values.push_back("'" + EscapeString(lfguild_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(lfguild_entry.comment) + "'"); + insert_values.push_back("'" + Strings::Escape(lfguild_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(lfguild_entry.comment) + "'"); insert_values.push_back(std::to_string(lfguild_entry.fromlevel)); insert_values.push_back(std::to_string(lfguild_entry.tolevel)); insert_values.push_back(std::to_string(lfguild_entry.classes)); @@ -266,7 +266,7 @@ public: insert_values.push_back(std::to_string(lfguild_entry.timezone)); insert_values.push_back(std::to_string(lfguild_entry.timeposted)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -275,7 +275,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_login_accounts_repository.h b/common/repositories/base/base_login_accounts_repository.h index b8c82d6be..ba7330184 100644 --- a/common/repositories/base/base_login_accounts_repository.h +++ b/common/repositories/base/base_login_accounts_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_LOGIN_ACCOUNTS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseLoginAccountsRepository { @@ -67,12 +67,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -189,11 +189,11 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(login_accounts_entry.id)); - update_values.push_back(columns[1] + " = '" + EscapeString(login_accounts_entry.account_name) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(login_accounts_entry.account_password) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(login_accounts_entry.account_email) + "'"); - update_values.push_back(columns[4] + " = '" + EscapeString(login_accounts_entry.source_loginserver) + "'"); - update_values.push_back(columns[5] + " = '" + EscapeString(login_accounts_entry.last_ip_address) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(login_accounts_entry.account_name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(login_accounts_entry.account_password) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(login_accounts_entry.account_email) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(login_accounts_entry.source_loginserver) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(login_accounts_entry.last_ip_address) + "'"); update_values.push_back(columns[6] + " = FROM_UNIXTIME(" + (login_accounts_entry.last_login_date > 0 ? std::to_string(login_accounts_entry.last_login_date) : "null") + ")"); update_values.push_back(columns[7] + " = FROM_UNIXTIME(" + (login_accounts_entry.created_at > 0 ? std::to_string(login_accounts_entry.created_at) : "null") + ")"); update_values.push_back(columns[8] + " = FROM_UNIXTIME(" + (login_accounts_entry.updated_at > 0 ? std::to_string(login_accounts_entry.updated_at) : "null") + ")"); @@ -202,7 +202,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), login_accounts_entry.id ) @@ -219,11 +219,11 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(login_accounts_entry.id)); - insert_values.push_back("'" + EscapeString(login_accounts_entry.account_name) + "'"); - insert_values.push_back("'" + EscapeString(login_accounts_entry.account_password) + "'"); - insert_values.push_back("'" + EscapeString(login_accounts_entry.account_email) + "'"); - insert_values.push_back("'" + EscapeString(login_accounts_entry.source_loginserver) + "'"); - insert_values.push_back("'" + EscapeString(login_accounts_entry.last_ip_address) + "'"); + insert_values.push_back("'" + Strings::Escape(login_accounts_entry.account_name) + "'"); + insert_values.push_back("'" + Strings::Escape(login_accounts_entry.account_password) + "'"); + insert_values.push_back("'" + Strings::Escape(login_accounts_entry.account_email) + "'"); + insert_values.push_back("'" + Strings::Escape(login_accounts_entry.source_loginserver) + "'"); + insert_values.push_back("'" + Strings::Escape(login_accounts_entry.last_ip_address) + "'"); insert_values.push_back("FROM_UNIXTIME(" + (login_accounts_entry.last_login_date > 0 ? std::to_string(login_accounts_entry.last_login_date) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (login_accounts_entry.created_at > 0 ? std::to_string(login_accounts_entry.created_at) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (login_accounts_entry.updated_at > 0 ? std::to_string(login_accounts_entry.updated_at) : "null") + ")"); @@ -232,7 +232,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -257,16 +257,16 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(login_accounts_entry.id)); - insert_values.push_back("'" + EscapeString(login_accounts_entry.account_name) + "'"); - insert_values.push_back("'" + EscapeString(login_accounts_entry.account_password) + "'"); - insert_values.push_back("'" + EscapeString(login_accounts_entry.account_email) + "'"); - insert_values.push_back("'" + EscapeString(login_accounts_entry.source_loginserver) + "'"); - insert_values.push_back("'" + EscapeString(login_accounts_entry.last_ip_address) + "'"); + insert_values.push_back("'" + Strings::Escape(login_accounts_entry.account_name) + "'"); + insert_values.push_back("'" + Strings::Escape(login_accounts_entry.account_password) + "'"); + insert_values.push_back("'" + Strings::Escape(login_accounts_entry.account_email) + "'"); + insert_values.push_back("'" + Strings::Escape(login_accounts_entry.source_loginserver) + "'"); + insert_values.push_back("'" + Strings::Escape(login_accounts_entry.last_ip_address) + "'"); insert_values.push_back("FROM_UNIXTIME(" + (login_accounts_entry.last_login_date > 0 ? std::to_string(login_accounts_entry.last_login_date) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (login_accounts_entry.created_at > 0 ? std::to_string(login_accounts_entry.created_at) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (login_accounts_entry.updated_at > 0 ? std::to_string(login_accounts_entry.updated_at) : "null") + ")"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -275,7 +275,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_login_api_tokens_repository.h b/common/repositories/base/base_login_api_tokens_repository.h index bfd8f9a74..d212f618e 100644 --- a/common/repositories/base/base_login_api_tokens_repository.h +++ b/common/repositories/base/base_login_api_tokens_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_LOGIN_API_TOKENS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseLoginApiTokensRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -173,7 +173,7 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(login_api_tokens_entry.token) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(login_api_tokens_entry.token) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(login_api_tokens_entry.can_write)); update_values.push_back(columns[3] + " = " + std::to_string(login_api_tokens_entry.can_read)); update_values.push_back(columns[4] + " = FROM_UNIXTIME(" + (login_api_tokens_entry.created_at > 0 ? std::to_string(login_api_tokens_entry.created_at) : "null") + ")"); @@ -183,7 +183,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), login_api_tokens_entry.id ) @@ -200,7 +200,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(login_api_tokens_entry.id)); - insert_values.push_back("'" + EscapeString(login_api_tokens_entry.token) + "'"); + insert_values.push_back("'" + Strings::Escape(login_api_tokens_entry.token) + "'"); insert_values.push_back(std::to_string(login_api_tokens_entry.can_write)); insert_values.push_back(std::to_string(login_api_tokens_entry.can_read)); insert_values.push_back("FROM_UNIXTIME(" + (login_api_tokens_entry.created_at > 0 ? std::to_string(login_api_tokens_entry.created_at) : "null") + ")"); @@ -210,7 +210,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -235,13 +235,13 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(login_api_tokens_entry.id)); - insert_values.push_back("'" + EscapeString(login_api_tokens_entry.token) + "'"); + insert_values.push_back("'" + Strings::Escape(login_api_tokens_entry.token) + "'"); insert_values.push_back(std::to_string(login_api_tokens_entry.can_write)); insert_values.push_back(std::to_string(login_api_tokens_entry.can_read)); insert_values.push_back("FROM_UNIXTIME(" + (login_api_tokens_entry.created_at > 0 ? std::to_string(login_api_tokens_entry.created_at) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (login_api_tokens_entry.updated_at > 0 ? std::to_string(login_api_tokens_entry.updated_at) : "null") + ")"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -250,7 +250,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_login_server_admins_repository.h b/common/repositories/base/base_login_server_admins_repository.h index 901edc2f1..5e8f1e1f3 100644 --- a/common/repositories/base/base_login_server_admins_repository.h +++ b/common/repositories/base/base_login_server_admins_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_LOGIN_SERVER_ADMINS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseLoginServerAdminsRepository { @@ -64,12 +64,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -183,19 +183,19 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(login_server_admins_entry.account_name) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(login_server_admins_entry.account_password) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(login_server_admins_entry.first_name) + "'"); - update_values.push_back(columns[4] + " = '" + EscapeString(login_server_admins_entry.last_name) + "'"); - update_values.push_back(columns[5] + " = '" + EscapeString(login_server_admins_entry.email) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(login_server_admins_entry.account_name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(login_server_admins_entry.account_password) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(login_server_admins_entry.first_name) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(login_server_admins_entry.last_name) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(login_server_admins_entry.email) + "'"); update_values.push_back(columns[6] + " = FROM_UNIXTIME(" + (login_server_admins_entry.registration_date > 0 ? std::to_string(login_server_admins_entry.registration_date) : "null") + ")"); - update_values.push_back(columns[7] + " = '" + EscapeString(login_server_admins_entry.registration_ip_address) + "'"); + update_values.push_back(columns[7] + " = '" + Strings::Escape(login_server_admins_entry.registration_ip_address) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), login_server_admins_entry.id ) @@ -212,19 +212,19 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(login_server_admins_entry.id)); - insert_values.push_back("'" + EscapeString(login_server_admins_entry.account_name) + "'"); - insert_values.push_back("'" + EscapeString(login_server_admins_entry.account_password) + "'"); - insert_values.push_back("'" + EscapeString(login_server_admins_entry.first_name) + "'"); - insert_values.push_back("'" + EscapeString(login_server_admins_entry.last_name) + "'"); - insert_values.push_back("'" + EscapeString(login_server_admins_entry.email) + "'"); + insert_values.push_back("'" + Strings::Escape(login_server_admins_entry.account_name) + "'"); + insert_values.push_back("'" + Strings::Escape(login_server_admins_entry.account_password) + "'"); + insert_values.push_back("'" + Strings::Escape(login_server_admins_entry.first_name) + "'"); + insert_values.push_back("'" + Strings::Escape(login_server_admins_entry.last_name) + "'"); + insert_values.push_back("'" + Strings::Escape(login_server_admins_entry.email) + "'"); insert_values.push_back("FROM_UNIXTIME(" + (login_server_admins_entry.registration_date > 0 ? std::to_string(login_server_admins_entry.registration_date) : "null") + ")"); - insert_values.push_back("'" + EscapeString(login_server_admins_entry.registration_ip_address) + "'"); + insert_values.push_back("'" + Strings::Escape(login_server_admins_entry.registration_ip_address) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -249,15 +249,15 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(login_server_admins_entry.id)); - insert_values.push_back("'" + EscapeString(login_server_admins_entry.account_name) + "'"); - insert_values.push_back("'" + EscapeString(login_server_admins_entry.account_password) + "'"); - insert_values.push_back("'" + EscapeString(login_server_admins_entry.first_name) + "'"); - insert_values.push_back("'" + EscapeString(login_server_admins_entry.last_name) + "'"); - insert_values.push_back("'" + EscapeString(login_server_admins_entry.email) + "'"); + insert_values.push_back("'" + Strings::Escape(login_server_admins_entry.account_name) + "'"); + insert_values.push_back("'" + Strings::Escape(login_server_admins_entry.account_password) + "'"); + insert_values.push_back("'" + Strings::Escape(login_server_admins_entry.first_name) + "'"); + insert_values.push_back("'" + Strings::Escape(login_server_admins_entry.last_name) + "'"); + insert_values.push_back("'" + Strings::Escape(login_server_admins_entry.email) + "'"); insert_values.push_back("FROM_UNIXTIME(" + (login_server_admins_entry.registration_date > 0 ? std::to_string(login_server_admins_entry.registration_date) : "null") + ")"); - insert_values.push_back("'" + EscapeString(login_server_admins_entry.registration_ip_address) + "'"); + insert_values.push_back("'" + Strings::Escape(login_server_admins_entry.registration_ip_address) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -266,7 +266,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_login_server_list_types_repository.h b/common/repositories/base/base_login_server_list_types_repository.h index 0f0483b54..ad14b7dcf 100644 --- a/common/repositories/base/base_login_server_list_types_repository.h +++ b/common/repositories/base/base_login_server_list_types_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_LOGIN_SERVER_LIST_TYPES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseLoginServerListTypesRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -154,13 +154,13 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(login_server_list_types_entry.id)); - update_values.push_back(columns[1] + " = '" + EscapeString(login_server_list_types_entry.description) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(login_server_list_types_entry.description) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), login_server_list_types_entry.id ) @@ -177,13 +177,13 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(login_server_list_types_entry.id)); - insert_values.push_back("'" + EscapeString(login_server_list_types_entry.description) + "'"); + insert_values.push_back("'" + Strings::Escape(login_server_list_types_entry.description) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -208,9 +208,9 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(login_server_list_types_entry.id)); - insert_values.push_back("'" + EscapeString(login_server_list_types_entry.description) + "'"); + insert_values.push_back("'" + Strings::Escape(login_server_list_types_entry.description) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -219,7 +219,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_login_world_servers_repository.h b/common/repositories/base/base_login_world_servers_repository.h index 0c6616681..7b74888d3 100644 --- a/common/repositories/base/base_login_world_servers_repository.h +++ b/common/repositories/base/base_login_world_servers_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_LOGIN_WORLD_SERVERS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseLoginWorldServersRepository { @@ -70,12 +70,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -193,21 +193,21 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(login_world_servers_entry.long_name) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(login_world_servers_entry.short_name) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(login_world_servers_entry.tag_description) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(login_world_servers_entry.long_name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(login_world_servers_entry.short_name) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(login_world_servers_entry.tag_description) + "'"); update_values.push_back(columns[4] + " = " + std::to_string(login_world_servers_entry.login_server_list_type_id)); update_values.push_back(columns[5] + " = FROM_UNIXTIME(" + (login_world_servers_entry.last_login_date > 0 ? std::to_string(login_world_servers_entry.last_login_date) : "null") + ")"); - update_values.push_back(columns[6] + " = '" + EscapeString(login_world_servers_entry.last_ip_address) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(login_world_servers_entry.last_ip_address) + "'"); update_values.push_back(columns[7] + " = " + std::to_string(login_world_servers_entry.login_server_admin_id)); update_values.push_back(columns[8] + " = " + std::to_string(login_world_servers_entry.is_server_trusted)); - update_values.push_back(columns[9] + " = '" + EscapeString(login_world_servers_entry.note) + "'"); + update_values.push_back(columns[9] + " = '" + Strings::Escape(login_world_servers_entry.note) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), login_world_servers_entry.id ) @@ -224,21 +224,21 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(login_world_servers_entry.id)); - insert_values.push_back("'" + EscapeString(login_world_servers_entry.long_name) + "'"); - insert_values.push_back("'" + EscapeString(login_world_servers_entry.short_name) + "'"); - insert_values.push_back("'" + EscapeString(login_world_servers_entry.tag_description) + "'"); + insert_values.push_back("'" + Strings::Escape(login_world_servers_entry.long_name) + "'"); + insert_values.push_back("'" + Strings::Escape(login_world_servers_entry.short_name) + "'"); + insert_values.push_back("'" + Strings::Escape(login_world_servers_entry.tag_description) + "'"); insert_values.push_back(std::to_string(login_world_servers_entry.login_server_list_type_id)); insert_values.push_back("FROM_UNIXTIME(" + (login_world_servers_entry.last_login_date > 0 ? std::to_string(login_world_servers_entry.last_login_date) : "null") + ")"); - insert_values.push_back("'" + EscapeString(login_world_servers_entry.last_ip_address) + "'"); + insert_values.push_back("'" + Strings::Escape(login_world_servers_entry.last_ip_address) + "'"); insert_values.push_back(std::to_string(login_world_servers_entry.login_server_admin_id)); insert_values.push_back(std::to_string(login_world_servers_entry.is_server_trusted)); - insert_values.push_back("'" + EscapeString(login_world_servers_entry.note) + "'"); + insert_values.push_back("'" + Strings::Escape(login_world_servers_entry.note) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -263,17 +263,17 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(login_world_servers_entry.id)); - insert_values.push_back("'" + EscapeString(login_world_servers_entry.long_name) + "'"); - insert_values.push_back("'" + EscapeString(login_world_servers_entry.short_name) + "'"); - insert_values.push_back("'" + EscapeString(login_world_servers_entry.tag_description) + "'"); + insert_values.push_back("'" + Strings::Escape(login_world_servers_entry.long_name) + "'"); + insert_values.push_back("'" + Strings::Escape(login_world_servers_entry.short_name) + "'"); + insert_values.push_back("'" + Strings::Escape(login_world_servers_entry.tag_description) + "'"); insert_values.push_back(std::to_string(login_world_servers_entry.login_server_list_type_id)); insert_values.push_back("FROM_UNIXTIME(" + (login_world_servers_entry.last_login_date > 0 ? std::to_string(login_world_servers_entry.last_login_date) : "null") + ")"); - insert_values.push_back("'" + EscapeString(login_world_servers_entry.last_ip_address) + "'"); + insert_values.push_back("'" + Strings::Escape(login_world_servers_entry.last_ip_address) + "'"); insert_values.push_back(std::to_string(login_world_servers_entry.login_server_admin_id)); insert_values.push_back(std::to_string(login_world_servers_entry.is_server_trusted)); - insert_values.push_back("'" + EscapeString(login_world_servers_entry.note) + "'"); + insert_values.push_back("'" + Strings::Escape(login_world_servers_entry.note) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -282,7 +282,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_logsys_categories_repository.h b/common/repositories/base/base_logsys_categories_repository.h index 03b60c0e8..f953ab490 100644 --- a/common/repositories/base/base_logsys_categories_repository.h +++ b/common/repositories/base/base_logsys_categories_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_LOGSYS_CATEGORIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseLogsysCategoriesRepository { @@ -61,12 +61,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -179,7 +179,7 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(logsys_categories_entry.log_category_id)); - update_values.push_back(columns[1] + " = '" + EscapeString(logsys_categories_entry.log_category_description) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(logsys_categories_entry.log_category_description) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(logsys_categories_entry.log_to_console)); update_values.push_back(columns[3] + " = " + std::to_string(logsys_categories_entry.log_to_file)); update_values.push_back(columns[4] + " = " + std::to_string(logsys_categories_entry.log_to_gmsay)); @@ -190,7 +190,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), logsys_categories_entry.log_category_id ) @@ -207,7 +207,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(logsys_categories_entry.log_category_id)); - insert_values.push_back("'" + EscapeString(logsys_categories_entry.log_category_description) + "'"); + insert_values.push_back("'" + Strings::Escape(logsys_categories_entry.log_category_description) + "'"); insert_values.push_back(std::to_string(logsys_categories_entry.log_to_console)); insert_values.push_back(std::to_string(logsys_categories_entry.log_to_file)); insert_values.push_back(std::to_string(logsys_categories_entry.log_to_gmsay)); @@ -218,7 +218,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -243,14 +243,14 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(logsys_categories_entry.log_category_id)); - insert_values.push_back("'" + EscapeString(logsys_categories_entry.log_category_description) + "'"); + insert_values.push_back("'" + Strings::Escape(logsys_categories_entry.log_category_description) + "'"); insert_values.push_back(std::to_string(logsys_categories_entry.log_to_console)); insert_values.push_back(std::to_string(logsys_categories_entry.log_to_file)); insert_values.push_back(std::to_string(logsys_categories_entry.log_to_gmsay)); insert_values.push_back(std::to_string(logsys_categories_entry.log_to_discord)); insert_values.push_back(std::to_string(logsys_categories_entry.discord_webhook_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -259,7 +259,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_lootdrop_entries_repository.h b/common/repositories/base/base_lootdrop_entries_repository.h index d9bccef06..643cb103f 100644 --- a/common/repositories/base/base_lootdrop_entries_repository.h +++ b/common/repositories/base/base_lootdrop_entries_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_LOOTDROP_ENTRIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseLootdropEntriesRepository { @@ -73,12 +73,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -214,7 +214,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), lootdrop_entries_entry.lootdrop_id ) @@ -246,7 +246,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -282,7 +282,7 @@ public: insert_values.push_back(std::to_string(lootdrop_entries_entry.npc_min_level)); insert_values.push_back(std::to_string(lootdrop_entries_entry.npc_max_level)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -291,7 +291,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_lootdrop_repository.h b/common/repositories/base/base_lootdrop_repository.h index aad7b5eef..fe4053925 100644 --- a/common/repositories/base/base_lootdrop_repository.h +++ b/common/repositories/base/base_lootdrop_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_LOOTDROP_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseLootdropRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -173,17 +173,17 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(lootdrop_entry.name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(lootdrop_entry.name) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(lootdrop_entry.min_expansion)); update_values.push_back(columns[3] + " = " + std::to_string(lootdrop_entry.max_expansion)); - update_values.push_back(columns[4] + " = '" + EscapeString(lootdrop_entry.content_flags) + "'"); - update_values.push_back(columns[5] + " = '" + EscapeString(lootdrop_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(lootdrop_entry.content_flags) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(lootdrop_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), lootdrop_entry.id ) @@ -200,17 +200,17 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(lootdrop_entry.id)); - insert_values.push_back("'" + EscapeString(lootdrop_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(lootdrop_entry.name) + "'"); insert_values.push_back(std::to_string(lootdrop_entry.min_expansion)); insert_values.push_back(std::to_string(lootdrop_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(lootdrop_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(lootdrop_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(lootdrop_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(lootdrop_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -235,13 +235,13 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(lootdrop_entry.id)); - insert_values.push_back("'" + EscapeString(lootdrop_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(lootdrop_entry.name) + "'"); insert_values.push_back(std::to_string(lootdrop_entry.min_expansion)); insert_values.push_back(std::to_string(lootdrop_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(lootdrop_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(lootdrop_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(lootdrop_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(lootdrop_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -250,7 +250,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_loottable_entries_repository.h b/common/repositories/base/base_loottable_entries_repository.h index 371fa6f00..61960d5c4 100644 --- a/common/repositories/base/base_loottable_entries_repository.h +++ b/common/repositories/base/base_loottable_entries_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_LOOTTABLE_ENTRIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseLoottableEntriesRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -184,7 +184,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), loottable_entries_entry.loottable_id ) @@ -211,7 +211,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -242,7 +242,7 @@ public: insert_values.push_back(std::to_string(loottable_entries_entry.mindrop)); insert_values.push_back(std::to_string(loottable_entries_entry.probability)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -251,7 +251,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_loottable_repository.h b/common/repositories/base/base_loottable_repository.h index 420b666b3..803409e4c 100644 --- a/common/repositories/base/base_loottable_repository.h +++ b/common/repositories/base/base_loottable_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_LOOTTABLE_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseLoottableRepository { @@ -70,12 +70,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -193,21 +193,21 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(loottable_entry.name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(loottable_entry.name) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(loottable_entry.mincash)); update_values.push_back(columns[3] + " = " + std::to_string(loottable_entry.maxcash)); update_values.push_back(columns[4] + " = " + std::to_string(loottable_entry.avgcoin)); update_values.push_back(columns[5] + " = " + std::to_string(loottable_entry.done)); update_values.push_back(columns[6] + " = " + std::to_string(loottable_entry.min_expansion)); update_values.push_back(columns[7] + " = " + std::to_string(loottable_entry.max_expansion)); - update_values.push_back(columns[8] + " = '" + EscapeString(loottable_entry.content_flags) + "'"); - update_values.push_back(columns[9] + " = '" + EscapeString(loottable_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[8] + " = '" + Strings::Escape(loottable_entry.content_flags) + "'"); + update_values.push_back(columns[9] + " = '" + Strings::Escape(loottable_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), loottable_entry.id ) @@ -224,21 +224,21 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(loottable_entry.id)); - insert_values.push_back("'" + EscapeString(loottable_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(loottable_entry.name) + "'"); insert_values.push_back(std::to_string(loottable_entry.mincash)); insert_values.push_back(std::to_string(loottable_entry.maxcash)); insert_values.push_back(std::to_string(loottable_entry.avgcoin)); insert_values.push_back(std::to_string(loottable_entry.done)); insert_values.push_back(std::to_string(loottable_entry.min_expansion)); insert_values.push_back(std::to_string(loottable_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(loottable_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(loottable_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(loottable_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(loottable_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -263,17 +263,17 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(loottable_entry.id)); - insert_values.push_back("'" + EscapeString(loottable_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(loottable_entry.name) + "'"); insert_values.push_back(std::to_string(loottable_entry.mincash)); insert_values.push_back(std::to_string(loottable_entry.maxcash)); insert_values.push_back(std::to_string(loottable_entry.avgcoin)); insert_values.push_back(std::to_string(loottable_entry.done)); insert_values.push_back(std::to_string(loottable_entry.min_expansion)); insert_values.push_back(std::to_string(loottable_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(loottable_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(loottable_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(loottable_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(loottable_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -282,7 +282,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_mail_repository.h b/common/repositories/base/base_mail_repository.h index 7b4da2cd7..4e83022b8 100644 --- a/common/repositories/base/base_mail_repository.h +++ b/common/repositories/base/base_mail_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_MAIL_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseMailRepository { @@ -64,12 +64,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -185,17 +185,17 @@ public: update_values.push_back(columns[1] + " = " + std::to_string(mail_entry.charid)); update_values.push_back(columns[2] + " = " + std::to_string(mail_entry.timestamp)); - update_values.push_back(columns[3] + " = '" + EscapeString(mail_entry.from) + "'"); - update_values.push_back(columns[4] + " = '" + EscapeString(mail_entry.subject) + "'"); - update_values.push_back(columns[5] + " = '" + EscapeString(mail_entry.body) + "'"); - update_values.push_back(columns[6] + " = '" + EscapeString(mail_entry.to) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(mail_entry.from) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(mail_entry.subject) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(mail_entry.body) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(mail_entry.to) + "'"); update_values.push_back(columns[7] + " = " + std::to_string(mail_entry.status)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), mail_entry.msgid ) @@ -214,17 +214,17 @@ public: insert_values.push_back(std::to_string(mail_entry.msgid)); insert_values.push_back(std::to_string(mail_entry.charid)); insert_values.push_back(std::to_string(mail_entry.timestamp)); - insert_values.push_back("'" + EscapeString(mail_entry.from) + "'"); - insert_values.push_back("'" + EscapeString(mail_entry.subject) + "'"); - insert_values.push_back("'" + EscapeString(mail_entry.body) + "'"); - insert_values.push_back("'" + EscapeString(mail_entry.to) + "'"); + insert_values.push_back("'" + Strings::Escape(mail_entry.from) + "'"); + insert_values.push_back("'" + Strings::Escape(mail_entry.subject) + "'"); + insert_values.push_back("'" + Strings::Escape(mail_entry.body) + "'"); + insert_values.push_back("'" + Strings::Escape(mail_entry.to) + "'"); insert_values.push_back(std::to_string(mail_entry.status)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -251,13 +251,13 @@ public: insert_values.push_back(std::to_string(mail_entry.msgid)); insert_values.push_back(std::to_string(mail_entry.charid)); insert_values.push_back(std::to_string(mail_entry.timestamp)); - insert_values.push_back("'" + EscapeString(mail_entry.from) + "'"); - insert_values.push_back("'" + EscapeString(mail_entry.subject) + "'"); - insert_values.push_back("'" + EscapeString(mail_entry.body) + "'"); - insert_values.push_back("'" + EscapeString(mail_entry.to) + "'"); + insert_values.push_back("'" + Strings::Escape(mail_entry.from) + "'"); + insert_values.push_back("'" + Strings::Escape(mail_entry.subject) + "'"); + insert_values.push_back("'" + Strings::Escape(mail_entry.body) + "'"); + insert_values.push_back("'" + Strings::Escape(mail_entry.to) + "'"); insert_values.push_back(std::to_string(mail_entry.status)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -266,7 +266,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_merchantlist_repository.h b/common/repositories/base/base_merchantlist_repository.h index a447c3426..8805d57d0 100644 --- a/common/repositories/base/base_merchantlist_repository.h +++ b/common/repositories/base/base_merchantlist_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_MERCHANTLIST_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseMerchantlistRepository { @@ -76,12 +76,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -213,14 +213,14 @@ public: update_values.push_back(columns[7] + " = " + std::to_string(merchantlist_entry.probability)); update_values.push_back(columns[8] + " = " + std::to_string(merchantlist_entry.min_expansion)); update_values.push_back(columns[9] + " = " + std::to_string(merchantlist_entry.max_expansion)); - update_values.push_back(columns[10] + " = '" + EscapeString(merchantlist_entry.content_flags) + "'"); - update_values.push_back(columns[11] + " = '" + EscapeString(merchantlist_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[10] + " = '" + Strings::Escape(merchantlist_entry.content_flags) + "'"); + update_values.push_back(columns[11] + " = '" + Strings::Escape(merchantlist_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), merchantlist_entry.merchantid ) @@ -246,14 +246,14 @@ public: insert_values.push_back(std::to_string(merchantlist_entry.probability)); insert_values.push_back(std::to_string(merchantlist_entry.min_expansion)); insert_values.push_back(std::to_string(merchantlist_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(merchantlist_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(merchantlist_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(merchantlist_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(merchantlist_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -287,10 +287,10 @@ public: insert_values.push_back(std::to_string(merchantlist_entry.probability)); insert_values.push_back(std::to_string(merchantlist_entry.min_expansion)); insert_values.push_back(std::to_string(merchantlist_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(merchantlist_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(merchantlist_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(merchantlist_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(merchantlist_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -299,7 +299,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_merchantlist_temp_repository.h b/common/repositories/base/base_merchantlist_temp_repository.h index c31f886dd..c7c4b3848 100644 --- a/common/repositories/base/base_merchantlist_temp_repository.h +++ b/common/repositories/base/base_merchantlist_temp_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_MERCHANTLIST_TEMP_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseMerchantlistTempRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -172,7 +172,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), merchantlist_temp_entry.npcid ) @@ -197,7 +197,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -226,7 +226,7 @@ public: insert_values.push_back(std::to_string(merchantlist_temp_entry.itemid)); insert_values.push_back(std::to_string(merchantlist_temp_entry.charges)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_name_filter_repository.h b/common/repositories/base/base_name_filter_repository.h index fbf9da8f3..605c8bc75 100644 --- a/common/repositories/base/base_name_filter_repository.h +++ b/common/repositories/base/base_name_filter_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_NAME_FILTER_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseNameFilterRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -153,13 +153,13 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(name_filter_entry.name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(name_filter_entry.name) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), name_filter_entry.id ) @@ -176,13 +176,13 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(name_filter_entry.id)); - insert_values.push_back("'" + EscapeString(name_filter_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(name_filter_entry.name) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -207,9 +207,9 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(name_filter_entry.id)); - insert_values.push_back("'" + EscapeString(name_filter_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(name_filter_entry.name) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -218,7 +218,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_npc_emotes_repository.h b/common/repositories/base/base_npc_emotes_repository.h index 86f3e418c..c3e5170f8 100644 --- a/common/repositories/base/base_npc_emotes_repository.h +++ b/common/repositories/base/base_npc_emotes_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_NPC_EMOTES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseNpcEmotesRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -171,13 +171,13 @@ public: update_values.push_back(columns[1] + " = " + std::to_string(npc_emotes_entry.emoteid)); update_values.push_back(columns[2] + " = " + std::to_string(npc_emotes_entry.event_)); update_values.push_back(columns[3] + " = " + std::to_string(npc_emotes_entry.type)); - update_values.push_back(columns[4] + " = '" + EscapeString(npc_emotes_entry.text) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(npc_emotes_entry.text) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), npc_emotes_entry.id ) @@ -197,13 +197,13 @@ public: insert_values.push_back(std::to_string(npc_emotes_entry.emoteid)); insert_values.push_back(std::to_string(npc_emotes_entry.event_)); insert_values.push_back(std::to_string(npc_emotes_entry.type)); - insert_values.push_back("'" + EscapeString(npc_emotes_entry.text) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_emotes_entry.text) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -231,9 +231,9 @@ public: insert_values.push_back(std::to_string(npc_emotes_entry.emoteid)); insert_values.push_back(std::to_string(npc_emotes_entry.event_)); insert_values.push_back(std::to_string(npc_emotes_entry.type)); - insert_values.push_back("'" + EscapeString(npc_emotes_entry.text) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_emotes_entry.text) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -242,7 +242,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_npc_faction_entries_repository.h b/common/repositories/base/base_npc_faction_entries_repository.h index d7a27f6a7..a3fe60e28 100644 --- a/common/repositories/base/base_npc_faction_entries_repository.h +++ b/common/repositories/base/base_npc_faction_entries_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_NPC_FACTION_ENTRIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseNpcFactionEntriesRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -178,7 +178,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), npc_faction_entries_entry.npc_faction_id ) @@ -204,7 +204,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -234,7 +234,7 @@ public: insert_values.push_back(std::to_string(npc_faction_entries_entry.npc_value)); insert_values.push_back(std::to_string(npc_faction_entries_entry.temp)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -243,7 +243,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_npc_faction_repository.h b/common/repositories/base/base_npc_faction_repository.h index 02c124608..1979598f3 100644 --- a/common/repositories/base/base_npc_faction_repository.h +++ b/common/repositories/base/base_npc_faction_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_NPC_FACTION_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseNpcFactionRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -163,7 +163,7 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(npc_faction_entry.name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(npc_faction_entry.name) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(npc_faction_entry.primaryfaction)); update_values.push_back(columns[3] + " = " + std::to_string(npc_faction_entry.ignore_primary_assist)); @@ -171,7 +171,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), npc_faction_entry.id ) @@ -188,7 +188,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(npc_faction_entry.id)); - insert_values.push_back("'" + EscapeString(npc_faction_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_faction_entry.name) + "'"); insert_values.push_back(std::to_string(npc_faction_entry.primaryfaction)); insert_values.push_back(std::to_string(npc_faction_entry.ignore_primary_assist)); @@ -196,7 +196,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -221,11 +221,11 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(npc_faction_entry.id)); - insert_values.push_back("'" + EscapeString(npc_faction_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_faction_entry.name) + "'"); insert_values.push_back(std::to_string(npc_faction_entry.primaryfaction)); insert_values.push_back(std::to_string(npc_faction_entry.ignore_primary_assist)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -234,7 +234,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_npc_scale_global_base_repository.h b/common/repositories/base/base_npc_scale_global_base_repository.h index 323123ecd..521d9fbff 100644 --- a/common/repositories/base/base_npc_scale_global_base_repository.h +++ b/common/repositories/base/base_npc_scale_global_base_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_NPC_SCALE_GLOBAL_BASE_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseNpcScaleGlobalBaseRepository { @@ -124,12 +124,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -310,13 +310,13 @@ public: update_values.push_back(columns[24] + " = " + std::to_string(npc_scale_global_base_entry.attack_delay)); update_values.push_back(columns[25] + " = " + std::to_string(npc_scale_global_base_entry.spell_scale)); update_values.push_back(columns[26] + " = " + std::to_string(npc_scale_global_base_entry.heal_scale)); - update_values.push_back(columns[27] + " = '" + EscapeString(npc_scale_global_base_entry.special_abilities) + "'"); + update_values.push_back(columns[27] + " = '" + Strings::Escape(npc_scale_global_base_entry.special_abilities) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), npc_scale_global_base_entry.type ) @@ -359,13 +359,13 @@ public: insert_values.push_back(std::to_string(npc_scale_global_base_entry.attack_delay)); insert_values.push_back(std::to_string(npc_scale_global_base_entry.spell_scale)); insert_values.push_back(std::to_string(npc_scale_global_base_entry.heal_scale)); - insert_values.push_back("'" + EscapeString(npc_scale_global_base_entry.special_abilities) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_scale_global_base_entry.special_abilities) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -416,9 +416,9 @@ public: insert_values.push_back(std::to_string(npc_scale_global_base_entry.attack_delay)); insert_values.push_back(std::to_string(npc_scale_global_base_entry.spell_scale)); insert_values.push_back(std::to_string(npc_scale_global_base_entry.heal_scale)); - insert_values.push_back("'" + EscapeString(npc_scale_global_base_entry.special_abilities) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_scale_global_base_entry.special_abilities) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -427,7 +427,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_npc_spells_effects_entries_repository.h b/common/repositories/base/base_npc_spells_effects_entries_repository.h index 508ccc41e..e84555876 100644 --- a/common/repositories/base/base_npc_spells_effects_entries_repository.h +++ b/common/repositories/base/base_npc_spells_effects_entries_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_NPC_SPELLS_EFFECTS_ENTRIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseNpcSpellsEffectsEntriesRepository { @@ -64,12 +64,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -195,7 +195,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), npc_spells_effects_entries_entry.id ) @@ -224,7 +224,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -257,7 +257,7 @@ public: insert_values.push_back(std::to_string(npc_spells_effects_entries_entry.se_limit)); insert_values.push_back(std::to_string(npc_spells_effects_entries_entry.se_max)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -266,7 +266,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_npc_spells_effects_repository.h b/common/repositories/base/base_npc_spells_effects_repository.h index 23e16c2a0..afa048ab0 100644 --- a/common/repositories/base/base_npc_spells_effects_repository.h +++ b/common/repositories/base/base_npc_spells_effects_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_NPC_SPELLS_EFFECTS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseNpcSpellsEffectsRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -158,14 +158,14 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(npc_spells_effects_entry.name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(npc_spells_effects_entry.name) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(npc_spells_effects_entry.parent_list)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), npc_spells_effects_entry.id ) @@ -182,14 +182,14 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(npc_spells_effects_entry.id)); - insert_values.push_back("'" + EscapeString(npc_spells_effects_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_spells_effects_entry.name) + "'"); insert_values.push_back(std::to_string(npc_spells_effects_entry.parent_list)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -214,10 +214,10 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(npc_spells_effects_entry.id)); - insert_values.push_back("'" + EscapeString(npc_spells_effects_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_spells_effects_entry.name) + "'"); insert_values.push_back(std::to_string(npc_spells_effects_entry.parent_list)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -226,7 +226,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_npc_spells_entries_repository.h b/common/repositories/base/base_npc_spells_entries_repository.h index 72b39b108..655d69cb3 100644 --- a/common/repositories/base/base_npc_spells_entries_repository.h +++ b/common/repositories/base/base_npc_spells_entries_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_NPC_SPELLS_ENTRIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseNpcSpellsEntriesRepository { @@ -76,12 +76,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -219,7 +219,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), npc_spells_entries_entry.id ) @@ -252,7 +252,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -289,7 +289,7 @@ public: insert_values.push_back(std::to_string(npc_spells_entries_entry.min_hp)); insert_values.push_back(std::to_string(npc_spells_entries_entry.max_hp)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -298,7 +298,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_npc_spells_repository.h b/common/repositories/base/base_npc_spells_repository.h index 8433a208f..9dda6c144 100644 --- a/common/repositories/base/base_npc_spells_repository.h +++ b/common/repositories/base/base_npc_spells_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_NPC_SPELLS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseNpcSpellsRepository { @@ -103,12 +103,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -248,7 +248,7 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(npc_spells_entry.name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(npc_spells_entry.name) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(npc_spells_entry.parent_list)); update_values.push_back(columns[3] + " = " + std::to_string(npc_spells_entry.attack_proc)); update_values.push_back(columns[4] + " = " + std::to_string(npc_spells_entry.proc_chance)); @@ -273,7 +273,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), npc_spells_entry.id ) @@ -290,7 +290,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(npc_spells_entry.id)); - insert_values.push_back("'" + EscapeString(npc_spells_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_spells_entry.name) + "'"); insert_values.push_back(std::to_string(npc_spells_entry.parent_list)); insert_values.push_back(std::to_string(npc_spells_entry.attack_proc)); insert_values.push_back(std::to_string(npc_spells_entry.proc_chance)); @@ -315,7 +315,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -340,7 +340,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(npc_spells_entry.id)); - insert_values.push_back("'" + EscapeString(npc_spells_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_spells_entry.name) + "'"); insert_values.push_back(std::to_string(npc_spells_entry.parent_list)); insert_values.push_back(std::to_string(npc_spells_entry.attack_proc)); insert_values.push_back(std::to_string(npc_spells_entry.proc_chance)); @@ -361,7 +361,7 @@ public: insert_values.push_back(std::to_string(npc_spells_entry.idle_no_sp_recast_max)); insert_values.push_back(std::to_string(npc_spells_entry.idle_b_chance)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -370,7 +370,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_npc_types_repository.h b/common/repositories/base/base_npc_types_repository.h index 535c4f9cb..49d8cab8d 100644 --- a/common/repositories/base/base_npc_types_repository.h +++ b/common/repositories/base/base_npc_types_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_NPC_TYPES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseNpcTypesRepository { @@ -412,12 +412,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -763,8 +763,8 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(npc_types_entry.name) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(npc_types_entry.lastname) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(npc_types_entry.name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(npc_types_entry.lastname) + "'"); update_values.push_back(columns[3] + " = " + std::to_string(npc_types_entry.level)); update_values.push_back(columns[4] + " = " + std::to_string(npc_types_entry.race)); update_values.push_back(columns[5] + " = " + std::to_string(npc_types_entry.class_)); @@ -790,8 +790,8 @@ public: update_values.push_back(columns[25] + " = " + std::to_string(npc_types_entry.mindmg)); update_values.push_back(columns[26] + " = " + std::to_string(npc_types_entry.maxdmg)); update_values.push_back(columns[27] + " = " + std::to_string(npc_types_entry.attack_count)); - update_values.push_back(columns[28] + " = '" + EscapeString(npc_types_entry.npcspecialattks) + "'"); - update_values.push_back(columns[29] + " = '" + EscapeString(npc_types_entry.special_abilities) + "'"); + update_values.push_back(columns[28] + " = '" + Strings::Escape(npc_types_entry.npcspecialattks) + "'"); + update_values.push_back(columns[29] + " = '" + Strings::Escape(npc_types_entry.special_abilities) + "'"); update_values.push_back(columns[30] + " = " + std::to_string(npc_types_entry.aggroradius)); update_values.push_back(columns[31] + " = " + std::to_string(npc_types_entry.assistradius)); update_values.push_back(columns[32] + " = " + std::to_string(npc_types_entry.face)); @@ -810,7 +810,7 @@ public: update_values.push_back(columns[45] + " = " + std::to_string(npc_types_entry.armortint_blue)); update_values.push_back(columns[46] + " = " + std::to_string(npc_types_entry.d_melee_texture1)); update_values.push_back(columns[47] + " = " + std::to_string(npc_types_entry.d_melee_texture2)); - update_values.push_back(columns[48] + " = '" + EscapeString(npc_types_entry.ammo_idfile) + "'"); + update_values.push_back(columns[48] + " = '" + Strings::Escape(npc_types_entry.ammo_idfile) + "'"); update_values.push_back(columns[49] + " = " + std::to_string(npc_types_entry.prim_melee_type)); update_values.push_back(columns[50] + " = " + std::to_string(npc_types_entry.sec_melee_type)); update_values.push_back(columns[51] + " = " + std::to_string(npc_types_entry.ranged_type)); @@ -891,7 +891,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), npc_types_entry.id ) @@ -908,8 +908,8 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(npc_types_entry.id)); - insert_values.push_back("'" + EscapeString(npc_types_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(npc_types_entry.lastname) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_types_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_types_entry.lastname) + "'"); insert_values.push_back(std::to_string(npc_types_entry.level)); insert_values.push_back(std::to_string(npc_types_entry.race)); insert_values.push_back(std::to_string(npc_types_entry.class_)); @@ -935,8 +935,8 @@ public: insert_values.push_back(std::to_string(npc_types_entry.mindmg)); insert_values.push_back(std::to_string(npc_types_entry.maxdmg)); insert_values.push_back(std::to_string(npc_types_entry.attack_count)); - insert_values.push_back("'" + EscapeString(npc_types_entry.npcspecialattks) + "'"); - insert_values.push_back("'" + EscapeString(npc_types_entry.special_abilities) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_types_entry.npcspecialattks) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_types_entry.special_abilities) + "'"); insert_values.push_back(std::to_string(npc_types_entry.aggroradius)); insert_values.push_back(std::to_string(npc_types_entry.assistradius)); insert_values.push_back(std::to_string(npc_types_entry.face)); @@ -955,7 +955,7 @@ public: insert_values.push_back(std::to_string(npc_types_entry.armortint_blue)); insert_values.push_back(std::to_string(npc_types_entry.d_melee_texture1)); insert_values.push_back(std::to_string(npc_types_entry.d_melee_texture2)); - insert_values.push_back("'" + EscapeString(npc_types_entry.ammo_idfile) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_types_entry.ammo_idfile) + "'"); insert_values.push_back(std::to_string(npc_types_entry.prim_melee_type)); insert_values.push_back(std::to_string(npc_types_entry.sec_melee_type)); insert_values.push_back(std::to_string(npc_types_entry.ranged_type)); @@ -1036,7 +1036,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -1061,8 +1061,8 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(npc_types_entry.id)); - insert_values.push_back("'" + EscapeString(npc_types_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(npc_types_entry.lastname) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_types_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_types_entry.lastname) + "'"); insert_values.push_back(std::to_string(npc_types_entry.level)); insert_values.push_back(std::to_string(npc_types_entry.race)); insert_values.push_back(std::to_string(npc_types_entry.class_)); @@ -1088,8 +1088,8 @@ public: insert_values.push_back(std::to_string(npc_types_entry.mindmg)); insert_values.push_back(std::to_string(npc_types_entry.maxdmg)); insert_values.push_back(std::to_string(npc_types_entry.attack_count)); - insert_values.push_back("'" + EscapeString(npc_types_entry.npcspecialattks) + "'"); - insert_values.push_back("'" + EscapeString(npc_types_entry.special_abilities) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_types_entry.npcspecialattks) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_types_entry.special_abilities) + "'"); insert_values.push_back(std::to_string(npc_types_entry.aggroradius)); insert_values.push_back(std::to_string(npc_types_entry.assistradius)); insert_values.push_back(std::to_string(npc_types_entry.face)); @@ -1108,7 +1108,7 @@ public: insert_values.push_back(std::to_string(npc_types_entry.armortint_blue)); insert_values.push_back(std::to_string(npc_types_entry.d_melee_texture1)); insert_values.push_back(std::to_string(npc_types_entry.d_melee_texture2)); - insert_values.push_back("'" + EscapeString(npc_types_entry.ammo_idfile) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_types_entry.ammo_idfile) + "'"); insert_values.push_back(std::to_string(npc_types_entry.prim_melee_type)); insert_values.push_back(std::to_string(npc_types_entry.sec_melee_type)); insert_values.push_back(std::to_string(npc_types_entry.ranged_type)); @@ -1185,7 +1185,7 @@ public: insert_values.push_back(std::to_string(npc_types_entry.always_aggro)); insert_values.push_back(std::to_string(npc_types_entry.exp_mod)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -1194,7 +1194,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_npc_types_tint_repository.h b/common/repositories/base/base_npc_types_tint_repository.h index 906bb08d0..ac9cc055e 100644 --- a/common/repositories/base/base_npc_types_tint_repository.h +++ b/common/repositories/base/base_npc_types_tint_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_NPC_TYPES_TINT_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseNpcTypesTintRepository { @@ -127,12 +127,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -289,7 +289,7 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(npc_types_tint_entry.id)); - update_values.push_back(columns[1] + " = '" + EscapeString(npc_types_tint_entry.tint_set_name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(npc_types_tint_entry.tint_set_name) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(npc_types_tint_entry.red1h)); update_values.push_back(columns[3] + " = " + std::to_string(npc_types_tint_entry.grn1h)); update_values.push_back(columns[4] + " = " + std::to_string(npc_types_tint_entry.blu1h)); @@ -322,7 +322,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), npc_types_tint_entry.id ) @@ -339,7 +339,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(npc_types_tint_entry.id)); - insert_values.push_back("'" + EscapeString(npc_types_tint_entry.tint_set_name) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_types_tint_entry.tint_set_name) + "'"); insert_values.push_back(std::to_string(npc_types_tint_entry.red1h)); insert_values.push_back(std::to_string(npc_types_tint_entry.grn1h)); insert_values.push_back(std::to_string(npc_types_tint_entry.blu1h)); @@ -372,7 +372,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -397,7 +397,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(npc_types_tint_entry.id)); - insert_values.push_back("'" + EscapeString(npc_types_tint_entry.tint_set_name) + "'"); + insert_values.push_back("'" + Strings::Escape(npc_types_tint_entry.tint_set_name) + "'"); insert_values.push_back(std::to_string(npc_types_tint_entry.red1h)); insert_values.push_back(std::to_string(npc_types_tint_entry.grn1h)); insert_values.push_back(std::to_string(npc_types_tint_entry.blu1h)); @@ -426,7 +426,7 @@ public: insert_values.push_back(std::to_string(npc_types_tint_entry.grn9x)); insert_values.push_back(std::to_string(npc_types_tint_entry.blu9x)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -435,7 +435,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_object_contents_repository.h b/common/repositories/base/base_object_contents_repository.h index d45ff7cd7..2eb7d0f6b 100644 --- a/common/repositories/base/base_object_contents_repository.h +++ b/common/repositories/base/base_object_contents_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_OBJECT_CONTENTS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseObjectContentsRepository { @@ -76,12 +76,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -220,7 +220,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), object_contents_entry.parentid ) @@ -253,7 +253,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -290,7 +290,7 @@ public: insert_values.push_back(std::to_string(object_contents_entry.augslot5)); insert_values.push_back(std::to_string(object_contents_entry.augslot6)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -299,7 +299,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_object_repository.h b/common/repositories/base/base_object_repository.h index 9ab4cf577..fe47f9f51 100644 --- a/common/repositories/base/base_object_repository.h +++ b/common/repositories/base/base_object_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_OBJECT_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseObjectRepository { @@ -130,12 +130,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -301,7 +301,7 @@ public: update_values.push_back(columns[6] + " = " + std::to_string(object_entry.heading)); update_values.push_back(columns[7] + " = " + std::to_string(object_entry.itemid)); update_values.push_back(columns[8] + " = " + std::to_string(object_entry.charges)); - update_values.push_back(columns[9] + " = '" + EscapeString(object_entry.objectname) + "'"); + update_values.push_back(columns[9] + " = '" + Strings::Escape(object_entry.objectname) + "'"); update_values.push_back(columns[10] + " = " + std::to_string(object_entry.type)); update_values.push_back(columns[11] + " = " + std::to_string(object_entry.icon)); update_values.push_back(columns[12] + " = " + std::to_string(object_entry.unknown08)); @@ -317,17 +317,17 @@ public: update_values.push_back(columns[22] + " = " + std::to_string(object_entry.size)); update_values.push_back(columns[23] + " = " + std::to_string(object_entry.tilt_x)); update_values.push_back(columns[24] + " = " + std::to_string(object_entry.tilt_y)); - update_values.push_back(columns[25] + " = '" + EscapeString(object_entry.display_name) + "'"); + update_values.push_back(columns[25] + " = '" + Strings::Escape(object_entry.display_name) + "'"); update_values.push_back(columns[26] + " = " + std::to_string(object_entry.min_expansion)); update_values.push_back(columns[27] + " = " + std::to_string(object_entry.max_expansion)); - update_values.push_back(columns[28] + " = '" + EscapeString(object_entry.content_flags) + "'"); - update_values.push_back(columns[29] + " = '" + EscapeString(object_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[28] + " = '" + Strings::Escape(object_entry.content_flags) + "'"); + update_values.push_back(columns[29] + " = '" + Strings::Escape(object_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), object_entry.id ) @@ -352,7 +352,7 @@ public: insert_values.push_back(std::to_string(object_entry.heading)); insert_values.push_back(std::to_string(object_entry.itemid)); insert_values.push_back(std::to_string(object_entry.charges)); - insert_values.push_back("'" + EscapeString(object_entry.objectname) + "'"); + insert_values.push_back("'" + Strings::Escape(object_entry.objectname) + "'"); insert_values.push_back(std::to_string(object_entry.type)); insert_values.push_back(std::to_string(object_entry.icon)); insert_values.push_back(std::to_string(object_entry.unknown08)); @@ -368,17 +368,17 @@ public: insert_values.push_back(std::to_string(object_entry.size)); insert_values.push_back(std::to_string(object_entry.tilt_x)); insert_values.push_back(std::to_string(object_entry.tilt_y)); - insert_values.push_back("'" + EscapeString(object_entry.display_name) + "'"); + insert_values.push_back("'" + Strings::Escape(object_entry.display_name) + "'"); insert_values.push_back(std::to_string(object_entry.min_expansion)); insert_values.push_back(std::to_string(object_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(object_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(object_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(object_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(object_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -411,7 +411,7 @@ public: insert_values.push_back(std::to_string(object_entry.heading)); insert_values.push_back(std::to_string(object_entry.itemid)); insert_values.push_back(std::to_string(object_entry.charges)); - insert_values.push_back("'" + EscapeString(object_entry.objectname) + "'"); + insert_values.push_back("'" + Strings::Escape(object_entry.objectname) + "'"); insert_values.push_back(std::to_string(object_entry.type)); insert_values.push_back(std::to_string(object_entry.icon)); insert_values.push_back(std::to_string(object_entry.unknown08)); @@ -427,13 +427,13 @@ public: insert_values.push_back(std::to_string(object_entry.size)); insert_values.push_back(std::to_string(object_entry.tilt_x)); insert_values.push_back(std::to_string(object_entry.tilt_y)); - insert_values.push_back("'" + EscapeString(object_entry.display_name) + "'"); + insert_values.push_back("'" + Strings::Escape(object_entry.display_name) + "'"); insert_values.push_back(std::to_string(object_entry.min_expansion)); insert_values.push_back(std::to_string(object_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(object_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(object_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(object_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(object_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -442,7 +442,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_perl_event_export_settings_repository.h b/common/repositories/base/base_perl_event_export_settings_repository.h index 5221b7f77..e0e860992 100644 --- a/common/repositories/base/base_perl_event_export_settings_repository.h +++ b/common/repositories/base/base_perl_event_export_settings_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_PERL_EVENT_EXPORT_SETTINGS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BasePerlEventExportSettingsRepository { @@ -61,12 +61,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -179,7 +179,7 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(perl_event_export_settings_entry.event_id)); - update_values.push_back(columns[1] + " = '" + EscapeString(perl_event_export_settings_entry.event_description) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(perl_event_export_settings_entry.event_description) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(perl_event_export_settings_entry.export_qglobals)); update_values.push_back(columns[3] + " = " + std::to_string(perl_event_export_settings_entry.export_mob)); update_values.push_back(columns[4] + " = " + std::to_string(perl_event_export_settings_entry.export_zone)); @@ -190,7 +190,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), perl_event_export_settings_entry.event_id ) @@ -207,7 +207,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(perl_event_export_settings_entry.event_id)); - insert_values.push_back("'" + EscapeString(perl_event_export_settings_entry.event_description) + "'"); + insert_values.push_back("'" + Strings::Escape(perl_event_export_settings_entry.event_description) + "'"); insert_values.push_back(std::to_string(perl_event_export_settings_entry.export_qglobals)); insert_values.push_back(std::to_string(perl_event_export_settings_entry.export_mob)); insert_values.push_back(std::to_string(perl_event_export_settings_entry.export_zone)); @@ -218,7 +218,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -243,14 +243,14 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(perl_event_export_settings_entry.event_id)); - insert_values.push_back("'" + EscapeString(perl_event_export_settings_entry.event_description) + "'"); + insert_values.push_back("'" + Strings::Escape(perl_event_export_settings_entry.event_description) + "'"); insert_values.push_back(std::to_string(perl_event_export_settings_entry.export_qglobals)); insert_values.push_back(std::to_string(perl_event_export_settings_entry.export_mob)); insert_values.push_back(std::to_string(perl_event_export_settings_entry.export_zone)); insert_values.push_back(std::to_string(perl_event_export_settings_entry.export_item)); insert_values.push_back(std::to_string(perl_event_export_settings_entry.export_event)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -259,7 +259,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_petitions_repository.h b/common/repositories/base/base_petitions_repository.h index 9d62180e6..0c8ca311c 100644 --- a/common/repositories/base/base_petitions_repository.h +++ b/common/repositories/base/base_petitions_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_PETITIONS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BasePetitionsRepository { @@ -88,12 +88,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -224,12 +224,12 @@ public: auto columns = Columns(); update_values.push_back(columns[1] + " = " + std::to_string(petitions_entry.petid)); - update_values.push_back(columns[2] + " = '" + EscapeString(petitions_entry.charname) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(petitions_entry.accountname) + "'"); - update_values.push_back(columns[4] + " = '" + EscapeString(petitions_entry.lastgm) + "'"); - update_values.push_back(columns[5] + " = '" + EscapeString(petitions_entry.petitiontext) + "'"); - update_values.push_back(columns[6] + " = '" + EscapeString(petitions_entry.gmtext) + "'"); - update_values.push_back(columns[7] + " = '" + EscapeString(petitions_entry.zone) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(petitions_entry.charname) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(petitions_entry.accountname) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(petitions_entry.lastgm) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(petitions_entry.petitiontext) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(petitions_entry.gmtext) + "'"); + update_values.push_back(columns[7] + " = '" + Strings::Escape(petitions_entry.zone) + "'"); update_values.push_back(columns[8] + " = " + std::to_string(petitions_entry.urgency)); update_values.push_back(columns[9] + " = " + std::to_string(petitions_entry.charclass)); update_values.push_back(columns[10] + " = " + std::to_string(petitions_entry.charrace)); @@ -243,7 +243,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), petitions_entry.dib ) @@ -261,12 +261,12 @@ public: insert_values.push_back(std::to_string(petitions_entry.dib)); insert_values.push_back(std::to_string(petitions_entry.petid)); - insert_values.push_back("'" + EscapeString(petitions_entry.charname) + "'"); - insert_values.push_back("'" + EscapeString(petitions_entry.accountname) + "'"); - insert_values.push_back("'" + EscapeString(petitions_entry.lastgm) + "'"); - insert_values.push_back("'" + EscapeString(petitions_entry.petitiontext) + "'"); - insert_values.push_back("'" + EscapeString(petitions_entry.gmtext) + "'"); - insert_values.push_back("'" + EscapeString(petitions_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(petitions_entry.charname) + "'"); + insert_values.push_back("'" + Strings::Escape(petitions_entry.accountname) + "'"); + insert_values.push_back("'" + Strings::Escape(petitions_entry.lastgm) + "'"); + insert_values.push_back("'" + Strings::Escape(petitions_entry.petitiontext) + "'"); + insert_values.push_back("'" + Strings::Escape(petitions_entry.gmtext) + "'"); + insert_values.push_back("'" + Strings::Escape(petitions_entry.zone) + "'"); insert_values.push_back(std::to_string(petitions_entry.urgency)); insert_values.push_back(std::to_string(petitions_entry.charclass)); insert_values.push_back(std::to_string(petitions_entry.charrace)); @@ -280,7 +280,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -306,12 +306,12 @@ public: insert_values.push_back(std::to_string(petitions_entry.dib)); insert_values.push_back(std::to_string(petitions_entry.petid)); - insert_values.push_back("'" + EscapeString(petitions_entry.charname) + "'"); - insert_values.push_back("'" + EscapeString(petitions_entry.accountname) + "'"); - insert_values.push_back("'" + EscapeString(petitions_entry.lastgm) + "'"); - insert_values.push_back("'" + EscapeString(petitions_entry.petitiontext) + "'"); - insert_values.push_back("'" + EscapeString(petitions_entry.gmtext) + "'"); - insert_values.push_back("'" + EscapeString(petitions_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(petitions_entry.charname) + "'"); + insert_values.push_back("'" + Strings::Escape(petitions_entry.accountname) + "'"); + insert_values.push_back("'" + Strings::Escape(petitions_entry.lastgm) + "'"); + insert_values.push_back("'" + Strings::Escape(petitions_entry.petitiontext) + "'"); + insert_values.push_back("'" + Strings::Escape(petitions_entry.gmtext) + "'"); + insert_values.push_back("'" + Strings::Escape(petitions_entry.zone) + "'"); insert_values.push_back(std::to_string(petitions_entry.urgency)); insert_values.push_back(std::to_string(petitions_entry.charclass)); insert_values.push_back(std::to_string(petitions_entry.charrace)); @@ -321,7 +321,7 @@ public: insert_values.push_back(std::to_string(petitions_entry.ischeckedout)); insert_values.push_back(std::to_string(petitions_entry.senttime)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -330,7 +330,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_pets_beastlord_data_repository.h b/common/repositories/base/base_pets_beastlord_data_repository.h index 4b529f24c..1e0105fcc 100644 --- a/common/repositories/base/base_pets_beastlord_data_repository.h +++ b/common/repositories/base/base_pets_beastlord_data_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_PETS_BEASTLORD_DATA_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BasePetsBeastlordDataRepository { @@ -61,12 +61,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -190,7 +190,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), pets_beastlord_data_entry.player_race ) @@ -218,7 +218,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -250,7 +250,7 @@ public: insert_values.push_back(std::to_string(pets_beastlord_data_entry.size_modifier)); insert_values.push_back(std::to_string(pets_beastlord_data_entry.face)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -259,7 +259,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_pets_equipmentset_entries_repository.h b/common/repositories/base/base_pets_equipmentset_entries_repository.h index 778b3f457..ddd5c63f6 100644 --- a/common/repositories/base/base_pets_equipmentset_entries_repository.h +++ b/common/repositories/base/base_pets_equipmentset_entries_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_PETS_EQUIPMENTSET_ENTRIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BasePetsEquipmentsetEntriesRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,7 +166,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), pets_equipmentset_entries_entry.set_id ) @@ -190,7 +190,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -218,7 +218,7 @@ public: insert_values.push_back(std::to_string(pets_equipmentset_entries_entry.slot)); insert_values.push_back(std::to_string(pets_equipmentset_entries_entry.item_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_pets_equipmentset_repository.h b/common/repositories/base/base_pets_equipmentset_repository.h index 2c5c85afb..ba8241eb3 100644 --- a/common/repositories/base/base_pets_equipmentset_repository.h +++ b/common/repositories/base/base_pets_equipmentset_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_PETS_EQUIPMENTSET_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BasePetsEquipmentsetRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -159,14 +159,14 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(pets_equipmentset_entry.set_id)); - update_values.push_back(columns[1] + " = '" + EscapeString(pets_equipmentset_entry.setname) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(pets_equipmentset_entry.setname) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(pets_equipmentset_entry.nested_set)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), pets_equipmentset_entry.set_id ) @@ -183,14 +183,14 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(pets_equipmentset_entry.set_id)); - insert_values.push_back("'" + EscapeString(pets_equipmentset_entry.setname) + "'"); + insert_values.push_back("'" + Strings::Escape(pets_equipmentset_entry.setname) + "'"); insert_values.push_back(std::to_string(pets_equipmentset_entry.nested_set)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -215,10 +215,10 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(pets_equipmentset_entry.set_id)); - insert_values.push_back("'" + EscapeString(pets_equipmentset_entry.setname) + "'"); + insert_values.push_back("'" + Strings::Escape(pets_equipmentset_entry.setname) + "'"); insert_values.push_back(std::to_string(pets_equipmentset_entry.nested_set)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_pets_repository.h b/common/repositories/base/base_pets_repository.h index 345b33ffb..faa13ee63 100644 --- a/common/repositories/base/base_pets_repository.h +++ b/common/repositories/base/base_pets_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_PETS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BasePetsRepository { @@ -67,12 +67,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -188,7 +188,7 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(pets_entry.type) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(pets_entry.type) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(pets_entry.petpower)); update_values.push_back(columns[3] + " = " + std::to_string(pets_entry.npcID)); update_values.push_back(columns[4] + " = " + std::to_string(pets_entry.temp)); @@ -201,7 +201,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), pets_entry.id ) @@ -218,7 +218,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(pets_entry.id)); - insert_values.push_back("'" + EscapeString(pets_entry.type) + "'"); + insert_values.push_back("'" + Strings::Escape(pets_entry.type) + "'"); insert_values.push_back(std::to_string(pets_entry.petpower)); insert_values.push_back(std::to_string(pets_entry.npcID)); insert_values.push_back(std::to_string(pets_entry.temp)); @@ -231,7 +231,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -256,7 +256,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(pets_entry.id)); - insert_values.push_back("'" + EscapeString(pets_entry.type) + "'"); + insert_values.push_back("'" + Strings::Escape(pets_entry.type) + "'"); insert_values.push_back(std::to_string(pets_entry.petpower)); insert_values.push_back(std::to_string(pets_entry.npcID)); insert_values.push_back(std::to_string(pets_entry.temp)); @@ -265,7 +265,7 @@ public: insert_values.push_back(std::to_string(pets_entry.monsterflag)); insert_values.push_back(std::to_string(pets_entry.equipmentset)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -274,7 +274,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_player_titlesets_repository.h b/common/repositories/base/base_player_titlesets_repository.h index 1d7c2e031..60e1bb5a5 100644 --- a/common/repositories/base/base_player_titlesets_repository.h +++ b/common/repositories/base/base_player_titlesets_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_PLAYER_TITLESETS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BasePlayerTitlesetsRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -165,7 +165,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), player_titlesets_entry.id ) @@ -189,7 +189,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -217,7 +217,7 @@ public: insert_values.push_back(std::to_string(player_titlesets_entry.char_id)); insert_values.push_back(std::to_string(player_titlesets_entry.title_set)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -226,7 +226,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_proximities_repository.h b/common/repositories/base/base_proximities_repository.h index 8126ac402..fa733e16c 100644 --- a/common/repositories/base/base_proximities_repository.h +++ b/common/repositories/base/base_proximities_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_PROXIMITIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseProximitiesRepository { @@ -64,12 +64,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -196,7 +196,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), proximities_entry.zoneid ) @@ -225,7 +225,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -258,7 +258,7 @@ public: insert_values.push_back(std::to_string(proximities_entry.minz)); insert_values.push_back(std::to_string(proximities_entry.maxz)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -267,7 +267,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_quest_globals_repository.h b/common/repositories/base/base_quest_globals_repository.h index f6b751cfc..13a0b4197 100644 --- a/common/repositories/base/base_quest_globals_repository.h +++ b/common/repositories/base/base_quest_globals_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_QUEST_GLOBALS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseQuestGlobalsRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -176,15 +176,15 @@ public: update_values.push_back(columns[0] + " = " + std::to_string(quest_globals_entry.charid)); update_values.push_back(columns[1] + " = " + std::to_string(quest_globals_entry.npcid)); update_values.push_back(columns[2] + " = " + std::to_string(quest_globals_entry.zoneid)); - update_values.push_back(columns[3] + " = '" + EscapeString(quest_globals_entry.name) + "'"); - update_values.push_back(columns[4] + " = '" + EscapeString(quest_globals_entry.value) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(quest_globals_entry.name) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(quest_globals_entry.value) + "'"); update_values.push_back(columns[5] + " = " + std::to_string(quest_globals_entry.expdate)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), quest_globals_entry.charid ) @@ -203,15 +203,15 @@ public: insert_values.push_back(std::to_string(quest_globals_entry.charid)); insert_values.push_back(std::to_string(quest_globals_entry.npcid)); insert_values.push_back(std::to_string(quest_globals_entry.zoneid)); - insert_values.push_back("'" + EscapeString(quest_globals_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(quest_globals_entry.value) + "'"); + insert_values.push_back("'" + Strings::Escape(quest_globals_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(quest_globals_entry.value) + "'"); insert_values.push_back(std::to_string(quest_globals_entry.expdate)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -238,11 +238,11 @@ public: insert_values.push_back(std::to_string(quest_globals_entry.charid)); insert_values.push_back(std::to_string(quest_globals_entry.npcid)); insert_values.push_back(std::to_string(quest_globals_entry.zoneid)); - insert_values.push_back("'" + EscapeString(quest_globals_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(quest_globals_entry.value) + "'"); + insert_values.push_back("'" + Strings::Escape(quest_globals_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(quest_globals_entry.value) + "'"); insert_values.push_back(std::to_string(quest_globals_entry.expdate)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -251,7 +251,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_raid_details_repository.h b/common/repositories/base/base_raid_details_repository.h index 075928853..c5fdd0ed2 100644 --- a/common/repositories/base/base_raid_details_repository.h +++ b/common/repositories/base/base_raid_details_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_RAID_DETAILS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseRaidDetailsRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,13 +166,13 @@ public: update_values.push_back(columns[0] + " = " + std::to_string(raid_details_entry.raidid)); update_values.push_back(columns[1] + " = " + std::to_string(raid_details_entry.loottype)); update_values.push_back(columns[2] + " = " + std::to_string(raid_details_entry.locked)); - update_values.push_back(columns[3] + " = '" + EscapeString(raid_details_entry.motd) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(raid_details_entry.motd) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), raid_details_entry.raidid ) @@ -191,13 +191,13 @@ public: insert_values.push_back(std::to_string(raid_details_entry.raidid)); insert_values.push_back(std::to_string(raid_details_entry.loottype)); insert_values.push_back(std::to_string(raid_details_entry.locked)); - insert_values.push_back("'" + EscapeString(raid_details_entry.motd) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_details_entry.motd) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -224,9 +224,9 @@ public: insert_values.push_back(std::to_string(raid_details_entry.raidid)); insert_values.push_back(std::to_string(raid_details_entry.loottype)); insert_values.push_back(std::to_string(raid_details_entry.locked)); - insert_values.push_back("'" + EscapeString(raid_details_entry.motd) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_details_entry.motd) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_raid_members_repository.h b/common/repositories/base/base_raid_members_repository.h index ed90853f0..7daa87382 100644 --- a/common/repositories/base/base_raid_members_repository.h +++ b/common/repositories/base/base_raid_members_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_RAID_MEMBERS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseRaidMembersRepository { @@ -67,12 +67,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -193,7 +193,7 @@ public: update_values.push_back(columns[2] + " = " + std::to_string(raid_members_entry.groupid)); update_values.push_back(columns[3] + " = " + std::to_string(raid_members_entry._class)); update_values.push_back(columns[4] + " = " + std::to_string(raid_members_entry.level)); - update_values.push_back(columns[5] + " = '" + EscapeString(raid_members_entry.name) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(raid_members_entry.name) + "'"); update_values.push_back(columns[6] + " = " + std::to_string(raid_members_entry.isgroupleader)); update_values.push_back(columns[7] + " = " + std::to_string(raid_members_entry.israidleader)); update_values.push_back(columns[8] + " = " + std::to_string(raid_members_entry.islooter)); @@ -202,7 +202,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), raid_members_entry.charid ) @@ -223,7 +223,7 @@ public: insert_values.push_back(std::to_string(raid_members_entry.groupid)); insert_values.push_back(std::to_string(raid_members_entry._class)); insert_values.push_back(std::to_string(raid_members_entry.level)); - insert_values.push_back("'" + EscapeString(raid_members_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_members_entry.name) + "'"); insert_values.push_back(std::to_string(raid_members_entry.isgroupleader)); insert_values.push_back(std::to_string(raid_members_entry.israidleader)); insert_values.push_back(std::to_string(raid_members_entry.islooter)); @@ -232,7 +232,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -261,12 +261,12 @@ public: insert_values.push_back(std::to_string(raid_members_entry.groupid)); insert_values.push_back(std::to_string(raid_members_entry._class)); insert_values.push_back(std::to_string(raid_members_entry.level)); - insert_values.push_back("'" + EscapeString(raid_members_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_members_entry.name) + "'"); insert_values.push_back(std::to_string(raid_members_entry.isgroupleader)); insert_values.push_back(std::to_string(raid_members_entry.israidleader)); insert_values.push_back(std::to_string(raid_members_entry.islooter)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -275,7 +275,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_reports_repository.h b/common/repositories/base/base_reports_repository.h index 46316917a..7fba5c6b0 100644 --- a/common/repositories/base/base_reports_repository.h +++ b/common/repositories/base/base_reports_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_REPORTS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseReportsRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -163,15 +163,15 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(reports_entry.name) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(reports_entry.reported) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(reports_entry.reported_text) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(reports_entry.name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(reports_entry.reported) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(reports_entry.reported_text) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), reports_entry.id ) @@ -188,15 +188,15 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(reports_entry.id)); - insert_values.push_back("'" + EscapeString(reports_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(reports_entry.reported) + "'"); - insert_values.push_back("'" + EscapeString(reports_entry.reported_text) + "'"); + insert_values.push_back("'" + Strings::Escape(reports_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(reports_entry.reported) + "'"); + insert_values.push_back("'" + Strings::Escape(reports_entry.reported_text) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -221,11 +221,11 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(reports_entry.id)); - insert_values.push_back("'" + EscapeString(reports_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(reports_entry.reported) + "'"); - insert_values.push_back("'" + EscapeString(reports_entry.reported_text) + "'"); + insert_values.push_back("'" + Strings::Escape(reports_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(reports_entry.reported) + "'"); + insert_values.push_back("'" + Strings::Escape(reports_entry.reported_text) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -234,7 +234,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_respawn_times_repository.h b/common/repositories/base/base_respawn_times_repository.h index 27ed4b281..79505bacc 100644 --- a/common/repositories/base/base_respawn_times_repository.h +++ b/common/repositories/base/base_respawn_times_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_RESPAWN_TIMES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseRespawnTimesRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -172,7 +172,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), respawn_times_entry.id ) @@ -197,7 +197,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -226,7 +226,7 @@ public: insert_values.push_back(std::to_string(respawn_times_entry.duration)); insert_values.push_back(std::to_string(respawn_times_entry.instance_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_rule_sets_repository.h b/common/repositories/base/base_rule_sets_repository.h index 5ca2361a8..7c63e67ad 100644 --- a/common/repositories/base/base_rule_sets_repository.h +++ b/common/repositories/base/base_rule_sets_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_RULE_SETS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseRuleSetsRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -153,13 +153,13 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(rule_sets_entry.name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(rule_sets_entry.name) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), rule_sets_entry.ruleset_id ) @@ -176,13 +176,13 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(rule_sets_entry.ruleset_id)); - insert_values.push_back("'" + EscapeString(rule_sets_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(rule_sets_entry.name) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -207,9 +207,9 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(rule_sets_entry.ruleset_id)); - insert_values.push_back("'" + EscapeString(rule_sets_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(rule_sets_entry.name) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -218,7 +218,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_rule_values_repository.h b/common/repositories/base/base_rule_values_repository.h index 418509d96..6b705049a 100644 --- a/common/repositories/base/base_rule_values_repository.h +++ b/common/repositories/base/base_rule_values_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_RULE_VALUES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseRuleValuesRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -164,15 +164,15 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(rule_values_entry.ruleset_id)); - update_values.push_back(columns[1] + " = '" + EscapeString(rule_values_entry.rule_name) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(rule_values_entry.rule_value) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(rule_values_entry.notes) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(rule_values_entry.rule_name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(rule_values_entry.rule_value) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(rule_values_entry.notes) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), rule_values_entry.ruleset_id ) @@ -189,15 +189,15 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(rule_values_entry.ruleset_id)); - insert_values.push_back("'" + EscapeString(rule_values_entry.rule_name) + "'"); - insert_values.push_back("'" + EscapeString(rule_values_entry.rule_value) + "'"); - insert_values.push_back("'" + EscapeString(rule_values_entry.notes) + "'"); + insert_values.push_back("'" + Strings::Escape(rule_values_entry.rule_name) + "'"); + insert_values.push_back("'" + Strings::Escape(rule_values_entry.rule_value) + "'"); + insert_values.push_back("'" + Strings::Escape(rule_values_entry.notes) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -222,11 +222,11 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(rule_values_entry.ruleset_id)); - insert_values.push_back("'" + EscapeString(rule_values_entry.rule_name) + "'"); - insert_values.push_back("'" + EscapeString(rule_values_entry.rule_value) + "'"); - insert_values.push_back("'" + EscapeString(rule_values_entry.notes) + "'"); + insert_values.push_back("'" + Strings::Escape(rule_values_entry.rule_name) + "'"); + insert_values.push_back("'" + Strings::Escape(rule_values_entry.rule_value) + "'"); + insert_values.push_back("'" + Strings::Escape(rule_values_entry.notes) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_saylink_repository.h b/common/repositories/base/base_saylink_repository.h index fac19e49e..f91214e8b 100644 --- a/common/repositories/base/base_saylink_repository.h +++ b/common/repositories/base/base_saylink_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SAYLINK_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSaylinkRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -153,13 +153,13 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(saylink_entry.phrase) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(saylink_entry.phrase) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), saylink_entry.id ) @@ -176,13 +176,13 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(saylink_entry.id)); - insert_values.push_back("'" + EscapeString(saylink_entry.phrase) + "'"); + insert_values.push_back("'" + Strings::Escape(saylink_entry.phrase) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -207,9 +207,9 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(saylink_entry.id)); - insert_values.push_back("'" + EscapeString(saylink_entry.phrase) + "'"); + insert_values.push_back("'" + Strings::Escape(saylink_entry.phrase) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -218,7 +218,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_server_scheduled_events_repository.h b/common/repositories/base/base_server_scheduled_events_repository.h index c47794b47..a3e676b12 100644 --- a/common/repositories/base/base_server_scheduled_events_repository.h +++ b/common/repositories/base/base_server_scheduled_events_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SERVER_SCHEDULED_EVENTS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseServerScheduledEventsRepository { @@ -91,12 +91,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -228,9 +228,9 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(server_scheduled_events_entry.description) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(server_scheduled_events_entry.event_type) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(server_scheduled_events_entry.event_data) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(server_scheduled_events_entry.description) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(server_scheduled_events_entry.event_type) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(server_scheduled_events_entry.event_data) + "'"); update_values.push_back(columns[4] + " = " + std::to_string(server_scheduled_events_entry.minute_start)); update_values.push_back(columns[5] + " = " + std::to_string(server_scheduled_events_entry.hour_start)); update_values.push_back(columns[6] + " = " + std::to_string(server_scheduled_events_entry.day_start)); @@ -241,7 +241,7 @@ public: update_values.push_back(columns[11] + " = " + std::to_string(server_scheduled_events_entry.day_end)); update_values.push_back(columns[12] + " = " + std::to_string(server_scheduled_events_entry.month_end)); update_values.push_back(columns[13] + " = " + std::to_string(server_scheduled_events_entry.year_end)); - update_values.push_back(columns[14] + " = '" + EscapeString(server_scheduled_events_entry.cron_expression) + "'"); + update_values.push_back(columns[14] + " = '" + Strings::Escape(server_scheduled_events_entry.cron_expression) + "'"); update_values.push_back(columns[15] + " = FROM_UNIXTIME(" + (server_scheduled_events_entry.created_at > 0 ? std::to_string(server_scheduled_events_entry.created_at) : "null") + ")"); update_values.push_back(columns[16] + " = FROM_UNIXTIME(" + (server_scheduled_events_entry.deleted_at > 0 ? std::to_string(server_scheduled_events_entry.deleted_at) : "null") + ")"); @@ -249,7 +249,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), server_scheduled_events_entry.id ) @@ -266,9 +266,9 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(server_scheduled_events_entry.id)); - insert_values.push_back("'" + EscapeString(server_scheduled_events_entry.description) + "'"); - insert_values.push_back("'" + EscapeString(server_scheduled_events_entry.event_type) + "'"); - insert_values.push_back("'" + EscapeString(server_scheduled_events_entry.event_data) + "'"); + insert_values.push_back("'" + Strings::Escape(server_scheduled_events_entry.description) + "'"); + insert_values.push_back("'" + Strings::Escape(server_scheduled_events_entry.event_type) + "'"); + insert_values.push_back("'" + Strings::Escape(server_scheduled_events_entry.event_data) + "'"); insert_values.push_back(std::to_string(server_scheduled_events_entry.minute_start)); insert_values.push_back(std::to_string(server_scheduled_events_entry.hour_start)); insert_values.push_back(std::to_string(server_scheduled_events_entry.day_start)); @@ -279,7 +279,7 @@ public: insert_values.push_back(std::to_string(server_scheduled_events_entry.day_end)); insert_values.push_back(std::to_string(server_scheduled_events_entry.month_end)); insert_values.push_back(std::to_string(server_scheduled_events_entry.year_end)); - insert_values.push_back("'" + EscapeString(server_scheduled_events_entry.cron_expression) + "'"); + insert_values.push_back("'" + Strings::Escape(server_scheduled_events_entry.cron_expression) + "'"); insert_values.push_back("FROM_UNIXTIME(" + (server_scheduled_events_entry.created_at > 0 ? std::to_string(server_scheduled_events_entry.created_at) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (server_scheduled_events_entry.deleted_at > 0 ? std::to_string(server_scheduled_events_entry.deleted_at) : "null") + ")"); @@ -287,7 +287,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -312,9 +312,9 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(server_scheduled_events_entry.id)); - insert_values.push_back("'" + EscapeString(server_scheduled_events_entry.description) + "'"); - insert_values.push_back("'" + EscapeString(server_scheduled_events_entry.event_type) + "'"); - insert_values.push_back("'" + EscapeString(server_scheduled_events_entry.event_data) + "'"); + insert_values.push_back("'" + Strings::Escape(server_scheduled_events_entry.description) + "'"); + insert_values.push_back("'" + Strings::Escape(server_scheduled_events_entry.event_type) + "'"); + insert_values.push_back("'" + Strings::Escape(server_scheduled_events_entry.event_data) + "'"); insert_values.push_back(std::to_string(server_scheduled_events_entry.minute_start)); insert_values.push_back(std::to_string(server_scheduled_events_entry.hour_start)); insert_values.push_back(std::to_string(server_scheduled_events_entry.day_start)); @@ -325,11 +325,11 @@ public: insert_values.push_back(std::to_string(server_scheduled_events_entry.day_end)); insert_values.push_back(std::to_string(server_scheduled_events_entry.month_end)); insert_values.push_back(std::to_string(server_scheduled_events_entry.year_end)); - insert_values.push_back("'" + EscapeString(server_scheduled_events_entry.cron_expression) + "'"); + insert_values.push_back("'" + Strings::Escape(server_scheduled_events_entry.cron_expression) + "'"); insert_values.push_back("FROM_UNIXTIME(" + (server_scheduled_events_entry.created_at > 0 ? std::to_string(server_scheduled_events_entry.created_at) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (server_scheduled_events_entry.deleted_at > 0 ? std::to_string(server_scheduled_events_entry.deleted_at) : "null") + ")"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -338,7 +338,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_shared_task_activity_state_repository.h b/common/repositories/base/base_shared_task_activity_state_repository.h index e599f3cb7..1c3ef2610 100644 --- a/common/repositories/base/base_shared_task_activity_state_repository.h +++ b/common/repositories/base/base_shared_task_activity_state_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SHARED_TASK_ACTIVITY_STATE_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSharedTaskActivityStateRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -178,7 +178,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), shared_task_activity_state_entry.shared_task_id ) @@ -204,7 +204,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -234,7 +234,7 @@ public: insert_values.push_back("FROM_UNIXTIME(" + (shared_task_activity_state_entry.updated_time > 0 ? std::to_string(shared_task_activity_state_entry.updated_time) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (shared_task_activity_state_entry.completed_time > 0 ? std::to_string(shared_task_activity_state_entry.completed_time) : "null") + ")"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -243,7 +243,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_shared_task_dynamic_zones_repository.h b/common/repositories/base/base_shared_task_dynamic_zones_repository.h index 021e398cc..00a8c8c16 100644 --- a/common/repositories/base/base_shared_task_dynamic_zones_repository.h +++ b/common/repositories/base/base_shared_task_dynamic_zones_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SHARED_TASK_DYNAMIC_ZONES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSharedTaskDynamicZonesRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -160,7 +160,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), shared_task_dynamic_zones_entry.shared_task_id ) @@ -183,7 +183,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -210,7 +210,7 @@ public: insert_values.push_back(std::to_string(shared_task_dynamic_zones_entry.shared_task_id)); insert_values.push_back(std::to_string(shared_task_dynamic_zones_entry.dynamic_zone_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -219,7 +219,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_shared_task_members_repository.h b/common/repositories/base/base_shared_task_members_repository.h index 0ab005888..ca883e2f0 100644 --- a/common/repositories/base/base_shared_task_members_repository.h +++ b/common/repositories/base/base_shared_task_members_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SHARED_TASK_MEMBERS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSharedTaskMembersRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -166,7 +166,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), shared_task_members_entry.shared_task_id ) @@ -190,7 +190,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -218,7 +218,7 @@ public: insert_values.push_back(std::to_string(shared_task_members_entry.character_id)); insert_values.push_back(std::to_string(shared_task_members_entry.is_leader)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_shared_tasks_repository.h b/common/repositories/base/base_shared_tasks_repository.h index 405bf09ed..3772240bf 100644 --- a/common/repositories/base/base_shared_tasks_repository.h +++ b/common/repositories/base/base_shared_tasks_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SHARED_TASKS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSharedTasksRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -183,7 +183,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), shared_tasks_entry.id ) @@ -210,7 +210,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -241,7 +241,7 @@ public: insert_values.push_back("FROM_UNIXTIME(" + (shared_tasks_entry.completion_time > 0 ? std::to_string(shared_tasks_entry.completion_time) : "null") + ")"); insert_values.push_back(std::to_string(shared_tasks_entry.is_locked)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -250,7 +250,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_skill_caps_repository.h b/common/repositories/base/base_skill_caps_repository.h index 5e8efdfad..2a0d59ad0 100644 --- a/common/repositories/base/base_skill_caps_repository.h +++ b/common/repositories/base/base_skill_caps_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SKILL_CAPS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSkillCapsRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -178,7 +178,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), skill_caps_entry.skillID ) @@ -204,7 +204,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -234,7 +234,7 @@ public: insert_values.push_back(std::to_string(skill_caps_entry.cap)); insert_values.push_back(std::to_string(skill_caps_entry.class_)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -243,7 +243,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_spawn2_repository.h b/common/repositories/base/base_spawn2_repository.h index f771c12fe..bc9e0cf9b 100644 --- a/common/repositories/base/base_spawn2_repository.h +++ b/common/repositories/base/base_spawn2_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SPAWN2_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSpawn2Repository { @@ -100,12 +100,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -244,7 +244,7 @@ public: auto columns = Columns(); update_values.push_back(columns[1] + " = " + std::to_string(spawn2_entry.spawngroupID)); - update_values.push_back(columns[2] + " = '" + EscapeString(spawn2_entry.zone) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(spawn2_entry.zone) + "'"); update_values.push_back(columns[3] + " = " + std::to_string(spawn2_entry.version)); update_values.push_back(columns[4] + " = " + std::to_string(spawn2_entry.x)); update_values.push_back(columns[5] + " = " + std::to_string(spawn2_entry.y)); @@ -260,14 +260,14 @@ public: update_values.push_back(columns[15] + " = " + std::to_string(spawn2_entry.animation)); update_values.push_back(columns[16] + " = " + std::to_string(spawn2_entry.min_expansion)); update_values.push_back(columns[17] + " = " + std::to_string(spawn2_entry.max_expansion)); - update_values.push_back(columns[18] + " = '" + EscapeString(spawn2_entry.content_flags) + "'"); - update_values.push_back(columns[19] + " = '" + EscapeString(spawn2_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[18] + " = '" + Strings::Escape(spawn2_entry.content_flags) + "'"); + update_values.push_back(columns[19] + " = '" + Strings::Escape(spawn2_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), spawn2_entry.id ) @@ -285,7 +285,7 @@ public: insert_values.push_back(std::to_string(spawn2_entry.id)); insert_values.push_back(std::to_string(spawn2_entry.spawngroupID)); - insert_values.push_back("'" + EscapeString(spawn2_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn2_entry.zone) + "'"); insert_values.push_back(std::to_string(spawn2_entry.version)); insert_values.push_back(std::to_string(spawn2_entry.x)); insert_values.push_back(std::to_string(spawn2_entry.y)); @@ -301,14 +301,14 @@ public: insert_values.push_back(std::to_string(spawn2_entry.animation)); insert_values.push_back(std::to_string(spawn2_entry.min_expansion)); insert_values.push_back(std::to_string(spawn2_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(spawn2_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(spawn2_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn2_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn2_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -334,7 +334,7 @@ public: insert_values.push_back(std::to_string(spawn2_entry.id)); insert_values.push_back(std::to_string(spawn2_entry.spawngroupID)); - insert_values.push_back("'" + EscapeString(spawn2_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn2_entry.zone) + "'"); insert_values.push_back(std::to_string(spawn2_entry.version)); insert_values.push_back(std::to_string(spawn2_entry.x)); insert_values.push_back(std::to_string(spawn2_entry.y)); @@ -350,10 +350,10 @@ public: insert_values.push_back(std::to_string(spawn2_entry.animation)); insert_values.push_back(std::to_string(spawn2_entry.min_expansion)); insert_values.push_back(std::to_string(spawn2_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(spawn2_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(spawn2_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn2_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn2_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -362,7 +362,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_spawn_condition_values_repository.h b/common/repositories/base/base_spawn_condition_values_repository.h index b778c7fbb..2d310db23 100644 --- a/common/repositories/base/base_spawn_condition_values_repository.h +++ b/common/repositories/base/base_spawn_condition_values_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SPAWN_CONDITION_VALUES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSpawnConditionValuesRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -165,14 +165,14 @@ public: update_values.push_back(columns[0] + " = " + std::to_string(spawn_condition_values_entry.id)); update_values.push_back(columns[1] + " = " + std::to_string(spawn_condition_values_entry.value)); - update_values.push_back(columns[2] + " = '" + EscapeString(spawn_condition_values_entry.zone) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(spawn_condition_values_entry.zone) + "'"); update_values.push_back(columns[3] + " = " + std::to_string(spawn_condition_values_entry.instance_id)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), spawn_condition_values_entry.id ) @@ -190,14 +190,14 @@ public: insert_values.push_back(std::to_string(spawn_condition_values_entry.id)); insert_values.push_back(std::to_string(spawn_condition_values_entry.value)); - insert_values.push_back("'" + EscapeString(spawn_condition_values_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn_condition_values_entry.zone) + "'"); insert_values.push_back(std::to_string(spawn_condition_values_entry.instance_id)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -223,10 +223,10 @@ public: insert_values.push_back(std::to_string(spawn_condition_values_entry.id)); insert_values.push_back(std::to_string(spawn_condition_values_entry.value)); - insert_values.push_back("'" + EscapeString(spawn_condition_values_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn_condition_values_entry.zone) + "'"); insert_values.push_back(std::to_string(spawn_condition_values_entry.instance_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_spawn_conditions_repository.h b/common/repositories/base/base_spawn_conditions_repository.h index 11a6cd6ea..8d90a7e4c 100644 --- a/common/repositories/base/base_spawn_conditions_repository.h +++ b/common/repositories/base/base_spawn_conditions_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SPAWN_CONDITIONS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSpawnConditionsRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -168,17 +168,17 @@ public: auto columns = Columns(); - update_values.push_back(columns[0] + " = '" + EscapeString(spawn_conditions_entry.zone) + "'"); + update_values.push_back(columns[0] + " = '" + Strings::Escape(spawn_conditions_entry.zone) + "'"); update_values.push_back(columns[1] + " = " + std::to_string(spawn_conditions_entry.id)); update_values.push_back(columns[2] + " = " + std::to_string(spawn_conditions_entry.value)); update_values.push_back(columns[3] + " = " + std::to_string(spawn_conditions_entry.onchange)); - update_values.push_back(columns[4] + " = '" + EscapeString(spawn_conditions_entry.name) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(spawn_conditions_entry.name) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), spawn_conditions_entry.id ) @@ -194,17 +194,17 @@ public: { std::vector insert_values; - insert_values.push_back("'" + EscapeString(spawn_conditions_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn_conditions_entry.zone) + "'"); insert_values.push_back(std::to_string(spawn_conditions_entry.id)); insert_values.push_back(std::to_string(spawn_conditions_entry.value)); insert_values.push_back(std::to_string(spawn_conditions_entry.onchange)); - insert_values.push_back("'" + EscapeString(spawn_conditions_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn_conditions_entry.name) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -228,13 +228,13 @@ public: for (auto &spawn_conditions_entry: spawn_conditions_entries) { std::vector insert_values; - insert_values.push_back("'" + EscapeString(spawn_conditions_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn_conditions_entry.zone) + "'"); insert_values.push_back(std::to_string(spawn_conditions_entry.id)); insert_values.push_back(std::to_string(spawn_conditions_entry.value)); insert_values.push_back(std::to_string(spawn_conditions_entry.onchange)); - insert_values.push_back("'" + EscapeString(spawn_conditions_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn_conditions_entry.name) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -243,7 +243,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_spawn_events_repository.h b/common/repositories/base/base_spawn_events_repository.h index e20f07fa7..4404f1008 100644 --- a/common/repositories/base/base_spawn_events_repository.h +++ b/common/repositories/base/base_spawn_events_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SPAWN_EVENTS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSpawnEventsRepository { @@ -82,12 +82,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -213,9 +213,9 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(spawn_events_entry.zone) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(spawn_events_entry.zone) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(spawn_events_entry.cond_id)); - update_values.push_back(columns[3] + " = '" + EscapeString(spawn_events_entry.name) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(spawn_events_entry.name) + "'"); update_values.push_back(columns[4] + " = " + std::to_string(spawn_events_entry.period)); update_values.push_back(columns[5] + " = " + std::to_string(spawn_events_entry.next_minute)); update_values.push_back(columns[6] + " = " + std::to_string(spawn_events_entry.next_hour)); @@ -231,7 +231,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), spawn_events_entry.id ) @@ -248,9 +248,9 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(spawn_events_entry.id)); - insert_values.push_back("'" + EscapeString(spawn_events_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn_events_entry.zone) + "'"); insert_values.push_back(std::to_string(spawn_events_entry.cond_id)); - insert_values.push_back("'" + EscapeString(spawn_events_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn_events_entry.name) + "'"); insert_values.push_back(std::to_string(spawn_events_entry.period)); insert_values.push_back(std::to_string(spawn_events_entry.next_minute)); insert_values.push_back(std::to_string(spawn_events_entry.next_hour)); @@ -266,7 +266,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -291,9 +291,9 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(spawn_events_entry.id)); - insert_values.push_back("'" + EscapeString(spawn_events_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn_events_entry.zone) + "'"); insert_values.push_back(std::to_string(spawn_events_entry.cond_id)); - insert_values.push_back("'" + EscapeString(spawn_events_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(spawn_events_entry.name) + "'"); insert_values.push_back(std::to_string(spawn_events_entry.period)); insert_values.push_back(std::to_string(spawn_events_entry.next_minute)); insert_values.push_back(std::to_string(spawn_events_entry.next_hour)); @@ -305,7 +305,7 @@ public: insert_values.push_back(std::to_string(spawn_events_entry.argument)); insert_values.push_back(std::to_string(spawn_events_entry.strict)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -314,7 +314,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_spawnentry_repository.h b/common/repositories/base/base_spawnentry_repository.h index e2500dae7..dfa0cdadd 100644 --- a/common/repositories/base/base_spawnentry_repository.h +++ b/common/repositories/base/base_spawnentry_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SPAWNENTRY_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSpawnentryRepository { @@ -64,12 +64,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -189,14 +189,14 @@ public: update_values.push_back(columns[3] + " = " + std::to_string(spawnentry_entry.condition_value_filter)); update_values.push_back(columns[4] + " = " + std::to_string(spawnentry_entry.min_expansion)); update_values.push_back(columns[5] + " = " + std::to_string(spawnentry_entry.max_expansion)); - update_values.push_back(columns[6] + " = '" + EscapeString(spawnentry_entry.content_flags) + "'"); - update_values.push_back(columns[7] + " = '" + EscapeString(spawnentry_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(spawnentry_entry.content_flags) + "'"); + update_values.push_back(columns[7] + " = '" + Strings::Escape(spawnentry_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), spawnentry_entry.spawngroupID ) @@ -218,14 +218,14 @@ public: insert_values.push_back(std::to_string(spawnentry_entry.condition_value_filter)); insert_values.push_back(std::to_string(spawnentry_entry.min_expansion)); insert_values.push_back(std::to_string(spawnentry_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(spawnentry_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(spawnentry_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(spawnentry_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(spawnentry_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -255,10 +255,10 @@ public: insert_values.push_back(std::to_string(spawnentry_entry.condition_value_filter)); insert_values.push_back(std::to_string(spawnentry_entry.min_expansion)); insert_values.push_back(std::to_string(spawnentry_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(spawnentry_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(spawnentry_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(spawnentry_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(spawnentry_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -267,7 +267,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_spawngroup_repository.h b/common/repositories/base/base_spawngroup_repository.h index 782c4c9df..74a94f531 100644 --- a/common/repositories/base/base_spawngroup_repository.h +++ b/common/repositories/base/base_spawngroup_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SPAWNGROUP_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSpawngroupRepository { @@ -79,12 +79,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -208,7 +208,7 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(spawngroup_entry.name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(spawngroup_entry.name) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(spawngroup_entry.spawn_limit)); update_values.push_back(columns[3] + " = " + std::to_string(spawngroup_entry.dist)); update_values.push_back(columns[4] + " = " + std::to_string(spawngroup_entry.max_x)); @@ -225,7 +225,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), spawngroup_entry.id ) @@ -242,7 +242,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(spawngroup_entry.id)); - insert_values.push_back("'" + EscapeString(spawngroup_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(spawngroup_entry.name) + "'"); insert_values.push_back(std::to_string(spawngroup_entry.spawn_limit)); insert_values.push_back(std::to_string(spawngroup_entry.dist)); insert_values.push_back(std::to_string(spawngroup_entry.max_x)); @@ -259,7 +259,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -284,7 +284,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(spawngroup_entry.id)); - insert_values.push_back("'" + EscapeString(spawngroup_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(spawngroup_entry.name) + "'"); insert_values.push_back(std::to_string(spawngroup_entry.spawn_limit)); insert_values.push_back(std::to_string(spawngroup_entry.dist)); insert_values.push_back(std::to_string(spawngroup_entry.max_x)); @@ -297,7 +297,7 @@ public: insert_values.push_back(std::to_string(spawngroup_entry.despawn_timer)); insert_values.push_back(std::to_string(spawngroup_entry.wp_spawns)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -306,7 +306,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_spell_buckets_repository.h b/common/repositories/base/base_spell_buckets_repository.h index 69e5f3974..360b266c2 100644 --- a/common/repositories/base/base_spell_buckets_repository.h +++ b/common/repositories/base/base_spell_buckets_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SPELL_BUCKETS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSpellBucketsRepository { @@ -49,12 +49,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -159,14 +159,14 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(spell_buckets_entry.spellid)); - update_values.push_back(columns[1] + " = '" + EscapeString(spell_buckets_entry.key) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(spell_buckets_entry.value) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(spell_buckets_entry.key) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(spell_buckets_entry.value) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), spell_buckets_entry.spellid ) @@ -183,14 +183,14 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(spell_buckets_entry.spellid)); - insert_values.push_back("'" + EscapeString(spell_buckets_entry.key) + "'"); - insert_values.push_back("'" + EscapeString(spell_buckets_entry.value) + "'"); + insert_values.push_back("'" + Strings::Escape(spell_buckets_entry.key) + "'"); + insert_values.push_back("'" + Strings::Escape(spell_buckets_entry.value) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -215,10 +215,10 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(spell_buckets_entry.spellid)); - insert_values.push_back("'" + EscapeString(spell_buckets_entry.key) + "'"); - insert_values.push_back("'" + EscapeString(spell_buckets_entry.value) + "'"); + insert_values.push_back("'" + Strings::Escape(spell_buckets_entry.key) + "'"); + insert_values.push_back("'" + Strings::Escape(spell_buckets_entry.value) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -227,7 +227,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_spell_globals_repository.h b/common/repositories/base/base_spell_globals_repository.h index 11323e9ce..1bd274bf2 100644 --- a/common/repositories/base/base_spell_globals_repository.h +++ b/common/repositories/base/base_spell_globals_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SPELL_GLOBALS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSpellGlobalsRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -164,15 +164,15 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(spell_globals_entry.spellid)); - update_values.push_back(columns[1] + " = '" + EscapeString(spell_globals_entry.spell_name) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(spell_globals_entry.qglobal) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(spell_globals_entry.value) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(spell_globals_entry.spell_name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(spell_globals_entry.qglobal) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(spell_globals_entry.value) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), spell_globals_entry.spellid ) @@ -189,15 +189,15 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(spell_globals_entry.spellid)); - insert_values.push_back("'" + EscapeString(spell_globals_entry.spell_name) + "'"); - insert_values.push_back("'" + EscapeString(spell_globals_entry.qglobal) + "'"); - insert_values.push_back("'" + EscapeString(spell_globals_entry.value) + "'"); + insert_values.push_back("'" + Strings::Escape(spell_globals_entry.spell_name) + "'"); + insert_values.push_back("'" + Strings::Escape(spell_globals_entry.qglobal) + "'"); + insert_values.push_back("'" + Strings::Escape(spell_globals_entry.value) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -222,11 +222,11 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(spell_globals_entry.spellid)); - insert_values.push_back("'" + EscapeString(spell_globals_entry.spell_name) + "'"); - insert_values.push_back("'" + EscapeString(spell_globals_entry.qglobal) + "'"); - insert_values.push_back("'" + EscapeString(spell_globals_entry.value) + "'"); + insert_values.push_back("'" + Strings::Escape(spell_globals_entry.spell_name) + "'"); + insert_values.push_back("'" + Strings::Escape(spell_globals_entry.qglobal) + "'"); + insert_values.push_back("'" + Strings::Escape(spell_globals_entry.value) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_spells_new_repository.h b/common/repositories/base/base_spells_new_repository.h index 47b40ecba..b2d401d10 100644 --- a/common/repositories/base/base_spells_new_repository.h +++ b/common/repositories/base/base_spells_new_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_SPELLS_NEW_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseSpellsNewRepository { @@ -751,12 +751,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -1329,14 +1329,14 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(spells_new_entry.id)); - update_values.push_back(columns[1] + " = '" + EscapeString(spells_new_entry.name) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(spells_new_entry.player_1) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(spells_new_entry.teleport_zone) + "'"); - update_values.push_back(columns[4] + " = '" + EscapeString(spells_new_entry.you_cast) + "'"); - update_values.push_back(columns[5] + " = '" + EscapeString(spells_new_entry.other_casts) + "'"); - update_values.push_back(columns[6] + " = '" + EscapeString(spells_new_entry.cast_on_you) + "'"); - update_values.push_back(columns[7] + " = '" + EscapeString(spells_new_entry.cast_on_other) + "'"); - update_values.push_back(columns[8] + " = '" + EscapeString(spells_new_entry.spell_fades) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(spells_new_entry.name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(spells_new_entry.player_1) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(spells_new_entry.teleport_zone) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(spells_new_entry.you_cast) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(spells_new_entry.other_casts) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(spells_new_entry.cast_on_you) + "'"); + update_values.push_back(columns[7] + " = '" + Strings::Escape(spells_new_entry.cast_on_other) + "'"); + update_values.push_back(columns[8] + " = '" + Strings::Escape(spells_new_entry.spell_fades) + "'"); update_values.push_back(columns[9] + " = " + std::to_string(spells_new_entry.range)); update_values.push_back(columns[10] + " = " + std::to_string(spells_new_entry.aoerange)); update_values.push_back(columns[11] + " = " + std::to_string(spells_new_entry.pushback)); @@ -1570,7 +1570,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), spells_new_entry.id ) @@ -1587,14 +1587,14 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(spells_new_entry.id)); - insert_values.push_back("'" + EscapeString(spells_new_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(spells_new_entry.player_1) + "'"); - insert_values.push_back("'" + EscapeString(spells_new_entry.teleport_zone) + "'"); - insert_values.push_back("'" + EscapeString(spells_new_entry.you_cast) + "'"); - insert_values.push_back("'" + EscapeString(spells_new_entry.other_casts) + "'"); - insert_values.push_back("'" + EscapeString(spells_new_entry.cast_on_you) + "'"); - insert_values.push_back("'" + EscapeString(spells_new_entry.cast_on_other) + "'"); - insert_values.push_back("'" + EscapeString(spells_new_entry.spell_fades) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.player_1) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.teleport_zone) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.you_cast) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.other_casts) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.cast_on_you) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.cast_on_other) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.spell_fades) + "'"); insert_values.push_back(std::to_string(spells_new_entry.range)); insert_values.push_back(std::to_string(spells_new_entry.aoerange)); insert_values.push_back(std::to_string(spells_new_entry.pushback)); @@ -1828,7 +1828,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -1853,14 +1853,14 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(spells_new_entry.id)); - insert_values.push_back("'" + EscapeString(spells_new_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(spells_new_entry.player_1) + "'"); - insert_values.push_back("'" + EscapeString(spells_new_entry.teleport_zone) + "'"); - insert_values.push_back("'" + EscapeString(spells_new_entry.you_cast) + "'"); - insert_values.push_back("'" + EscapeString(spells_new_entry.other_casts) + "'"); - insert_values.push_back("'" + EscapeString(spells_new_entry.cast_on_you) + "'"); - insert_values.push_back("'" + EscapeString(spells_new_entry.cast_on_other) + "'"); - insert_values.push_back("'" + EscapeString(spells_new_entry.spell_fades) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.player_1) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.teleport_zone) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.you_cast) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.other_casts) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.cast_on_you) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.cast_on_other) + "'"); + insert_values.push_back("'" + Strings::Escape(spells_new_entry.spell_fades) + "'"); insert_values.push_back(std::to_string(spells_new_entry.range)); insert_values.push_back(std::to_string(spells_new_entry.aoerange)); insert_values.push_back(std::to_string(spells_new_entry.pushback)); @@ -2090,7 +2090,7 @@ public: insert_values.push_back(std::to_string(spells_new_entry.field235)); insert_values.push_back(std::to_string(spells_new_entry.field236)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -2099,7 +2099,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_start_zones_repository.h b/common/repositories/base/base_start_zones_repository.h index 5a970d4e3..e5cee8c9a 100644 --- a/common/repositories/base/base_start_zones_repository.h +++ b/common/repositories/base/base_start_zones_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_START_ZONES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseStartZonesRepository { @@ -97,12 +97,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -255,14 +255,14 @@ public: update_values.push_back(columns[14] + " = " + std::to_string(start_zones_entry.select_rank)); update_values.push_back(columns[15] + " = " + std::to_string(start_zones_entry.min_expansion)); update_values.push_back(columns[16] + " = " + std::to_string(start_zones_entry.max_expansion)); - update_values.push_back(columns[17] + " = '" + EscapeString(start_zones_entry.content_flags) + "'"); - update_values.push_back(columns[18] + " = '" + EscapeString(start_zones_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[17] + " = '" + Strings::Escape(start_zones_entry.content_flags) + "'"); + update_values.push_back(columns[18] + " = '" + Strings::Escape(start_zones_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), start_zones_entry.player_choice ) @@ -295,14 +295,14 @@ public: insert_values.push_back(std::to_string(start_zones_entry.select_rank)); insert_values.push_back(std::to_string(start_zones_entry.min_expansion)); insert_values.push_back(std::to_string(start_zones_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(start_zones_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(start_zones_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(start_zones_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(start_zones_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -343,10 +343,10 @@ public: insert_values.push_back(std::to_string(start_zones_entry.select_rank)); insert_values.push_back(std::to_string(start_zones_entry.min_expansion)); insert_values.push_back(std::to_string(start_zones_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(start_zones_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(start_zones_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(start_zones_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(start_zones_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -355,7 +355,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_starting_items_repository.h b/common/repositories/base/base_starting_items_repository.h index 0c17c503a..d2cdfb455 100644 --- a/common/repositories/base/base_starting_items_repository.h +++ b/common/repositories/base/base_starting_items_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_STARTING_ITEMS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseStartingItemsRepository { @@ -79,12 +79,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -218,14 +218,14 @@ public: update_values.push_back(columns[8] + " = " + std::to_string(starting_items_entry.slot)); update_values.push_back(columns[9] + " = " + std::to_string(starting_items_entry.min_expansion)); update_values.push_back(columns[10] + " = " + std::to_string(starting_items_entry.max_expansion)); - update_values.push_back(columns[11] + " = '" + EscapeString(starting_items_entry.content_flags) + "'"); - update_values.push_back(columns[12] + " = '" + EscapeString(starting_items_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[11] + " = '" + Strings::Escape(starting_items_entry.content_flags) + "'"); + update_values.push_back(columns[12] + " = '" + Strings::Escape(starting_items_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), starting_items_entry.id ) @@ -252,14 +252,14 @@ public: insert_values.push_back(std::to_string(starting_items_entry.slot)); insert_values.push_back(std::to_string(starting_items_entry.min_expansion)); insert_values.push_back(std::to_string(starting_items_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(starting_items_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(starting_items_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(starting_items_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(starting_items_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -294,10 +294,10 @@ public: insert_values.push_back(std::to_string(starting_items_entry.slot)); insert_values.push_back(std::to_string(starting_items_entry.min_expansion)); insert_values.push_back(std::to_string(starting_items_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(starting_items_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(starting_items_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(starting_items_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(starting_items_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -306,7 +306,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_task_activities_repository.h b/common/repositories/base/base_task_activities_repository.h index c1a9e1e4f..2da4db0b4 100644 --- a/common/repositories/base/base_task_activities_repository.h +++ b/common/repositories/base/base_task_activities_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_TASK_ACTIVITIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseTaskActivitiesRepository { @@ -88,12 +88,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -227,24 +227,24 @@ public: update_values.push_back(columns[1] + " = " + std::to_string(task_activities_entry.activityid)); update_values.push_back(columns[2] + " = " + std::to_string(task_activities_entry.step)); update_values.push_back(columns[3] + " = " + std::to_string(task_activities_entry.activitytype)); - update_values.push_back(columns[4] + " = '" + EscapeString(task_activities_entry.target_name) + "'"); - update_values.push_back(columns[5] + " = '" + EscapeString(task_activities_entry.item_list) + "'"); - update_values.push_back(columns[6] + " = '" + EscapeString(task_activities_entry.skill_list) + "'"); - update_values.push_back(columns[7] + " = '" + EscapeString(task_activities_entry.spell_list) + "'"); - update_values.push_back(columns[8] + " = '" + EscapeString(task_activities_entry.description_override) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(task_activities_entry.target_name) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(task_activities_entry.item_list) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(task_activities_entry.skill_list) + "'"); + update_values.push_back(columns[7] + " = '" + Strings::Escape(task_activities_entry.spell_list) + "'"); + update_values.push_back(columns[8] + " = '" + Strings::Escape(task_activities_entry.description_override) + "'"); update_values.push_back(columns[9] + " = " + std::to_string(task_activities_entry.goalid)); - update_values.push_back(columns[10] + " = '" + EscapeString(task_activities_entry.goal_match_list) + "'"); + update_values.push_back(columns[10] + " = '" + Strings::Escape(task_activities_entry.goal_match_list) + "'"); update_values.push_back(columns[11] + " = " + std::to_string(task_activities_entry.goalmethod)); update_values.push_back(columns[12] + " = " + std::to_string(task_activities_entry.goalcount)); update_values.push_back(columns[13] + " = " + std::to_string(task_activities_entry.delivertonpc)); - update_values.push_back(columns[14] + " = '" + EscapeString(task_activities_entry.zones) + "'"); + update_values.push_back(columns[14] + " = '" + Strings::Escape(task_activities_entry.zones) + "'"); update_values.push_back(columns[15] + " = " + std::to_string(task_activities_entry.optional)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), task_activities_entry.taskid ) @@ -264,24 +264,24 @@ public: insert_values.push_back(std::to_string(task_activities_entry.activityid)); insert_values.push_back(std::to_string(task_activities_entry.step)); insert_values.push_back(std::to_string(task_activities_entry.activitytype)); - insert_values.push_back("'" + EscapeString(task_activities_entry.target_name) + "'"); - insert_values.push_back("'" + EscapeString(task_activities_entry.item_list) + "'"); - insert_values.push_back("'" + EscapeString(task_activities_entry.skill_list) + "'"); - insert_values.push_back("'" + EscapeString(task_activities_entry.spell_list) + "'"); - insert_values.push_back("'" + EscapeString(task_activities_entry.description_override) + "'"); + insert_values.push_back("'" + Strings::Escape(task_activities_entry.target_name) + "'"); + insert_values.push_back("'" + Strings::Escape(task_activities_entry.item_list) + "'"); + insert_values.push_back("'" + Strings::Escape(task_activities_entry.skill_list) + "'"); + insert_values.push_back("'" + Strings::Escape(task_activities_entry.spell_list) + "'"); + insert_values.push_back("'" + Strings::Escape(task_activities_entry.description_override) + "'"); insert_values.push_back(std::to_string(task_activities_entry.goalid)); - insert_values.push_back("'" + EscapeString(task_activities_entry.goal_match_list) + "'"); + insert_values.push_back("'" + Strings::Escape(task_activities_entry.goal_match_list) + "'"); insert_values.push_back(std::to_string(task_activities_entry.goalmethod)); insert_values.push_back(std::to_string(task_activities_entry.goalcount)); insert_values.push_back(std::to_string(task_activities_entry.delivertonpc)); - insert_values.push_back("'" + EscapeString(task_activities_entry.zones) + "'"); + insert_values.push_back("'" + Strings::Escape(task_activities_entry.zones) + "'"); insert_values.push_back(std::to_string(task_activities_entry.optional)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -309,20 +309,20 @@ public: insert_values.push_back(std::to_string(task_activities_entry.activityid)); insert_values.push_back(std::to_string(task_activities_entry.step)); insert_values.push_back(std::to_string(task_activities_entry.activitytype)); - insert_values.push_back("'" + EscapeString(task_activities_entry.target_name) + "'"); - insert_values.push_back("'" + EscapeString(task_activities_entry.item_list) + "'"); - insert_values.push_back("'" + EscapeString(task_activities_entry.skill_list) + "'"); - insert_values.push_back("'" + EscapeString(task_activities_entry.spell_list) + "'"); - insert_values.push_back("'" + EscapeString(task_activities_entry.description_override) + "'"); + insert_values.push_back("'" + Strings::Escape(task_activities_entry.target_name) + "'"); + insert_values.push_back("'" + Strings::Escape(task_activities_entry.item_list) + "'"); + insert_values.push_back("'" + Strings::Escape(task_activities_entry.skill_list) + "'"); + insert_values.push_back("'" + Strings::Escape(task_activities_entry.spell_list) + "'"); + insert_values.push_back("'" + Strings::Escape(task_activities_entry.description_override) + "'"); insert_values.push_back(std::to_string(task_activities_entry.goalid)); - insert_values.push_back("'" + EscapeString(task_activities_entry.goal_match_list) + "'"); + insert_values.push_back("'" + Strings::Escape(task_activities_entry.goal_match_list) + "'"); insert_values.push_back(std::to_string(task_activities_entry.goalmethod)); insert_values.push_back(std::to_string(task_activities_entry.goalcount)); insert_values.push_back(std::to_string(task_activities_entry.delivertonpc)); - insert_values.push_back("'" + EscapeString(task_activities_entry.zones) + "'"); + insert_values.push_back("'" + Strings::Escape(task_activities_entry.zones) + "'"); insert_values.push_back(std::to_string(task_activities_entry.optional)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -331,7 +331,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_tasks_repository.h b/common/repositories/base/base_tasks_repository.h index 23c76d788..cb3e1ae47 100644 --- a/common/repositories/base/base_tasks_repository.h +++ b/common/repositories/base/base_tasks_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_TASKS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseTasksRepository { @@ -109,12 +109,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -262,9 +262,9 @@ public: update_values.push_back(columns[1] + " = " + std::to_string(tasks_entry.type)); update_values.push_back(columns[2] + " = " + std::to_string(tasks_entry.duration)); update_values.push_back(columns[3] + " = " + std::to_string(tasks_entry.duration_code)); - update_values.push_back(columns[4] + " = '" + EscapeString(tasks_entry.title) + "'"); - update_values.push_back(columns[5] + " = '" + EscapeString(tasks_entry.description) + "'"); - update_values.push_back(columns[6] + " = '" + EscapeString(tasks_entry.reward) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(tasks_entry.title) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(tasks_entry.description) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(tasks_entry.reward) + "'"); update_values.push_back(columns[7] + " = " + std::to_string(tasks_entry.rewardid)); update_values.push_back(columns[8] + " = " + std::to_string(tasks_entry.cashreward)); update_values.push_back(columns[9] + " = " + std::to_string(tasks_entry.xpreward)); @@ -278,7 +278,7 @@ public: update_values.push_back(columns[17] + " = " + std::to_string(tasks_entry.max_players)); update_values.push_back(columns[18] + " = " + std::to_string(tasks_entry.repeatable)); update_values.push_back(columns[19] + " = " + std::to_string(tasks_entry.faction_reward)); - update_values.push_back(columns[20] + " = '" + EscapeString(tasks_entry.completion_emote) + "'"); + update_values.push_back(columns[20] + " = '" + Strings::Escape(tasks_entry.completion_emote) + "'"); update_values.push_back(columns[21] + " = " + std::to_string(tasks_entry.replay_timer_seconds)); update_values.push_back(columns[22] + " = " + std::to_string(tasks_entry.request_timer_seconds)); @@ -286,7 +286,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), tasks_entry.id ) @@ -306,9 +306,9 @@ public: insert_values.push_back(std::to_string(tasks_entry.type)); insert_values.push_back(std::to_string(tasks_entry.duration)); insert_values.push_back(std::to_string(tasks_entry.duration_code)); - insert_values.push_back("'" + EscapeString(tasks_entry.title) + "'"); - insert_values.push_back("'" + EscapeString(tasks_entry.description) + "'"); - insert_values.push_back("'" + EscapeString(tasks_entry.reward) + "'"); + insert_values.push_back("'" + Strings::Escape(tasks_entry.title) + "'"); + insert_values.push_back("'" + Strings::Escape(tasks_entry.description) + "'"); + insert_values.push_back("'" + Strings::Escape(tasks_entry.reward) + "'"); insert_values.push_back(std::to_string(tasks_entry.rewardid)); insert_values.push_back(std::to_string(tasks_entry.cashreward)); insert_values.push_back(std::to_string(tasks_entry.xpreward)); @@ -322,7 +322,7 @@ public: insert_values.push_back(std::to_string(tasks_entry.max_players)); insert_values.push_back(std::to_string(tasks_entry.repeatable)); insert_values.push_back(std::to_string(tasks_entry.faction_reward)); - insert_values.push_back("'" + EscapeString(tasks_entry.completion_emote) + "'"); + insert_values.push_back("'" + Strings::Escape(tasks_entry.completion_emote) + "'"); insert_values.push_back(std::to_string(tasks_entry.replay_timer_seconds)); insert_values.push_back(std::to_string(tasks_entry.request_timer_seconds)); @@ -330,7 +330,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -358,9 +358,9 @@ public: insert_values.push_back(std::to_string(tasks_entry.type)); insert_values.push_back(std::to_string(tasks_entry.duration)); insert_values.push_back(std::to_string(tasks_entry.duration_code)); - insert_values.push_back("'" + EscapeString(tasks_entry.title) + "'"); - insert_values.push_back("'" + EscapeString(tasks_entry.description) + "'"); - insert_values.push_back("'" + EscapeString(tasks_entry.reward) + "'"); + insert_values.push_back("'" + Strings::Escape(tasks_entry.title) + "'"); + insert_values.push_back("'" + Strings::Escape(tasks_entry.description) + "'"); + insert_values.push_back("'" + Strings::Escape(tasks_entry.reward) + "'"); insert_values.push_back(std::to_string(tasks_entry.rewardid)); insert_values.push_back(std::to_string(tasks_entry.cashreward)); insert_values.push_back(std::to_string(tasks_entry.xpreward)); @@ -374,11 +374,11 @@ public: insert_values.push_back(std::to_string(tasks_entry.max_players)); insert_values.push_back(std::to_string(tasks_entry.repeatable)); insert_values.push_back(std::to_string(tasks_entry.faction_reward)); - insert_values.push_back("'" + EscapeString(tasks_entry.completion_emote) + "'"); + insert_values.push_back("'" + Strings::Escape(tasks_entry.completion_emote) + "'"); insert_values.push_back(std::to_string(tasks_entry.replay_timer_seconds)); insert_values.push_back(std::to_string(tasks_entry.request_timer_seconds)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -387,7 +387,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_tasksets_repository.h b/common/repositories/base/base_tasksets_repository.h index 2dd53531f..2e96868ca 100644 --- a/common/repositories/base/base_tasksets_repository.h +++ b/common/repositories/base/base_tasksets_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_TASKSETS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseTasksetsRepository { @@ -46,12 +46,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -160,7 +160,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), tasksets_entry.id ) @@ -183,7 +183,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -210,7 +210,7 @@ public: insert_values.push_back(std::to_string(tasksets_entry.id)); insert_values.push_back(std::to_string(tasksets_entry.taskid)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -219,7 +219,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_timers_repository.h b/common/repositories/base/base_timers_repository.h index 4be6e959d..f59d38103 100644 --- a/common/repositories/base/base_timers_repository.h +++ b/common/repositories/base/base_timers_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_TIMERS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseTimersRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -178,7 +178,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), timers_entry.char_id ) @@ -204,7 +204,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -234,7 +234,7 @@ public: insert_values.push_back(std::to_string(timers_entry.duration)); insert_values.push_back(std::to_string(timers_entry.enable)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -243,7 +243,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_titles_repository.h b/common/repositories/base/base_titles_repository.h index fec2556d4..56d5d2d15 100644 --- a/common/repositories/base/base_titles_repository.h +++ b/common/repositories/base/base_titles_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_TITLES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseTitlesRepository { @@ -82,12 +82,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -223,15 +223,15 @@ public: update_values.push_back(columns[8] + " = " + std::to_string(titles_entry.char_id)); update_values.push_back(columns[9] + " = " + std::to_string(titles_entry.status)); update_values.push_back(columns[10] + " = " + std::to_string(titles_entry.item_id)); - update_values.push_back(columns[11] + " = '" + EscapeString(titles_entry.prefix) + "'"); - update_values.push_back(columns[12] + " = '" + EscapeString(titles_entry.suffix) + "'"); + update_values.push_back(columns[11] + " = '" + Strings::Escape(titles_entry.prefix) + "'"); + update_values.push_back(columns[12] + " = '" + Strings::Escape(titles_entry.suffix) + "'"); update_values.push_back(columns[13] + " = " + std::to_string(titles_entry.title_set)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), titles_entry.id ) @@ -258,15 +258,15 @@ public: insert_values.push_back(std::to_string(titles_entry.char_id)); insert_values.push_back(std::to_string(titles_entry.status)); insert_values.push_back(std::to_string(titles_entry.item_id)); - insert_values.push_back("'" + EscapeString(titles_entry.prefix) + "'"); - insert_values.push_back("'" + EscapeString(titles_entry.suffix) + "'"); + insert_values.push_back("'" + Strings::Escape(titles_entry.prefix) + "'"); + insert_values.push_back("'" + Strings::Escape(titles_entry.suffix) + "'"); insert_values.push_back(std::to_string(titles_entry.title_set)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -301,11 +301,11 @@ public: insert_values.push_back(std::to_string(titles_entry.char_id)); insert_values.push_back(std::to_string(titles_entry.status)); insert_values.push_back(std::to_string(titles_entry.item_id)); - insert_values.push_back("'" + EscapeString(titles_entry.prefix) + "'"); - insert_values.push_back("'" + EscapeString(titles_entry.suffix) + "'"); + insert_values.push_back("'" + Strings::Escape(titles_entry.prefix) + "'"); + insert_values.push_back("'" + Strings::Escape(titles_entry.suffix) + "'"); insert_values.push_back(std::to_string(titles_entry.title_set)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -314,7 +314,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_tool_game_objects_repository.h b/common/repositories/base/base_tool_game_objects_repository.h index 3e1f8600f..908844df7 100644 --- a/common/repositories/base/base_tool_game_objects_repository.h +++ b/common/repositories/base/base_tool_game_objects_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_TOOL_GAME_OBJECTS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseToolGameObjectsRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -174,16 +174,16 @@ public: auto columns = Columns(); update_values.push_back(columns[1] + " = " + std::to_string(tool_game_objects_entry.zoneid)); - update_values.push_back(columns[2] + " = '" + EscapeString(tool_game_objects_entry.zonesn) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(tool_game_objects_entry.object_name) + "'"); - update_values.push_back(columns[4] + " = '" + EscapeString(tool_game_objects_entry.file_from) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(tool_game_objects_entry.zonesn) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(tool_game_objects_entry.object_name) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(tool_game_objects_entry.file_from) + "'"); update_values.push_back(columns[5] + " = " + std::to_string(tool_game_objects_entry.is_global)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), tool_game_objects_entry.id ) @@ -201,16 +201,16 @@ public: insert_values.push_back(std::to_string(tool_game_objects_entry.id)); insert_values.push_back(std::to_string(tool_game_objects_entry.zoneid)); - insert_values.push_back("'" + EscapeString(tool_game_objects_entry.zonesn) + "'"); - insert_values.push_back("'" + EscapeString(tool_game_objects_entry.object_name) + "'"); - insert_values.push_back("'" + EscapeString(tool_game_objects_entry.file_from) + "'"); + insert_values.push_back("'" + Strings::Escape(tool_game_objects_entry.zonesn) + "'"); + insert_values.push_back("'" + Strings::Escape(tool_game_objects_entry.object_name) + "'"); + insert_values.push_back("'" + Strings::Escape(tool_game_objects_entry.file_from) + "'"); insert_values.push_back(std::to_string(tool_game_objects_entry.is_global)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -236,12 +236,12 @@ public: insert_values.push_back(std::to_string(tool_game_objects_entry.id)); insert_values.push_back(std::to_string(tool_game_objects_entry.zoneid)); - insert_values.push_back("'" + EscapeString(tool_game_objects_entry.zonesn) + "'"); - insert_values.push_back("'" + EscapeString(tool_game_objects_entry.object_name) + "'"); - insert_values.push_back("'" + EscapeString(tool_game_objects_entry.file_from) + "'"); + insert_values.push_back("'" + Strings::Escape(tool_game_objects_entry.zonesn) + "'"); + insert_values.push_back("'" + Strings::Escape(tool_game_objects_entry.object_name) + "'"); + insert_values.push_back("'" + Strings::Escape(tool_game_objects_entry.file_from) + "'"); insert_values.push_back(std::to_string(tool_game_objects_entry.is_global)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -250,7 +250,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_trader_repository.h b/common/repositories/base/base_trader_repository.h index 2fa33f862..7bb474c2a 100644 --- a/common/repositories/base/base_trader_repository.h +++ b/common/repositories/base/base_trader_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_TRADER_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseTraderRepository { @@ -58,12 +58,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -184,7 +184,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), trader_entry.char_id ) @@ -211,7 +211,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -242,7 +242,7 @@ public: insert_values.push_back(std::to_string(trader_entry.item_cost)); insert_values.push_back(std::to_string(trader_entry.slot_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -251,7 +251,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_tradeskill_recipe_entries_repository.h b/common/repositories/base/base_tradeskill_recipe_entries_repository.h index f33dea405..e9f52a105 100644 --- a/common/repositories/base/base_tradeskill_recipe_entries_repository.h +++ b/common/repositories/base/base_tradeskill_recipe_entries_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_TRADESKILL_RECIPE_ENTRIES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseTradeskillRecipeEntriesRepository { @@ -64,12 +64,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -195,7 +195,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), tradeskill_recipe_entries_entry.id ) @@ -224,7 +224,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -257,7 +257,7 @@ public: insert_values.push_back(std::to_string(tradeskill_recipe_entries_entry.salvagecount)); insert_values.push_back(std::to_string(tradeskill_recipe_entries_entry.iscontainer)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -266,7 +266,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_tradeskill_recipe_repository.h b/common/repositories/base/base_tradeskill_recipe_repository.h index 2231a26dc..773433a68 100644 --- a/common/repositories/base/base_tradeskill_recipe_repository.h +++ b/common/repositories/base/base_tradeskill_recipe_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_TRADESKILL_RECIPE_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseTradeskillRecipeRepository { @@ -85,12 +85,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -218,26 +218,26 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(tradeskill_recipe_entry.name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(tradeskill_recipe_entry.name) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(tradeskill_recipe_entry.tradeskill)); update_values.push_back(columns[3] + " = " + std::to_string(tradeskill_recipe_entry.skillneeded)); update_values.push_back(columns[4] + " = " + std::to_string(tradeskill_recipe_entry.trivial)); update_values.push_back(columns[5] + " = " + std::to_string(tradeskill_recipe_entry.nofail)); update_values.push_back(columns[6] + " = " + std::to_string(tradeskill_recipe_entry.replace_container)); - update_values.push_back(columns[7] + " = '" + EscapeString(tradeskill_recipe_entry.notes) + "'"); + update_values.push_back(columns[7] + " = '" + Strings::Escape(tradeskill_recipe_entry.notes) + "'"); update_values.push_back(columns[8] + " = " + std::to_string(tradeskill_recipe_entry.must_learn)); update_values.push_back(columns[9] + " = " + std::to_string(tradeskill_recipe_entry.quest)); update_values.push_back(columns[10] + " = " + std::to_string(tradeskill_recipe_entry.enabled)); update_values.push_back(columns[11] + " = " + std::to_string(tradeskill_recipe_entry.min_expansion)); update_values.push_back(columns[12] + " = " + std::to_string(tradeskill_recipe_entry.max_expansion)); - update_values.push_back(columns[13] + " = '" + EscapeString(tradeskill_recipe_entry.content_flags) + "'"); - update_values.push_back(columns[14] + " = '" + EscapeString(tradeskill_recipe_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[13] + " = '" + Strings::Escape(tradeskill_recipe_entry.content_flags) + "'"); + update_values.push_back(columns[14] + " = '" + Strings::Escape(tradeskill_recipe_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), tradeskill_recipe_entry.id ) @@ -254,26 +254,26 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(tradeskill_recipe_entry.id)); - insert_values.push_back("'" + EscapeString(tradeskill_recipe_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.name) + "'"); insert_values.push_back(std::to_string(tradeskill_recipe_entry.tradeskill)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.skillneeded)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.trivial)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.nofail)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.replace_container)); - insert_values.push_back("'" + EscapeString(tradeskill_recipe_entry.notes) + "'"); + insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.notes) + "'"); insert_values.push_back(std::to_string(tradeskill_recipe_entry.must_learn)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.quest)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.enabled)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.min_expansion)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(tradeskill_recipe_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(tradeskill_recipe_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -298,22 +298,22 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(tradeskill_recipe_entry.id)); - insert_values.push_back("'" + EscapeString(tradeskill_recipe_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.name) + "'"); insert_values.push_back(std::to_string(tradeskill_recipe_entry.tradeskill)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.skillneeded)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.trivial)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.nofail)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.replace_container)); - insert_values.push_back("'" + EscapeString(tradeskill_recipe_entry.notes) + "'"); + insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.notes) + "'"); insert_values.push_back(std::to_string(tradeskill_recipe_entry.must_learn)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.quest)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.enabled)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.min_expansion)); insert_values.push_back(std::to_string(tradeskill_recipe_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(tradeskill_recipe_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(tradeskill_recipe_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -322,7 +322,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_traps_repository.h b/common/repositories/base/base_traps_repository.h index 71048760c..f3c6ac3cf 100644 --- a/common/repositories/base/base_traps_repository.h +++ b/common/repositories/base/base_traps_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_TRAPS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseTrapsRepository { @@ -115,12 +115,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -268,7 +268,7 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(traps_entry.zone) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(traps_entry.zone) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(traps_entry.version)); update_values.push_back(columns[3] + " = " + std::to_string(traps_entry.x)); update_values.push_back(columns[4] + " = " + std::to_string(traps_entry.y)); @@ -279,7 +279,7 @@ public: update_values.push_back(columns[9] + " = " + std::to_string(traps_entry.effect)); update_values.push_back(columns[10] + " = " + std::to_string(traps_entry.effectvalue)); update_values.push_back(columns[11] + " = " + std::to_string(traps_entry.effectvalue2)); - update_values.push_back(columns[12] + " = '" + EscapeString(traps_entry.message) + "'"); + update_values.push_back(columns[12] + " = '" + Strings::Escape(traps_entry.message) + "'"); update_values.push_back(columns[13] + " = " + std::to_string(traps_entry.skill)); update_values.push_back(columns[14] + " = " + std::to_string(traps_entry.level)); update_values.push_back(columns[15] + " = " + std::to_string(traps_entry.respawn_time)); @@ -290,14 +290,14 @@ public: update_values.push_back(columns[20] + " = " + std::to_string(traps_entry.undetectable)); update_values.push_back(columns[21] + " = " + std::to_string(traps_entry.min_expansion)); update_values.push_back(columns[22] + " = " + std::to_string(traps_entry.max_expansion)); - update_values.push_back(columns[23] + " = '" + EscapeString(traps_entry.content_flags) + "'"); - update_values.push_back(columns[24] + " = '" + EscapeString(traps_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[23] + " = '" + Strings::Escape(traps_entry.content_flags) + "'"); + update_values.push_back(columns[24] + " = '" + Strings::Escape(traps_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), traps_entry.id ) @@ -314,7 +314,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(traps_entry.id)); - insert_values.push_back("'" + EscapeString(traps_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(traps_entry.zone) + "'"); insert_values.push_back(std::to_string(traps_entry.version)); insert_values.push_back(std::to_string(traps_entry.x)); insert_values.push_back(std::to_string(traps_entry.y)); @@ -325,7 +325,7 @@ public: insert_values.push_back(std::to_string(traps_entry.effect)); insert_values.push_back(std::to_string(traps_entry.effectvalue)); insert_values.push_back(std::to_string(traps_entry.effectvalue2)); - insert_values.push_back("'" + EscapeString(traps_entry.message) + "'"); + insert_values.push_back("'" + Strings::Escape(traps_entry.message) + "'"); insert_values.push_back(std::to_string(traps_entry.skill)); insert_values.push_back(std::to_string(traps_entry.level)); insert_values.push_back(std::to_string(traps_entry.respawn_time)); @@ -336,14 +336,14 @@ public: insert_values.push_back(std::to_string(traps_entry.undetectable)); insert_values.push_back(std::to_string(traps_entry.min_expansion)); insert_values.push_back(std::to_string(traps_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(traps_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(traps_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(traps_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(traps_entry.content_flags_disabled) + "'"); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -368,7 +368,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(traps_entry.id)); - insert_values.push_back("'" + EscapeString(traps_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(traps_entry.zone) + "'"); insert_values.push_back(std::to_string(traps_entry.version)); insert_values.push_back(std::to_string(traps_entry.x)); insert_values.push_back(std::to_string(traps_entry.y)); @@ -379,7 +379,7 @@ public: insert_values.push_back(std::to_string(traps_entry.effect)); insert_values.push_back(std::to_string(traps_entry.effectvalue)); insert_values.push_back(std::to_string(traps_entry.effectvalue2)); - insert_values.push_back("'" + EscapeString(traps_entry.message) + "'"); + insert_values.push_back("'" + Strings::Escape(traps_entry.message) + "'"); insert_values.push_back(std::to_string(traps_entry.skill)); insert_values.push_back(std::to_string(traps_entry.level)); insert_values.push_back(std::to_string(traps_entry.respawn_time)); @@ -390,10 +390,10 @@ public: insert_values.push_back(std::to_string(traps_entry.undetectable)); insert_values.push_back(std::to_string(traps_entry.min_expansion)); insert_values.push_back(std::to_string(traps_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(traps_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(traps_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(traps_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(traps_entry.content_flags_disabled) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -402,7 +402,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_tribute_levels_repository.h b/common/repositories/base/base_tribute_levels_repository.h index 8ed65defc..26440680b 100644 --- a/common/repositories/base/base_tribute_levels_repository.h +++ b/common/repositories/base/base_tribute_levels_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_TRIBUTE_LEVELS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseTributeLevelsRepository { @@ -52,12 +52,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -172,7 +172,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), tribute_levels_entry.tribute_id ) @@ -197,7 +197,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -226,7 +226,7 @@ public: insert_values.push_back(std::to_string(tribute_levels_entry.cost)); insert_values.push_back(std::to_string(tribute_levels_entry.item_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -235,7 +235,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_tributes_repository.h b/common/repositories/base/base_tributes_repository.h index a18729cd8..57bc4dd37 100644 --- a/common/repositories/base/base_tributes_repository.h +++ b/common/repositories/base/base_tributes_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_TRIBUTES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseTributesRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -170,15 +170,15 @@ public: update_values.push_back(columns[0] + " = " + std::to_string(tributes_entry.id)); update_values.push_back(columns[1] + " = " + std::to_string(tributes_entry.unknown)); - update_values.push_back(columns[2] + " = '" + EscapeString(tributes_entry.name) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(tributes_entry.descr) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(tributes_entry.name) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(tributes_entry.descr) + "'"); update_values.push_back(columns[4] + " = " + std::to_string(tributes_entry.isguild)); auto results = db.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), tributes_entry.id ) @@ -196,15 +196,15 @@ public: insert_values.push_back(std::to_string(tributes_entry.id)); insert_values.push_back(std::to_string(tributes_entry.unknown)); - insert_values.push_back("'" + EscapeString(tributes_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(tributes_entry.descr) + "'"); + insert_values.push_back("'" + Strings::Escape(tributes_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(tributes_entry.descr) + "'"); insert_values.push_back(std::to_string(tributes_entry.isguild)); auto results = db.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -230,11 +230,11 @@ public: insert_values.push_back(std::to_string(tributes_entry.id)); insert_values.push_back(std::to_string(tributes_entry.unknown)); - insert_values.push_back("'" + EscapeString(tributes_entry.name) + "'"); - insert_values.push_back("'" + EscapeString(tributes_entry.descr) + "'"); + insert_values.push_back("'" + Strings::Escape(tributes_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(tributes_entry.descr) + "'"); insert_values.push_back(std::to_string(tributes_entry.isguild)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -243,7 +243,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_variables_repository.h b/common/repositories/base/base_variables_repository.h index 8c18ded15..7bbd2bd97 100644 --- a/common/repositories/base/base_variables_repository.h +++ b/common/repositories/base/base_variables_repository.h @@ -30,7 +30,7 @@ #define EQEMU_BASE_VARIABLES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" class BaseVariablesRepository { public: @@ -58,7 +58,7 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string InsertColumnsRaw() @@ -73,7 +73,7 @@ public: insert_columns.push_back(column); } - return std::string(implode(", ", insert_columns)); + return std::string(Strings::Implode(", ", insert_columns)); } static std::string TableName() @@ -176,16 +176,16 @@ public: auto columns = Columns(); - update_values.push_back(columns[0] + " = '" + EscapeString(variables_entry.varname) + "'"); - update_values.push_back(columns[1] + " = '" + EscapeString(variables_entry.value) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(variables_entry.information) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(variables_entry.ts) + "'"); + update_values.push_back(columns[0] + " = '" + Strings::Escape(variables_entry.varname) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(variables_entry.value) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(variables_entry.information) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(variables_entry.ts) + "'"); auto results = database.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), variables_entry.varname ) @@ -200,16 +200,16 @@ public: { std::vector insert_values; - insert_values.push_back("'" + EscapeString(variables_entry.varname) + "'"); - insert_values.push_back("'" + EscapeString(variables_entry.value) + "'"); - insert_values.push_back("'" + EscapeString(variables_entry.information) + "'"); - insert_values.push_back("'" + EscapeString(variables_entry.ts) + "'"); + insert_values.push_back("'" + Strings::Escape(variables_entry.varname) + "'"); + insert_values.push_back("'" + Strings::Escape(variables_entry.value) + "'"); + insert_values.push_back("'" + Strings::Escape(variables_entry.information) + "'"); + insert_values.push_back("'" + Strings::Escape(variables_entry.ts) + "'"); auto results = database.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -232,12 +232,12 @@ public: for (auto &variables_entry: variables_entries) { std::vector insert_values; - insert_values.push_back("'" + EscapeString(variables_entry.varname) + "'"); - insert_values.push_back("'" + EscapeString(variables_entry.value) + "'"); - insert_values.push_back("'" + EscapeString(variables_entry.information) + "'"); - insert_values.push_back("'" + EscapeString(variables_entry.ts) + "'"); + insert_values.push_back("'" + Strings::Escape(variables_entry.varname) + "'"); + insert_values.push_back("'" + Strings::Escape(variables_entry.value) + "'"); + insert_values.push_back("'" + Strings::Escape(variables_entry.information) + "'"); + insert_values.push_back("'" + Strings::Escape(variables_entry.ts) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -246,7 +246,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_veteran_reward_templates_repository.h b/common/repositories/base/base_veteran_reward_templates_repository.h index 9055b15d5..97219a5b9 100644 --- a/common/repositories/base/base_veteran_reward_templates_repository.h +++ b/common/repositories/base/base_veteran_reward_templates_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_VETERAN_REWARD_TEMPLATES_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseVeteranRewardTemplatesRepository { @@ -55,12 +55,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -169,7 +169,7 @@ public: auto columns = Columns(); update_values.push_back(columns[0] + " = " + std::to_string(veteran_reward_templates_entry.claim_id)); - update_values.push_back(columns[1] + " = '" + EscapeString(veteran_reward_templates_entry.name) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(veteran_reward_templates_entry.name) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(veteran_reward_templates_entry.item_id)); update_values.push_back(columns[3] + " = " + std::to_string(veteran_reward_templates_entry.charges)); update_values.push_back(columns[4] + " = " + std::to_string(veteran_reward_templates_entry.reward_slot)); @@ -178,7 +178,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), veteran_reward_templates_entry.claim_id ) @@ -195,7 +195,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(veteran_reward_templates_entry.claim_id)); - insert_values.push_back("'" + EscapeString(veteran_reward_templates_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(veteran_reward_templates_entry.name) + "'"); insert_values.push_back(std::to_string(veteran_reward_templates_entry.item_id)); insert_values.push_back(std::to_string(veteran_reward_templates_entry.charges)); insert_values.push_back(std::to_string(veteran_reward_templates_entry.reward_slot)); @@ -204,7 +204,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -229,12 +229,12 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(veteran_reward_templates_entry.claim_id)); - insert_values.push_back("'" + EscapeString(veteran_reward_templates_entry.name) + "'"); + insert_values.push_back("'" + Strings::Escape(veteran_reward_templates_entry.name) + "'"); insert_values.push_back(std::to_string(veteran_reward_templates_entry.item_id)); insert_values.push_back(std::to_string(veteran_reward_templates_entry.charges)); insert_values.push_back(std::to_string(veteran_reward_templates_entry.reward_slot)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -243,7 +243,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_zone_points_repository.h b/common/repositories/base/base_zone_points_repository.h index b1f288d75..a8d35b647 100644 --- a/common/repositories/base/base_zone_points_repository.h +++ b/common/repositories/base/base_zone_points_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ZONE_POINTS_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseZonePointsRepository { @@ -112,12 +112,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -263,7 +263,7 @@ public: auto columns = Columns(); - update_values.push_back(columns[1] + " = '" + EscapeString(zone_points_entry.zone) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(zone_points_entry.zone) + "'"); update_values.push_back(columns[2] + " = " + std::to_string(zone_points_entry.version)); update_values.push_back(columns[3] + " = " + std::to_string(zone_points_entry.number)); update_values.push_back(columns[4] + " = " + std::to_string(zone_points_entry.y)); @@ -281,8 +281,8 @@ public: update_values.push_back(columns[16] + " = " + std::to_string(zone_points_entry.client_version_mask)); update_values.push_back(columns[17] + " = " + std::to_string(zone_points_entry.min_expansion)); update_values.push_back(columns[18] + " = " + std::to_string(zone_points_entry.max_expansion)); - update_values.push_back(columns[19] + " = '" + EscapeString(zone_points_entry.content_flags) + "'"); - update_values.push_back(columns[20] + " = '" + EscapeString(zone_points_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[19] + " = '" + Strings::Escape(zone_points_entry.content_flags) + "'"); + update_values.push_back(columns[20] + " = '" + Strings::Escape(zone_points_entry.content_flags_disabled) + "'"); update_values.push_back(columns[21] + " = " + std::to_string(zone_points_entry.is_virtual)); update_values.push_back(columns[22] + " = " + std::to_string(zone_points_entry.height)); update_values.push_back(columns[23] + " = " + std::to_string(zone_points_entry.width)); @@ -291,7 +291,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), zone_points_entry.id ) @@ -308,7 +308,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(zone_points_entry.id)); - insert_values.push_back("'" + EscapeString(zone_points_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_points_entry.zone) + "'"); insert_values.push_back(std::to_string(zone_points_entry.version)); insert_values.push_back(std::to_string(zone_points_entry.number)); insert_values.push_back(std::to_string(zone_points_entry.y)); @@ -326,8 +326,8 @@ public: insert_values.push_back(std::to_string(zone_points_entry.client_version_mask)); insert_values.push_back(std::to_string(zone_points_entry.min_expansion)); insert_values.push_back(std::to_string(zone_points_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(zone_points_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(zone_points_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_points_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_points_entry.content_flags_disabled) + "'"); insert_values.push_back(std::to_string(zone_points_entry.is_virtual)); insert_values.push_back(std::to_string(zone_points_entry.height)); insert_values.push_back(std::to_string(zone_points_entry.width)); @@ -336,7 +336,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -361,7 +361,7 @@ public: std::vector insert_values; insert_values.push_back(std::to_string(zone_points_entry.id)); - insert_values.push_back("'" + EscapeString(zone_points_entry.zone) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_points_entry.zone) + "'"); insert_values.push_back(std::to_string(zone_points_entry.version)); insert_values.push_back(std::to_string(zone_points_entry.number)); insert_values.push_back(std::to_string(zone_points_entry.y)); @@ -379,13 +379,13 @@ public: insert_values.push_back(std::to_string(zone_points_entry.client_version_mask)); insert_values.push_back(std::to_string(zone_points_entry.min_expansion)); insert_values.push_back(std::to_string(zone_points_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(zone_points_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(zone_points_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_points_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_points_entry.content_flags_disabled) + "'"); insert_values.push_back(std::to_string(zone_points_entry.is_virtual)); insert_values.push_back(std::to_string(zone_points_entry.height)); insert_values.push_back(std::to_string(zone_points_entry.width)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -394,7 +394,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base/base_zone_repository.h b/common/repositories/base/base_zone_repository.h index c9db5510d..165d4998d 100644 --- a/common/repositories/base/base_zone_repository.h +++ b/common/repositories/base/base_zone_repository.h @@ -13,7 +13,7 @@ #define EQEMU_BASE_ZONE_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class BaseZoneRepository { @@ -322,12 +322,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -613,10 +613,10 @@ public: auto columns = Columns(); - update_values.push_back(columns[0] + " = '" + EscapeString(zone_entry.short_name) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(zone_entry.file_name) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(zone_entry.long_name) + "'"); - update_values.push_back(columns[4] + " = '" + EscapeString(zone_entry.map_file_name) + "'"); + update_values.push_back(columns[0] + " = '" + Strings::Escape(zone_entry.short_name) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(zone_entry.file_name) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(zone_entry.long_name) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(zone_entry.map_file_name) + "'"); update_values.push_back(columns[5] + " = " + std::to_string(zone_entry.safe_x)); update_values.push_back(columns[6] + " = " + std::to_string(zone_entry.safe_y)); update_values.push_back(columns[7] + " = " + std::to_string(zone_entry.safe_z)); @@ -629,7 +629,7 @@ public: update_values.push_back(columns[14] + " = " + std::to_string(zone_entry.timezone)); update_values.push_back(columns[15] + " = " + std::to_string(zone_entry.maxclients)); update_values.push_back(columns[16] + " = " + std::to_string(zone_entry.ruleset)); - update_values.push_back(columns[17] + " = '" + EscapeString(zone_entry.note) + "'"); + update_values.push_back(columns[17] + " = '" + Strings::Escape(zone_entry.note) + "'"); update_values.push_back(columns[18] + " = " + std::to_string(zone_entry.underworld)); update_values.push_back(columns[19] + " = " + std::to_string(zone_entry.minclip)); update_values.push_back(columns[20] + " = " + std::to_string(zone_entry.maxclip)); @@ -664,7 +664,7 @@ public: update_values.push_back(columns[49] + " = " + std::to_string(zone_entry.fog_minclip4)); update_values.push_back(columns[50] + " = " + std::to_string(zone_entry.fog_maxclip4)); update_values.push_back(columns[51] + " = " + std::to_string(zone_entry.fog_density)); - update_values.push_back(columns[52] + " = '" + EscapeString(zone_entry.flag_needed) + "'"); + update_values.push_back(columns[52] + " = '" + Strings::Escape(zone_entry.flag_needed) + "'"); update_values.push_back(columns[53] + " = " + std::to_string(zone_entry.canbind)); update_values.push_back(columns[54] + " = " + std::to_string(zone_entry.cancombat)); update_values.push_back(columns[55] + " = " + std::to_string(zone_entry.canlevitate)); @@ -701,8 +701,8 @@ public: update_values.push_back(columns[86] + " = " + std::to_string(zone_entry.max_movement_update_range)); update_values.push_back(columns[87] + " = " + std::to_string(zone_entry.min_expansion)); update_values.push_back(columns[88] + " = " + std::to_string(zone_entry.max_expansion)); - update_values.push_back(columns[89] + " = '" + EscapeString(zone_entry.content_flags) + "'"); - update_values.push_back(columns[90] + " = '" + EscapeString(zone_entry.content_flags_disabled) + "'"); + update_values.push_back(columns[89] + " = '" + Strings::Escape(zone_entry.content_flags) + "'"); + update_values.push_back(columns[90] + " = '" + Strings::Escape(zone_entry.content_flags_disabled) + "'"); update_values.push_back(columns[91] + " = " + std::to_string(zone_entry.underworld_teleport_index)); update_values.push_back(columns[92] + " = " + std::to_string(zone_entry.lava_damage)); update_values.push_back(columns[93] + " = " + std::to_string(zone_entry.min_lava_damage)); @@ -711,7 +711,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), zone_entry.id ) @@ -727,11 +727,11 @@ public: { std::vector insert_values; - insert_values.push_back("'" + EscapeString(zone_entry.short_name) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.short_name) + "'"); insert_values.push_back(std::to_string(zone_entry.id)); - insert_values.push_back("'" + EscapeString(zone_entry.file_name) + "'"); - insert_values.push_back("'" + EscapeString(zone_entry.long_name) + "'"); - insert_values.push_back("'" + EscapeString(zone_entry.map_file_name) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.file_name) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.long_name) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.map_file_name) + "'"); insert_values.push_back(std::to_string(zone_entry.safe_x)); insert_values.push_back(std::to_string(zone_entry.safe_y)); insert_values.push_back(std::to_string(zone_entry.safe_z)); @@ -744,7 +744,7 @@ public: insert_values.push_back(std::to_string(zone_entry.timezone)); insert_values.push_back(std::to_string(zone_entry.maxclients)); insert_values.push_back(std::to_string(zone_entry.ruleset)); - insert_values.push_back("'" + EscapeString(zone_entry.note) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.note) + "'"); insert_values.push_back(std::to_string(zone_entry.underworld)); insert_values.push_back(std::to_string(zone_entry.minclip)); insert_values.push_back(std::to_string(zone_entry.maxclip)); @@ -779,7 +779,7 @@ public: insert_values.push_back(std::to_string(zone_entry.fog_minclip4)); insert_values.push_back(std::to_string(zone_entry.fog_maxclip4)); insert_values.push_back(std::to_string(zone_entry.fog_density)); - insert_values.push_back("'" + EscapeString(zone_entry.flag_needed) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.flag_needed) + "'"); insert_values.push_back(std::to_string(zone_entry.canbind)); insert_values.push_back(std::to_string(zone_entry.cancombat)); insert_values.push_back(std::to_string(zone_entry.canlevitate)); @@ -816,8 +816,8 @@ public: insert_values.push_back(std::to_string(zone_entry.max_movement_update_range)); insert_values.push_back(std::to_string(zone_entry.min_expansion)); insert_values.push_back(std::to_string(zone_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(zone_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(zone_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.content_flags_disabled) + "'"); insert_values.push_back(std::to_string(zone_entry.underworld_teleport_index)); insert_values.push_back(std::to_string(zone_entry.lava_damage)); insert_values.push_back(std::to_string(zone_entry.min_lava_damage)); @@ -826,7 +826,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -850,11 +850,11 @@ public: for (auto &zone_entry: zone_entries) { std::vector insert_values; - insert_values.push_back("'" + EscapeString(zone_entry.short_name) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.short_name) + "'"); insert_values.push_back(std::to_string(zone_entry.id)); - insert_values.push_back("'" + EscapeString(zone_entry.file_name) + "'"); - insert_values.push_back("'" + EscapeString(zone_entry.long_name) + "'"); - insert_values.push_back("'" + EscapeString(zone_entry.map_file_name) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.file_name) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.long_name) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.map_file_name) + "'"); insert_values.push_back(std::to_string(zone_entry.safe_x)); insert_values.push_back(std::to_string(zone_entry.safe_y)); insert_values.push_back(std::to_string(zone_entry.safe_z)); @@ -867,7 +867,7 @@ public: insert_values.push_back(std::to_string(zone_entry.timezone)); insert_values.push_back(std::to_string(zone_entry.maxclients)); insert_values.push_back(std::to_string(zone_entry.ruleset)); - insert_values.push_back("'" + EscapeString(zone_entry.note) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.note) + "'"); insert_values.push_back(std::to_string(zone_entry.underworld)); insert_values.push_back(std::to_string(zone_entry.minclip)); insert_values.push_back(std::to_string(zone_entry.maxclip)); @@ -902,7 +902,7 @@ public: insert_values.push_back(std::to_string(zone_entry.fog_minclip4)); insert_values.push_back(std::to_string(zone_entry.fog_maxclip4)); insert_values.push_back(std::to_string(zone_entry.fog_density)); - insert_values.push_back("'" + EscapeString(zone_entry.flag_needed) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.flag_needed) + "'"); insert_values.push_back(std::to_string(zone_entry.canbind)); insert_values.push_back(std::to_string(zone_entry.cancombat)); insert_values.push_back(std::to_string(zone_entry.canlevitate)); @@ -939,13 +939,13 @@ public: insert_values.push_back(std::to_string(zone_entry.max_movement_update_range)); insert_values.push_back(std::to_string(zone_entry.min_expansion)); insert_values.push_back(std::to_string(zone_entry.max_expansion)); - insert_values.push_back("'" + EscapeString(zone_entry.content_flags) + "'"); - insert_values.push_back("'" + EscapeString(zone_entry.content_flags_disabled) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.content_flags) + "'"); + insert_values.push_back("'" + Strings::Escape(zone_entry.content_flags_disabled) + "'"); insert_values.push_back(std::to_string(zone_entry.underworld_teleport_index)); insert_values.push_back(std::to_string(zone_entry.lava_damage)); insert_values.push_back(std::to_string(zone_entry.min_lava_damage)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -954,7 +954,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/base_data_repository.h b/common/repositories/base_data_repository.h index 55bbb781b..e9958a1d6 100644 --- a/common/repositories/base_data_repository.h +++ b/common/repositories/base_data_repository.h @@ -22,7 +22,7 @@ #define EQEMU_BASE_DATA_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_base_data_repository.h" class BaseDataRepository: public BaseBaseDataRepository { diff --git a/common/repositories/blocked_spells_repository.h b/common/repositories/blocked_spells_repository.h index 54d66e493..bb6494bd0 100644 --- a/common/repositories/blocked_spells_repository.h +++ b/common/repositories/blocked_spells_repository.h @@ -22,7 +22,7 @@ #define EQEMU_BLOCKED_SPELLS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_blocked_spells_repository.h" class BlockedSpellsRepository: public BaseBlockedSpellsRepository { diff --git a/common/repositories/books_repository.h b/common/repositories/books_repository.h index 6c2e3db91..8a3b70162 100644 --- a/common/repositories/books_repository.h +++ b/common/repositories/books_repository.h @@ -22,7 +22,7 @@ #define EQEMU_BOOKS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_books_repository.h" class BooksRepository: public BaseBooksRepository { diff --git a/common/repositories/bug_reports_repository.h b/common/repositories/bug_reports_repository.h index 36b2258d2..cc35f11be 100644 --- a/common/repositories/bug_reports_repository.h +++ b/common/repositories/bug_reports_repository.h @@ -22,7 +22,7 @@ #define EQEMU_BUG_REPORTS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_bug_reports_repository.h" class BugReportsRepository: public BaseBugReportsRepository { diff --git a/common/repositories/bugs_repository.h b/common/repositories/bugs_repository.h index 8ca1ac25c..62332a462 100644 --- a/common/repositories/bugs_repository.h +++ b/common/repositories/bugs_repository.h @@ -22,7 +22,7 @@ #define EQEMU_BUGS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_bugs_repository.h" class BugsRepository: public BaseBugsRepository { diff --git a/common/repositories/buyer_repository.h b/common/repositories/buyer_repository.h index d3ecb7585..e2685deef 100644 --- a/common/repositories/buyer_repository.h +++ b/common/repositories/buyer_repository.h @@ -22,7 +22,7 @@ #define EQEMU_BUYER_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_buyer_repository.h" class BuyerRepository: public BaseBuyerRepository { diff --git a/common/repositories/char_create_combinations_repository.h b/common/repositories/char_create_combinations_repository.h index 1d0260958..6257f5d8c 100644 --- a/common/repositories/char_create_combinations_repository.h +++ b/common/repositories/char_create_combinations_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHAR_CREATE_COMBINATIONS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_char_create_combinations_repository.h" class CharCreateCombinationsRepository: public BaseCharCreateCombinationsRepository { diff --git a/common/repositories/char_create_point_allocations_repository.h b/common/repositories/char_create_point_allocations_repository.h index 1fd6cdcb9..9b8da7603 100644 --- a/common/repositories/char_create_point_allocations_repository.h +++ b/common/repositories/char_create_point_allocations_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHAR_CREATE_POINT_ALLOCATIONS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_char_create_point_allocations_repository.h" class CharCreatePointAllocationsRepository: public BaseCharCreatePointAllocationsRepository { diff --git a/common/repositories/char_recipe_list_repository.h b/common/repositories/char_recipe_list_repository.h index f8ff81f01..c800e36e0 100644 --- a/common/repositories/char_recipe_list_repository.h +++ b/common/repositories/char_recipe_list_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHAR_RECIPE_LIST_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_char_recipe_list_repository.h" class CharRecipeListRepository: public BaseCharRecipeListRepository { diff --git a/common/repositories/character_activities_repository.h b/common/repositories/character_activities_repository.h index 9b442958c..3bc20c040 100644 --- a/common/repositories/character_activities_repository.h +++ b/common/repositories/character_activities_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_ACTIVITIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_activities_repository.h" class CharacterActivitiesRepository: public BaseCharacterActivitiesRepository { diff --git a/common/repositories/character_alt_currency_repository.h b/common/repositories/character_alt_currency_repository.h index 3f657b817..2f15074f5 100644 --- a/common/repositories/character_alt_currency_repository.h +++ b/common/repositories/character_alt_currency_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_ALT_CURRENCY_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_alt_currency_repository.h" class CharacterAltCurrencyRepository: public BaseCharacterAltCurrencyRepository { diff --git a/common/repositories/character_alternate_abilities_repository.h b/common/repositories/character_alternate_abilities_repository.h index 6c4bb6f16..d14946a21 100644 --- a/common/repositories/character_alternate_abilities_repository.h +++ b/common/repositories/character_alternate_abilities_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_ALTERNATE_ABILITIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_alternate_abilities_repository.h" class CharacterAlternateAbilitiesRepository: public BaseCharacterAlternateAbilitiesRepository { diff --git a/common/repositories/character_auras_repository.h b/common/repositories/character_auras_repository.h index 5f2669c2a..5853f91d0 100644 --- a/common/repositories/character_auras_repository.h +++ b/common/repositories/character_auras_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_AURAS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_auras_repository.h" class CharacterAurasRepository: public BaseCharacterAurasRepository { diff --git a/common/repositories/character_bandolier_repository.h b/common/repositories/character_bandolier_repository.h index aacaf042d..e7ca1d8e5 100644 --- a/common/repositories/character_bandolier_repository.h +++ b/common/repositories/character_bandolier_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_BANDOLIER_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_bandolier_repository.h" class CharacterBandolierRepository: public BaseCharacterBandolierRepository { diff --git a/common/repositories/character_bind_repository.h b/common/repositories/character_bind_repository.h index 28556c296..7e5834073 100644 --- a/common/repositories/character_bind_repository.h +++ b/common/repositories/character_bind_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_BIND_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_bind_repository.h" class CharacterBindRepository: public BaseCharacterBindRepository { diff --git a/common/repositories/character_buffs_repository.h b/common/repositories/character_buffs_repository.h index d5a05dc3e..f438cc399 100644 --- a/common/repositories/character_buffs_repository.h +++ b/common/repositories/character_buffs_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_BUFFS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_buffs_repository.h" class CharacterBuffsRepository: public BaseCharacterBuffsRepository { diff --git a/common/repositories/character_corpse_items_repository.h b/common/repositories/character_corpse_items_repository.h index 44ff0c7e2..45f22beab 100644 --- a/common/repositories/character_corpse_items_repository.h +++ b/common/repositories/character_corpse_items_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_CORPSE_ITEMS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_corpse_items_repository.h" class CharacterCorpseItemsRepository: public BaseCharacterCorpseItemsRepository { diff --git a/common/repositories/character_corpses_repository.h b/common/repositories/character_corpses_repository.h index 7a0d5af55..846b58a6a 100644 --- a/common/repositories/character_corpses_repository.h +++ b/common/repositories/character_corpses_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_CORPSES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_corpses_repository.h" class CharacterCorpsesRepository: public BaseCharacterCorpsesRepository { diff --git a/common/repositories/character_currency_repository.h b/common/repositories/character_currency_repository.h index 661e4e7fa..26bb90402 100644 --- a/common/repositories/character_currency_repository.h +++ b/common/repositories/character_currency_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_CURRENCY_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_currency_repository.h" class CharacterCurrencyRepository: public BaseCharacterCurrencyRepository { diff --git a/common/repositories/character_data_repository.h b/common/repositories/character_data_repository.h index e8ec2d21d..c6c4708ab 100644 --- a/common/repositories/character_data_repository.h +++ b/common/repositories/character_data_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_DATA_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_data_repository.h" class CharacterDataRepository: public BaseCharacterDataRepository { diff --git a/common/repositories/character_disciplines_repository.h b/common/repositories/character_disciplines_repository.h index dd8dd029b..686b287de 100644 --- a/common/repositories/character_disciplines_repository.h +++ b/common/repositories/character_disciplines_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_DISCIPLINES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_disciplines_repository.h" class CharacterDisciplinesRepository: public BaseCharacterDisciplinesRepository { diff --git a/common/repositories/character_exp_modifiers_repository.h b/common/repositories/character_exp_modifiers_repository.h index fa8dfe158..7de006fa6 100644 --- a/common/repositories/character_exp_modifiers_repository.h +++ b/common/repositories/character_exp_modifiers_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_EXP_MODIFIERS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_exp_modifiers_repository.h" class CharacterExpModifiersRepository: public BaseCharacterExpModifiersRepository { diff --git a/common/repositories/character_expedition_lockouts_repository.h b/common/repositories/character_expedition_lockouts_repository.h index 006bacae1..e4caa277d 100644 --- a/common/repositories/character_expedition_lockouts_repository.h +++ b/common/repositories/character_expedition_lockouts_repository.h @@ -23,7 +23,7 @@ #include "../database.h" #include "../expedition_lockout_timer.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_expedition_lockouts_repository.h" #include @@ -114,9 +114,9 @@ public: FIELD(event_name, '{}') DESC ), joined_character_ids, - EscapeString(expedition_name), + Strings::Escape(expedition_name), joined_character_ids, - EscapeString(ordered_event_name) + Strings::Escape(ordered_event_name) )); std::unordered_map> lockouts; diff --git a/common/repositories/character_inspect_messages_repository.h b/common/repositories/character_inspect_messages_repository.h index e916fd6e3..f9c00cadf 100644 --- a/common/repositories/character_inspect_messages_repository.h +++ b/common/repositories/character_inspect_messages_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_INSPECT_MESSAGES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_inspect_messages_repository.h" class CharacterInspectMessagesRepository: public BaseCharacterInspectMessagesRepository { diff --git a/common/repositories/character_instance_safereturns_repository.h b/common/repositories/character_instance_safereturns_repository.h index 89bfddead..1b03986b1 100644 --- a/common/repositories/character_instance_safereturns_repository.h +++ b/common/repositories/character_instance_safereturns_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_INSTANCE_SAFERETURNS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_instance_safereturns_repository.h" class CharacterInstanceSafereturnsRepository: public BaseCharacterInstanceSafereturnsRepository { @@ -92,7 +92,7 @@ public: safe_heading = VALUES(safe_heading) ), BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) )); if (results.Success()) diff --git a/common/repositories/character_item_recast_repository.h b/common/repositories/character_item_recast_repository.h index 00814ad63..b41848689 100644 --- a/common/repositories/character_item_recast_repository.h +++ b/common/repositories/character_item_recast_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_ITEM_RECAST_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_item_recast_repository.h" class CharacterItemRecastRepository: public BaseCharacterItemRecastRepository { diff --git a/common/repositories/character_languages_repository.h b/common/repositories/character_languages_repository.h index de53ea979..28196e950 100644 --- a/common/repositories/character_languages_repository.h +++ b/common/repositories/character_languages_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_LANGUAGES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_languages_repository.h" class CharacterLanguagesRepository: public BaseCharacterLanguagesRepository { diff --git a/common/repositories/character_leadership_abilities_repository.h b/common/repositories/character_leadership_abilities_repository.h index a2d496001..44b2c0da0 100644 --- a/common/repositories/character_leadership_abilities_repository.h +++ b/common/repositories/character_leadership_abilities_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_LEADERSHIP_ABILITIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_leadership_abilities_repository.h" class CharacterLeadershipAbilitiesRepository: public BaseCharacterLeadershipAbilitiesRepository { diff --git a/common/repositories/character_material_repository.h b/common/repositories/character_material_repository.h index c80f5b050..08f445d0a 100644 --- a/common/repositories/character_material_repository.h +++ b/common/repositories/character_material_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_MATERIAL_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_material_repository.h" class CharacterMaterialRepository: public BaseCharacterMaterialRepository { diff --git a/common/repositories/character_memmed_spells_repository.h b/common/repositories/character_memmed_spells_repository.h index 8e4ac4be7..373ea27f2 100644 --- a/common/repositories/character_memmed_spells_repository.h +++ b/common/repositories/character_memmed_spells_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_MEMMED_SPELLS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_memmed_spells_repository.h" class CharacterMemmedSpellsRepository: public BaseCharacterMemmedSpellsRepository { diff --git a/common/repositories/character_pet_buffs_repository.h b/common/repositories/character_pet_buffs_repository.h index 1667e86df..c65023532 100644 --- a/common/repositories/character_pet_buffs_repository.h +++ b/common/repositories/character_pet_buffs_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_PET_BUFFS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_pet_buffs_repository.h" class CharacterPetBuffsRepository: public BaseCharacterPetBuffsRepository { diff --git a/common/repositories/character_pet_info_repository.h b/common/repositories/character_pet_info_repository.h index fcbf2a8d3..046e4a4fd 100644 --- a/common/repositories/character_pet_info_repository.h +++ b/common/repositories/character_pet_info_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_PET_INFO_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_pet_info_repository.h" class CharacterPetInfoRepository: public BaseCharacterPetInfoRepository { diff --git a/common/repositories/character_pet_inventory_repository.h b/common/repositories/character_pet_inventory_repository.h index ab0570ab2..2ebf8ee85 100644 --- a/common/repositories/character_pet_inventory_repository.h +++ b/common/repositories/character_pet_inventory_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_PET_INVENTORY_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_pet_inventory_repository.h" class CharacterPetInventoryRepository: public BaseCharacterPetInventoryRepository { diff --git a/common/repositories/character_potionbelt_repository.h b/common/repositories/character_potionbelt_repository.h index 8ce1bb71b..7649086fe 100644 --- a/common/repositories/character_potionbelt_repository.h +++ b/common/repositories/character_potionbelt_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_POTIONBELT_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_potionbelt_repository.h" class CharacterPotionbeltRepository: public BaseCharacterPotionbeltRepository { diff --git a/common/repositories/character_recipe_list_repository.h b/common/repositories/character_recipe_list_repository.h index f0a53f099..5edbfd6ea 100644 --- a/common/repositories/character_recipe_list_repository.h +++ b/common/repositories/character_recipe_list_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_RECIPE_LIST_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" class CharacterRecipeListRepository { public: @@ -43,7 +43,7 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string TableName() diff --git a/common/repositories/character_skills_repository.h b/common/repositories/character_skills_repository.h index de2f40f90..271a0127b 100644 --- a/common/repositories/character_skills_repository.h +++ b/common/repositories/character_skills_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_SKILLS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_skills_repository.h" class CharacterSkillsRepository: public BaseCharacterSkillsRepository { diff --git a/common/repositories/character_spells_repository.h b/common/repositories/character_spells_repository.h index 982956ce3..1a00797e6 100644 --- a/common/repositories/character_spells_repository.h +++ b/common/repositories/character_spells_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_SPELLS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_spells_repository.h" class CharacterSpellsRepository: public BaseCharacterSpellsRepository { diff --git a/common/repositories/character_task_timers_repository.h b/common/repositories/character_task_timers_repository.h index 7f0b07962..5bd0730e2 100644 --- a/common/repositories/character_task_timers_repository.h +++ b/common/repositories/character_task_timers_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_TASK_TIMERS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_task_timers_repository.h" class CharacterTaskTimersRepository: public BaseCharacterTaskTimersRepository { diff --git a/common/repositories/character_tasks_repository.h b/common/repositories/character_tasks_repository.h index 71ead2aeb..065291024 100644 --- a/common/repositories/character_tasks_repository.h +++ b/common/repositories/character_tasks_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CHARACTER_TASKS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_character_tasks_repository.h" class CharacterTasksRepository: public BaseCharacterTasksRepository { diff --git a/common/repositories/completed_shared_task_activity_state_repository.h b/common/repositories/completed_shared_task_activity_state_repository.h index afb0ef3fd..ebb1231f5 100644 --- a/common/repositories/completed_shared_task_activity_state_repository.h +++ b/common/repositories/completed_shared_task_activity_state_repository.h @@ -22,7 +22,7 @@ #define EQEMU_COMPLETED_SHARED_TASK_ACTIVITY_STATE_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_completed_shared_task_activity_state_repository.h" class CompletedSharedTaskActivityStateRepository: public BaseCompletedSharedTaskActivityStateRepository { diff --git a/common/repositories/completed_shared_task_members_repository.h b/common/repositories/completed_shared_task_members_repository.h index 6c0cf609a..a865b8ab0 100644 --- a/common/repositories/completed_shared_task_members_repository.h +++ b/common/repositories/completed_shared_task_members_repository.h @@ -22,7 +22,7 @@ #define EQEMU_COMPLETED_SHARED_TASK_MEMBERS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_completed_shared_task_members_repository.h" class CompletedSharedTaskMembersRepository: public BaseCompletedSharedTaskMembersRepository { diff --git a/common/repositories/completed_shared_tasks_repository.h b/common/repositories/completed_shared_tasks_repository.h index bbf46f16c..867a8636e 100644 --- a/common/repositories/completed_shared_tasks_repository.h +++ b/common/repositories/completed_shared_tasks_repository.h @@ -22,7 +22,7 @@ #define EQEMU_COMPLETED_SHARED_TASKS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_completed_shared_tasks_repository.h" class CompletedSharedTasksRepository: public BaseCompletedSharedTasksRepository { diff --git a/common/repositories/completed_tasks_repository.h b/common/repositories/completed_tasks_repository.h index 65a9a2c5c..5800df7a2 100644 --- a/common/repositories/completed_tasks_repository.h +++ b/common/repositories/completed_tasks_repository.h @@ -22,7 +22,7 @@ #define EQEMU_COMPLETED_TASKS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_completed_tasks_repository.h" class CompletedTasksRepository: public BaseCompletedTasksRepository { diff --git a/common/repositories/content_flags_repository.h b/common/repositories/content_flags_repository.h index d9bf0098c..d3b6544ca 100644 --- a/common/repositories/content_flags_repository.h +++ b/common/repositories/content_flags_repository.h @@ -22,7 +22,7 @@ #define EQEMU_CONTENT_FLAGS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_content_flags_repository.h" class ContentFlagsRepository: public BaseContentFlagsRepository { diff --git a/common/repositories/criteria/content_filter_criteria.h b/common/repositories/criteria/content_filter_criteria.h index 8d73eefe4..d44637e58 100644 --- a/common/repositories/criteria/content_filter_criteria.h +++ b/common/repositories/criteria/content_filter_criteria.h @@ -23,7 +23,7 @@ #include #include "../../content/world_content_service.h" -#include "../../string_util.h" +#include "../../strings.h" namespace ContentFilterCriteria { static std::string apply(std::string table_prefix = "") @@ -61,14 +61,14 @@ namespace ContentFilterCriteria { flags_in_filter_enabled = fmt::format( " OR CONCAT(',', {}content_flags, ',') REGEXP ',({}),' ", table_prefix, - implode("|", flags_enabled) + Strings::Implode("|", flags_enabled) ); } if (!flags_disabled.empty()) { flags_in_filter_disabled = fmt::format( " OR CONCAT(',', {}content_flags_disabled, ',') REGEXP ',({}),' ", table_prefix, - implode("|", flags_disabled) + Strings::Implode("|", flags_disabled) ); } diff --git a/common/repositories/damageshieldtypes_repository.h b/common/repositories/damageshieldtypes_repository.h index 3bb4b4fd2..c882d4725 100644 --- a/common/repositories/damageshieldtypes_repository.h +++ b/common/repositories/damageshieldtypes_repository.h @@ -22,7 +22,7 @@ #define EQEMU_DAMAGESHIELDTYPES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_damageshieldtypes_repository.h" class DamageshieldtypesRepository: public BaseDamageshieldtypesRepository { diff --git a/common/repositories/data_buckets_repository.h b/common/repositories/data_buckets_repository.h index d33a56304..0911156ff 100644 --- a/common/repositories/data_buckets_repository.h +++ b/common/repositories/data_buckets_repository.h @@ -22,7 +22,7 @@ #define EQEMU_DATA_BUCKETS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_data_buckets_repository.h" class DataBucketsRepository: public BaseDataBucketsRepository { diff --git a/common/repositories/db_str_repository.h b/common/repositories/db_str_repository.h index 95662cdfa..1a46a92cb 100644 --- a/common/repositories/db_str_repository.h +++ b/common/repositories/db_str_repository.h @@ -22,7 +22,7 @@ #define EQEMU_DB_STR_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_db_str_repository.h" class DbStrRepository: public BaseDbStrRepository { diff --git a/common/repositories/discord_webhooks_repository.h b/common/repositories/discord_webhooks_repository.h index be934945f..987b18481 100644 --- a/common/repositories/discord_webhooks_repository.h +++ b/common/repositories/discord_webhooks_repository.h @@ -22,7 +22,7 @@ #define EQEMU_DISCORD_WEBHOOKS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_discord_webhooks_repository.h" class DiscordWebhooksRepository: public BaseDiscordWebhooksRepository { diff --git a/common/repositories/discovered_items_repository.h b/common/repositories/discovered_items_repository.h index 512ebbbd7..0019695f0 100644 --- a/common/repositories/discovered_items_repository.h +++ b/common/repositories/discovered_items_repository.h @@ -22,7 +22,7 @@ #define EQEMU_DISCOVERED_ITEMS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_discovered_items_repository.h" class DiscoveredItemsRepository: public BaseDiscoveredItemsRepository { diff --git a/common/repositories/doors_repository.h b/common/repositories/doors_repository.h index aa67d8e20..2eab6624c 100644 --- a/common/repositories/doors_repository.h +++ b/common/repositories/doors_repository.h @@ -22,7 +22,7 @@ #define EQEMU_DOORS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_doors_repository.h" class DoorsRepository: public BaseDoorsRepository { diff --git a/common/repositories/dynamic_zone_members_repository.h b/common/repositories/dynamic_zone_members_repository.h index 3ccdd17b8..f75c5b4e5 100644 --- a/common/repositories/dynamic_zone_members_repository.h +++ b/common/repositories/dynamic_zone_members_repository.h @@ -22,7 +22,7 @@ #define EQEMU_DYNAMIC_ZONE_MEMBERS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_dynamic_zone_members_repository.h" class DynamicZoneMembersRepository: public BaseDynamicZoneMembersRepository { @@ -210,7 +210,7 @@ public: insert_values.push_back(std::to_string(dynamic_zone_members_entry.dynamic_zone_id)); insert_values.push_back(std::to_string(dynamic_zone_members_entry.character_id)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -220,7 +220,7 @@ public: "INSERT INTO {} ({}) VALUES {} ON DUPLICATE KEY UPDATE id = id;", TableName(), ColumnsRaw(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/dynamic_zones_repository.h b/common/repositories/dynamic_zones_repository.h index 677fcc2f8..8af92bf25 100644 --- a/common/repositories/dynamic_zones_repository.h +++ b/common/repositories/dynamic_zones_repository.h @@ -22,7 +22,7 @@ #define EQEMU_DYNAMIC_ZONES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_dynamic_zones_repository.h" class DynamicZonesRepository: public BaseDynamicZonesRepository { diff --git a/common/repositories/eventlog_repository.h b/common/repositories/eventlog_repository.h index f2d7ba369..8098c88af 100644 --- a/common/repositories/eventlog_repository.h +++ b/common/repositories/eventlog_repository.h @@ -22,7 +22,7 @@ #define EQEMU_EVENTLOG_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_eventlog_repository.h" class EventlogRepository: public BaseEventlogRepository { diff --git a/common/repositories/expedition_lockouts_repository.h b/common/repositories/expedition_lockouts_repository.h index 5eab18915..a8d73735d 100644 --- a/common/repositories/expedition_lockouts_repository.h +++ b/common/repositories/expedition_lockouts_repository.h @@ -22,7 +22,7 @@ #define EQEMU_EXPEDITION_LOCKOUTS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_expedition_lockouts_repository.h" class ExpeditionLockoutsRepository: public BaseExpeditionLockoutsRepository { diff --git a/common/repositories/expeditions_repository.h b/common/repositories/expeditions_repository.h index 1470cbad0..f06aaa54d 100644 --- a/common/repositories/expeditions_repository.h +++ b/common/repositories/expeditions_repository.h @@ -22,7 +22,7 @@ #define EQEMU_EXPEDITIONS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_expeditions_repository.h" class ExpeditionsRepository: public BaseExpeditionsRepository { diff --git a/common/repositories/faction_base_data_repository.h b/common/repositories/faction_base_data_repository.h index f62890768..528c0644a 100644 --- a/common/repositories/faction_base_data_repository.h +++ b/common/repositories/faction_base_data_repository.h @@ -22,7 +22,7 @@ #define EQEMU_FACTION_BASE_DATA_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_faction_base_data_repository.h" class FactionBaseDataRepository: public BaseFactionBaseDataRepository { diff --git a/common/repositories/faction_list_mod_repository.h b/common/repositories/faction_list_mod_repository.h index 2999a273b..8132e0cb8 100644 --- a/common/repositories/faction_list_mod_repository.h +++ b/common/repositories/faction_list_mod_repository.h @@ -22,7 +22,7 @@ #define EQEMU_FACTION_LIST_MOD_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_faction_list_mod_repository.h" class FactionListModRepository: public BaseFactionListModRepository { diff --git a/common/repositories/faction_list_repository.h b/common/repositories/faction_list_repository.h index ef14bac7f..a445f89ce 100644 --- a/common/repositories/faction_list_repository.h +++ b/common/repositories/faction_list_repository.h @@ -22,7 +22,7 @@ #define EQEMU_FACTION_LIST_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_faction_list_repository.h" class FactionListRepository: public BaseFactionListRepository { diff --git a/common/repositories/faction_values_repository.h b/common/repositories/faction_values_repository.h index 5c8ca4fe6..fcabbc8eb 100644 --- a/common/repositories/faction_values_repository.h +++ b/common/repositories/faction_values_repository.h @@ -22,7 +22,7 @@ #define EQEMU_FACTION_VALUES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_faction_values_repository.h" class FactionValuesRepository: public BaseFactionValuesRepository { diff --git a/common/repositories/fishing_repository.h b/common/repositories/fishing_repository.h index d5cd78cb7..2b585908f 100644 --- a/common/repositories/fishing_repository.h +++ b/common/repositories/fishing_repository.h @@ -22,7 +22,7 @@ #define EQEMU_FISHING_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_fishing_repository.h" class FishingRepository: public BaseFishingRepository { diff --git a/common/repositories/forage_repository.h b/common/repositories/forage_repository.h index 7f8e67c19..4fdcc283b 100644 --- a/common/repositories/forage_repository.h +++ b/common/repositories/forage_repository.h @@ -22,7 +22,7 @@ #define EQEMU_FORAGE_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_forage_repository.h" class ForageRepository: public BaseForageRepository { diff --git a/common/repositories/friends_repository.h b/common/repositories/friends_repository.h index 0e0d0469a..fe858fec1 100644 --- a/common/repositories/friends_repository.h +++ b/common/repositories/friends_repository.h @@ -22,7 +22,7 @@ #define EQEMU_FRIENDS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_friends_repository.h" class FriendsRepository: public BaseFriendsRepository { diff --git a/common/repositories/global_loot_repository.h b/common/repositories/global_loot_repository.h index 519fee2d4..f353d6a64 100644 --- a/common/repositories/global_loot_repository.h +++ b/common/repositories/global_loot_repository.h @@ -22,7 +22,7 @@ #define EQEMU_GLOBAL_LOOT_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_global_loot_repository.h" class GlobalLootRepository: public BaseGlobalLootRepository { diff --git a/common/repositories/gm_ips_repository.h b/common/repositories/gm_ips_repository.h index 94289a519..508261e50 100644 --- a/common/repositories/gm_ips_repository.h +++ b/common/repositories/gm_ips_repository.h @@ -22,7 +22,7 @@ #define EQEMU_GM_IPS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_gm_ips_repository.h" class GmIpsRepository: public BaseGmIpsRepository { diff --git a/common/repositories/goallists_repository.h b/common/repositories/goallists_repository.h index 781fd6200..074ee1ccf 100644 --- a/common/repositories/goallists_repository.h +++ b/common/repositories/goallists_repository.h @@ -22,7 +22,7 @@ #define EQEMU_GOALLISTS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_goallists_repository.h" class GoallistsRepository: public BaseGoallistsRepository { diff --git a/common/repositories/graveyard_repository.h b/common/repositories/graveyard_repository.h index b427587a4..15110298a 100644 --- a/common/repositories/graveyard_repository.h +++ b/common/repositories/graveyard_repository.h @@ -22,7 +22,7 @@ #define EQEMU_GRAVEYARD_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_graveyard_repository.h" class GraveyardRepository: public BaseGraveyardRepository { diff --git a/common/repositories/grid_entries_repository.h b/common/repositories/grid_entries_repository.h index bbdd2c321..1fcc04bdd 100644 --- a/common/repositories/grid_entries_repository.h +++ b/common/repositories/grid_entries_repository.h @@ -22,7 +22,7 @@ #define EQEMU_GRID_ENTRIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" class GridEntriesRepository { public: @@ -55,7 +55,7 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string TableName() diff --git a/common/repositories/grid_repository.h b/common/repositories/grid_repository.h index ea965546e..0f989e842 100644 --- a/common/repositories/grid_repository.h +++ b/common/repositories/grid_repository.h @@ -22,7 +22,7 @@ #define EQEMU_GRID_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_grid_repository.h" class GridRepository : public BaseGridRepository { diff --git a/common/repositories/ground_spawns_repository.h b/common/repositories/ground_spawns_repository.h index 79d0e9454..9d2da57cd 100644 --- a/common/repositories/ground_spawns_repository.h +++ b/common/repositories/ground_spawns_repository.h @@ -22,7 +22,7 @@ #define EQEMU_GROUND_SPAWNS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_ground_spawns_repository.h" class GroundSpawnsRepository: public BaseGroundSpawnsRepository { diff --git a/common/repositories/group_id_repository.h b/common/repositories/group_id_repository.h index 403dec551..418a08069 100644 --- a/common/repositories/group_id_repository.h +++ b/common/repositories/group_id_repository.h @@ -22,7 +22,7 @@ #define EQEMU_GROUP_ID_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_group_id_repository.h" class GroupIdRepository: public BaseGroupIdRepository { diff --git a/common/repositories/group_leaders_repository.h b/common/repositories/group_leaders_repository.h index 811a6757e..4ad47c27d 100644 --- a/common/repositories/group_leaders_repository.h +++ b/common/repositories/group_leaders_repository.h @@ -22,7 +22,7 @@ #define EQEMU_GROUP_LEADERS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_group_leaders_repository.h" class GroupLeadersRepository: public BaseGroupLeadersRepository { diff --git a/common/repositories/guild_bank_repository.h b/common/repositories/guild_bank_repository.h index d23b66653..12e9c9f89 100644 --- a/common/repositories/guild_bank_repository.h +++ b/common/repositories/guild_bank_repository.h @@ -22,7 +22,7 @@ #define EQEMU_GUILD_BANK_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" class GuildBankRepository { public: @@ -58,7 +58,7 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string InsertColumnsRaw() @@ -73,7 +73,7 @@ public: insert_columns.push_back(column); } - return std::string(implode(", ", insert_columns)); + return std::string(Strings::Implode(", ", insert_columns)); } static std::string TableName() @@ -189,15 +189,15 @@ public: update_values.push_back(columns[2] + " = " + std::to_string(guild_bank_entry.slot)); update_values.push_back(columns[3] + " = " + std::to_string(guild_bank_entry.itemid)); update_values.push_back(columns[4] + " = " + std::to_string(guild_bank_entry.qty)); - update_values.push_back(columns[5] + " = '" + EscapeString(guild_bank_entry.donator) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(guild_bank_entry.donator) + "'"); update_values.push_back(columns[6] + " = " + std::to_string(guild_bank_entry.permissions)); - update_values.push_back(columns[7] + " = '" + EscapeString(guild_bank_entry.whofor) + "'"); + update_values.push_back(columns[7] + " = '" + Strings::Escape(guild_bank_entry.whofor) + "'"); auto results = database.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), guild_bank_entry. ) @@ -217,15 +217,15 @@ public: insert_values.push_back(std::to_string(guild_bank_entry.slot)); insert_values.push_back(std::to_string(guild_bank_entry.itemid)); insert_values.push_back(std::to_string(guild_bank_entry.qty)); - insert_values.push_back("'" + EscapeString(guild_bank_entry.donator) + "'"); + insert_values.push_back("'" + Strings::Escape(guild_bank_entry.donator) + "'"); insert_values.push_back(std::to_string(guild_bank_entry.permissions)); - insert_values.push_back("'" + EscapeString(guild_bank_entry.whofor) + "'"); + insert_values.push_back("'" + Strings::Escape(guild_bank_entry.whofor) + "'"); auto results = database.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -253,11 +253,11 @@ public: insert_values.push_back(std::to_string(guild_bank_entry.slot)); insert_values.push_back(std::to_string(guild_bank_entry.itemid)); insert_values.push_back(std::to_string(guild_bank_entry.qty)); - insert_values.push_back("'" + EscapeString(guild_bank_entry.donator) + "'"); + insert_values.push_back("'" + Strings::Escape(guild_bank_entry.donator) + "'"); insert_values.push_back(std::to_string(guild_bank_entry.permissions)); - insert_values.push_back("'" + EscapeString(guild_bank_entry.whofor) + "'"); + insert_values.push_back("'" + Strings::Escape(guild_bank_entry.whofor) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -266,7 +266,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/guild_members_repository.h b/common/repositories/guild_members_repository.h index 3afa2f198..ad67c30ca 100644 --- a/common/repositories/guild_members_repository.h +++ b/common/repositories/guild_members_repository.h @@ -22,7 +22,7 @@ #define EQEMU_GUILD_MEMBERS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_guild_members_repository.h" class GuildMembersRepository: public BaseGuildMembersRepository { diff --git a/common/repositories/guild_ranks_repository.h b/common/repositories/guild_ranks_repository.h index 949227b49..08696a2e4 100644 --- a/common/repositories/guild_ranks_repository.h +++ b/common/repositories/guild_ranks_repository.h @@ -22,7 +22,7 @@ #define EQEMU_GUILD_RANKS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_guild_ranks_repository.h" class GuildRanksRepository: public BaseGuildRanksRepository { diff --git a/common/repositories/guild_relations_repository.h b/common/repositories/guild_relations_repository.h index 59b5cca5e..a78707771 100644 --- a/common/repositories/guild_relations_repository.h +++ b/common/repositories/guild_relations_repository.h @@ -22,7 +22,7 @@ #define EQEMU_GUILD_RELATIONS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_guild_relations_repository.h" class GuildRelationsRepository: public BaseGuildRelationsRepository { diff --git a/common/repositories/guilds_repository.h b/common/repositories/guilds_repository.h index c563f5cad..ade49cfba 100644 --- a/common/repositories/guilds_repository.h +++ b/common/repositories/guilds_repository.h @@ -22,7 +22,7 @@ #define EQEMU_GUILDS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_guilds_repository.h" class GuildsRepository: public BaseGuildsRepository { diff --git a/common/repositories/hackers_repository.h b/common/repositories/hackers_repository.h index 89c5de5b1..32a4a0748 100644 --- a/common/repositories/hackers_repository.h +++ b/common/repositories/hackers_repository.h @@ -22,7 +22,7 @@ #define EQEMU_HACKERS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_hackers_repository.h" class HackersRepository: public BaseHackersRepository { diff --git a/common/repositories/horses_repository.h b/common/repositories/horses_repository.h index 66211d3ca..35788d00b 100644 --- a/common/repositories/horses_repository.h +++ b/common/repositories/horses_repository.h @@ -22,7 +22,7 @@ #define EQEMU_HORSES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_horses_repository.h" class HorsesRepository: public BaseHorsesRepository { diff --git a/common/repositories/instance_list_player_repository.h b/common/repositories/instance_list_player_repository.h index 3a526a73e..9ea7397ab 100644 --- a/common/repositories/instance_list_player_repository.h +++ b/common/repositories/instance_list_player_repository.h @@ -22,7 +22,7 @@ #define EQEMU_INSTANCE_LIST_PLAYER_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_instance_list_player_repository.h" class InstanceListPlayerRepository: public BaseInstanceListPlayerRepository { @@ -77,7 +77,7 @@ public: insert_values.push_back(std::to_string(instance_list_player_entry.id)); insert_values.push_back(std::to_string(instance_list_player_entry.charid)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -87,7 +87,7 @@ public: "INSERT INTO {} ({}) VALUES {} ON DUPLICATE KEY UPDATE id = VALUES(id)", TableName(), ColumnsRaw(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/instance_list_repository.h b/common/repositories/instance_list_repository.h index 6af82e302..8bd2a1ab7 100644 --- a/common/repositories/instance_list_repository.h +++ b/common/repositories/instance_list_repository.h @@ -22,7 +22,7 @@ #define EQEMU_INSTANCE_LIST_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_instance_list_repository.h" class InstanceListRepository: public BaseInstanceListRepository { diff --git a/common/repositories/inventory_repository.h b/common/repositories/inventory_repository.h index 176cd2989..9c79dd88a 100644 --- a/common/repositories/inventory_repository.h +++ b/common/repositories/inventory_repository.h @@ -22,7 +22,7 @@ #define EQEMU_INVENTORY_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_inventory_repository.h" class InventoryRepository: public BaseInventoryRepository { diff --git a/common/repositories/inventory_snapshots_repository.h b/common/repositories/inventory_snapshots_repository.h index 2ad48abe4..30e2d1a27 100644 --- a/common/repositories/inventory_snapshots_repository.h +++ b/common/repositories/inventory_snapshots_repository.h @@ -22,7 +22,7 @@ #define EQEMU_INVENTORY_SNAPSHOTS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_inventory_snapshots_repository.h" class InventorySnapshotsRepository: public BaseInventorySnapshotsRepository { diff --git a/common/repositories/inventory_versions_repository.h b/common/repositories/inventory_versions_repository.h index 4469756de..32e048750 100644 --- a/common/repositories/inventory_versions_repository.h +++ b/common/repositories/inventory_versions_repository.h @@ -22,7 +22,7 @@ #define EQEMU_INVENTORY_VERSIONS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" class InventoryVersionsRepository { public: @@ -48,7 +48,7 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string InsertColumnsRaw() @@ -63,7 +63,7 @@ public: insert_columns.push_back(column); } - return std::string(implode(", ", insert_columns)); + return std::string(Strings::Implode(", ", insert_columns)); } static std::string TableName() @@ -172,7 +172,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), inventory_versions_entry. ) @@ -195,7 +195,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -222,7 +222,7 @@ public: insert_values.push_back(std::to_string(inventory_versions_entry.step)); insert_values.push_back(std::to_string(inventory_versions_entry.bot_step)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -231,7 +231,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/ip_exemptions_repository.h b/common/repositories/ip_exemptions_repository.h index e21ea22a0..3804f69f0 100644 --- a/common/repositories/ip_exemptions_repository.h +++ b/common/repositories/ip_exemptions_repository.h @@ -22,7 +22,7 @@ #define EQEMU_IP_EXEMPTIONS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_ip_exemptions_repository.h" class IpExemptionsRepository: public BaseIpExemptionsRepository { diff --git a/common/repositories/item_tick_repository.h b/common/repositories/item_tick_repository.h index 0cd798479..72ca5c074 100644 --- a/common/repositories/item_tick_repository.h +++ b/common/repositories/item_tick_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ITEM_TICK_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_item_tick_repository.h" class ItemTickRepository: public BaseItemTickRepository { diff --git a/common/repositories/items_repository.h b/common/repositories/items_repository.h index 20be4f024..a87604b01 100644 --- a/common/repositories/items_repository.h +++ b/common/repositories/items_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ITEMS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_items_repository.h" class ItemsRepository: public BaseItemsRepository { diff --git a/common/repositories/ldon_trap_entries_repository.h b/common/repositories/ldon_trap_entries_repository.h index 38847056b..063dfadf4 100644 --- a/common/repositories/ldon_trap_entries_repository.h +++ b/common/repositories/ldon_trap_entries_repository.h @@ -22,7 +22,7 @@ #define EQEMU_LDON_TRAP_ENTRIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_ldon_trap_entries_repository.h" class LdonTrapEntriesRepository: public BaseLdonTrapEntriesRepository { diff --git a/common/repositories/ldon_trap_templates_repository.h b/common/repositories/ldon_trap_templates_repository.h index 1f0aaffc1..8d2c09adf 100644 --- a/common/repositories/ldon_trap_templates_repository.h +++ b/common/repositories/ldon_trap_templates_repository.h @@ -22,7 +22,7 @@ #define EQEMU_LDON_TRAP_TEMPLATES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_ldon_trap_templates_repository.h" class LdonTrapTemplatesRepository: public BaseLdonTrapTemplatesRepository { diff --git a/common/repositories/level_exp_mods_repository.h b/common/repositories/level_exp_mods_repository.h index cd52eb4fb..db257329f 100644 --- a/common/repositories/level_exp_mods_repository.h +++ b/common/repositories/level_exp_mods_repository.h @@ -22,7 +22,7 @@ #define EQEMU_LEVEL_EXP_MODS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_level_exp_mods_repository.h" class LevelExpModsRepository: public BaseLevelExpModsRepository { diff --git a/common/repositories/lfguild_repository.h b/common/repositories/lfguild_repository.h index 202e0c0dd..efa9af744 100644 --- a/common/repositories/lfguild_repository.h +++ b/common/repositories/lfguild_repository.h @@ -22,7 +22,7 @@ #define EQEMU_LFGUILD_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_lfguild_repository.h" class LfguildRepository: public BaseLfguildRepository { diff --git a/common/repositories/login_accounts_repository.h b/common/repositories/login_accounts_repository.h index 0bc1a1340..785d2f3b3 100644 --- a/common/repositories/login_accounts_repository.h +++ b/common/repositories/login_accounts_repository.h @@ -22,7 +22,7 @@ #define EQEMU_LOGIN_ACCOUNTS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_login_accounts_repository.h" class LoginAccountsRepository: public BaseLoginAccountsRepository { diff --git a/common/repositories/login_api_tokens_repository.h b/common/repositories/login_api_tokens_repository.h index a0b941c9e..fde27d893 100644 --- a/common/repositories/login_api_tokens_repository.h +++ b/common/repositories/login_api_tokens_repository.h @@ -22,7 +22,7 @@ #define EQEMU_LOGIN_API_TOKENS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_login_api_tokens_repository.h" class LoginApiTokensRepository: public BaseLoginApiTokensRepository { diff --git a/common/repositories/login_server_admins_repository.h b/common/repositories/login_server_admins_repository.h index cb75cf60e..143b72ed5 100644 --- a/common/repositories/login_server_admins_repository.h +++ b/common/repositories/login_server_admins_repository.h @@ -22,7 +22,7 @@ #define EQEMU_LOGIN_SERVER_ADMINS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_login_server_admins_repository.h" class LoginServerAdminsRepository: public BaseLoginServerAdminsRepository { diff --git a/common/repositories/login_server_list_types_repository.h b/common/repositories/login_server_list_types_repository.h index 84554c769..5ce0034e0 100644 --- a/common/repositories/login_server_list_types_repository.h +++ b/common/repositories/login_server_list_types_repository.h @@ -22,7 +22,7 @@ #define EQEMU_LOGIN_SERVER_LIST_TYPES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_login_server_list_types_repository.h" class LoginServerListTypesRepository: public BaseLoginServerListTypesRepository { diff --git a/common/repositories/login_world_servers_repository.h b/common/repositories/login_world_servers_repository.h index c0af6aaa1..8b3b8119e 100644 --- a/common/repositories/login_world_servers_repository.h +++ b/common/repositories/login_world_servers_repository.h @@ -22,7 +22,7 @@ #define EQEMU_LOGIN_WORLD_SERVERS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_login_world_servers_repository.h" class LoginWorldServersRepository: public BaseLoginWorldServersRepository { diff --git a/common/repositories/logsys_categories_repository.h b/common/repositories/logsys_categories_repository.h index ab494f1e8..33b497cfd 100644 --- a/common/repositories/logsys_categories_repository.h +++ b/common/repositories/logsys_categories_repository.h @@ -22,7 +22,7 @@ #define EQEMU_LOGSYS_CATEGORIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_logsys_categories_repository.h" class LogsysCategoriesRepository: public BaseLogsysCategoriesRepository { diff --git a/common/repositories/lootdrop_entries_repository.h b/common/repositories/lootdrop_entries_repository.h index 39d4abf3a..43ed1b91f 100644 --- a/common/repositories/lootdrop_entries_repository.h +++ b/common/repositories/lootdrop_entries_repository.h @@ -22,7 +22,7 @@ #define EQEMU_LOOTDROP_ENTRIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_lootdrop_entries_repository.h" class LootdropEntriesRepository: public BaseLootdropEntriesRepository { diff --git a/common/repositories/lootdrop_repository.h b/common/repositories/lootdrop_repository.h index 732e23a0b..ded0fabc8 100644 --- a/common/repositories/lootdrop_repository.h +++ b/common/repositories/lootdrop_repository.h @@ -22,7 +22,7 @@ #define EQEMU_LOOTDROP_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_lootdrop_repository.h" class LootdropRepository: public BaseLootdropRepository { diff --git a/common/repositories/loottable_entries_repository.h b/common/repositories/loottable_entries_repository.h index 52720c10a..aa1b28d5b 100644 --- a/common/repositories/loottable_entries_repository.h +++ b/common/repositories/loottable_entries_repository.h @@ -22,7 +22,7 @@ #define EQEMU_LOOTTABLE_ENTRIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_loottable_entries_repository.h" class LoottableEntriesRepository: public BaseLoottableEntriesRepository { diff --git a/common/repositories/loottable_repository.h b/common/repositories/loottable_repository.h index c16d6cea7..fbd61a966 100644 --- a/common/repositories/loottable_repository.h +++ b/common/repositories/loottable_repository.h @@ -22,7 +22,7 @@ #define EQEMU_LOOTTABLE_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_loottable_repository.h" class LoottableRepository: public BaseLoottableRepository { diff --git a/common/repositories/mail_repository.h b/common/repositories/mail_repository.h index 04aec17f2..37993df63 100644 --- a/common/repositories/mail_repository.h +++ b/common/repositories/mail_repository.h @@ -22,7 +22,7 @@ #define EQEMU_MAIL_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_mail_repository.h" class MailRepository: public BaseMailRepository { diff --git a/common/repositories/merchantlist_repository.h b/common/repositories/merchantlist_repository.h index ab0229315..d8d876f4c 100644 --- a/common/repositories/merchantlist_repository.h +++ b/common/repositories/merchantlist_repository.h @@ -22,7 +22,7 @@ #define EQEMU_MERCHANTLIST_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_merchantlist_repository.h" class MerchantlistRepository: public BaseMerchantlistRepository { diff --git a/common/repositories/merchantlist_temp_repository.h b/common/repositories/merchantlist_temp_repository.h index ceaae788f..76c069d9b 100644 --- a/common/repositories/merchantlist_temp_repository.h +++ b/common/repositories/merchantlist_temp_repository.h @@ -22,7 +22,7 @@ #define EQEMU_MERCHANTLIST_TEMP_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_merchantlist_temp_repository.h" class MerchantlistTempRepository: public BaseMerchantlistTempRepository { diff --git a/common/repositories/name_filter_repository.h b/common/repositories/name_filter_repository.h index 3cf63f55b..b93b62429 100644 --- a/common/repositories/name_filter_repository.h +++ b/common/repositories/name_filter_repository.h @@ -22,7 +22,7 @@ #define EQEMU_NAME_FILTER_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_name_filter_repository.h" class NameFilterRepository: public BaseNameFilterRepository { diff --git a/common/repositories/npc_emotes_repository.h b/common/repositories/npc_emotes_repository.h index ef855b1f0..844b64d62 100644 --- a/common/repositories/npc_emotes_repository.h +++ b/common/repositories/npc_emotes_repository.h @@ -22,7 +22,7 @@ #define EQEMU_NPC_EMOTES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_npc_emotes_repository.h" class NpcEmotesRepository: public BaseNpcEmotesRepository { diff --git a/common/repositories/npc_faction_entries_repository.h b/common/repositories/npc_faction_entries_repository.h index 48182fd24..eb1b2ae23 100644 --- a/common/repositories/npc_faction_entries_repository.h +++ b/common/repositories/npc_faction_entries_repository.h @@ -22,7 +22,7 @@ #define EQEMU_NPC_FACTION_ENTRIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_npc_faction_entries_repository.h" class NpcFactionEntriesRepository: public BaseNpcFactionEntriesRepository { diff --git a/common/repositories/npc_faction_repository.h b/common/repositories/npc_faction_repository.h index 73bf0a94a..720b84db3 100644 --- a/common/repositories/npc_faction_repository.h +++ b/common/repositories/npc_faction_repository.h @@ -22,7 +22,7 @@ #define EQEMU_NPC_FACTION_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_npc_faction_repository.h" class NpcFactionRepository: public BaseNpcFactionRepository { diff --git a/common/repositories/npc_scale_global_base_repository.h b/common/repositories/npc_scale_global_base_repository.h index b0748e18a..cf1e2cc08 100644 --- a/common/repositories/npc_scale_global_base_repository.h +++ b/common/repositories/npc_scale_global_base_repository.h @@ -22,7 +22,7 @@ #define EQEMU_NPC_SCALE_GLOBAL_BASE_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_npc_scale_global_base_repository.h" class NpcScaleGlobalBaseRepository: public BaseNpcScaleGlobalBaseRepository { diff --git a/common/repositories/npc_spells_effects_entries_repository.h b/common/repositories/npc_spells_effects_entries_repository.h index 101edc188..83757062b 100644 --- a/common/repositories/npc_spells_effects_entries_repository.h +++ b/common/repositories/npc_spells_effects_entries_repository.h @@ -22,7 +22,7 @@ #define EQEMU_NPC_SPELLS_EFFECTS_ENTRIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_npc_spells_effects_entries_repository.h" class NpcSpellsEffectsEntriesRepository: public BaseNpcSpellsEffectsEntriesRepository { diff --git a/common/repositories/npc_spells_effects_repository.h b/common/repositories/npc_spells_effects_repository.h index eeeb500b9..ceeb723a1 100644 --- a/common/repositories/npc_spells_effects_repository.h +++ b/common/repositories/npc_spells_effects_repository.h @@ -22,7 +22,7 @@ #define EQEMU_NPC_SPELLS_EFFECTS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_npc_spells_effects_repository.h" class NpcSpellsEffectsRepository: public BaseNpcSpellsEffectsRepository { diff --git a/common/repositories/npc_spells_entries_repository.h b/common/repositories/npc_spells_entries_repository.h index 15a971843..2fbfcc4b9 100644 --- a/common/repositories/npc_spells_entries_repository.h +++ b/common/repositories/npc_spells_entries_repository.h @@ -22,7 +22,7 @@ #define EQEMU_NPC_SPELLS_ENTRIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_npc_spells_entries_repository.h" class NpcSpellsEntriesRepository: public BaseNpcSpellsEntriesRepository { diff --git a/common/repositories/npc_spells_repository.h b/common/repositories/npc_spells_repository.h index 3ecd8d4f9..a55e5d23d 100644 --- a/common/repositories/npc_spells_repository.h +++ b/common/repositories/npc_spells_repository.h @@ -22,7 +22,7 @@ #define EQEMU_NPC_SPELLS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_npc_spells_repository.h" class NpcSpellsRepository: public BaseNpcSpellsRepository { diff --git a/common/repositories/npc_types_repository.h b/common/repositories/npc_types_repository.h index d89a306a0..e28f39af8 100644 --- a/common/repositories/npc_types_repository.h +++ b/common/repositories/npc_types_repository.h @@ -22,7 +22,7 @@ #define EQEMU_NPC_TYPES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_npc_types_repository.h" class NpcTypesRepository: public BaseNpcTypesRepository { diff --git a/common/repositories/npc_types_tint_repository.h b/common/repositories/npc_types_tint_repository.h index 21bf02322..3270c4517 100644 --- a/common/repositories/npc_types_tint_repository.h +++ b/common/repositories/npc_types_tint_repository.h @@ -22,7 +22,7 @@ #define EQEMU_NPC_TYPES_TINT_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_npc_types_tint_repository.h" class NpcTypesTintRepository: public BaseNpcTypesTintRepository { diff --git a/common/repositories/object_contents_repository.h b/common/repositories/object_contents_repository.h index c7a308241..d5f3780d9 100644 --- a/common/repositories/object_contents_repository.h +++ b/common/repositories/object_contents_repository.h @@ -22,7 +22,7 @@ #define EQEMU_OBJECT_CONTENTS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_object_contents_repository.h" class ObjectContentsRepository: public BaseObjectContentsRepository { diff --git a/common/repositories/object_repository.h b/common/repositories/object_repository.h index 30df82443..6937559b2 100644 --- a/common/repositories/object_repository.h +++ b/common/repositories/object_repository.h @@ -22,7 +22,7 @@ #define EQEMU_OBJECT_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_object_repository.h" class ObjectRepository: public BaseObjectRepository { diff --git a/common/repositories/perl_event_export_settings_repository.h b/common/repositories/perl_event_export_settings_repository.h index 1c441bb76..8d02fc2a9 100644 --- a/common/repositories/perl_event_export_settings_repository.h +++ b/common/repositories/perl_event_export_settings_repository.h @@ -22,7 +22,7 @@ #define EQEMU_PERL_EVENT_EXPORT_SETTINGS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_perl_event_export_settings_repository.h" class PerlEventExportSettingsRepository: public BasePerlEventExportSettingsRepository { diff --git a/common/repositories/petitions_repository.h b/common/repositories/petitions_repository.h index 505f97986..862b5fe3e 100644 --- a/common/repositories/petitions_repository.h +++ b/common/repositories/petitions_repository.h @@ -22,7 +22,7 @@ #define EQEMU_PETITIONS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_petitions_repository.h" class PetitionsRepository: public BasePetitionsRepository { diff --git a/common/repositories/pets_beastlord_data_repository.h b/common/repositories/pets_beastlord_data_repository.h index 8d4bb55da..8d1f4c203 100644 --- a/common/repositories/pets_beastlord_data_repository.h +++ b/common/repositories/pets_beastlord_data_repository.h @@ -22,7 +22,7 @@ #define EQEMU_PETS_BEASTLORD_DATA_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_pets_beastlord_data_repository.h" class PetsBeastlordDataRepository: public BasePetsBeastlordDataRepository { diff --git a/common/repositories/pets_equipmentset_entries_repository.h b/common/repositories/pets_equipmentset_entries_repository.h index 866b65e31..cf9b8d3e0 100644 --- a/common/repositories/pets_equipmentset_entries_repository.h +++ b/common/repositories/pets_equipmentset_entries_repository.h @@ -22,7 +22,7 @@ #define EQEMU_PETS_EQUIPMENTSET_ENTRIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_pets_equipmentset_entries_repository.h" class PetsEquipmentsetEntriesRepository: public BasePetsEquipmentsetEntriesRepository { diff --git a/common/repositories/pets_equipmentset_repository.h b/common/repositories/pets_equipmentset_repository.h index 1042972ab..29f857881 100644 --- a/common/repositories/pets_equipmentset_repository.h +++ b/common/repositories/pets_equipmentset_repository.h @@ -22,7 +22,7 @@ #define EQEMU_PETS_EQUIPMENTSET_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_pets_equipmentset_repository.h" class PetsEquipmentsetRepository: public BasePetsEquipmentsetRepository { diff --git a/common/repositories/pets_repository.h b/common/repositories/pets_repository.h index 8aa99fde5..d7815d026 100644 --- a/common/repositories/pets_repository.h +++ b/common/repositories/pets_repository.h @@ -22,7 +22,7 @@ #define EQEMU_PETS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_pets_repository.h" class PetsRepository: public BasePetsRepository { diff --git a/common/repositories/player_titlesets_repository.h b/common/repositories/player_titlesets_repository.h index 330b9ba48..bb7f79476 100644 --- a/common/repositories/player_titlesets_repository.h +++ b/common/repositories/player_titlesets_repository.h @@ -22,7 +22,7 @@ #define EQEMU_PLAYER_TITLESETS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_player_titlesets_repository.h" class PlayerTitlesetsRepository: public BasePlayerTitlesetsRepository { diff --git a/common/repositories/proximities_repository.h b/common/repositories/proximities_repository.h index 3044c2348..0f089f6f9 100644 --- a/common/repositories/proximities_repository.h +++ b/common/repositories/proximities_repository.h @@ -22,7 +22,7 @@ #define EQEMU_PROXIMITIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_proximities_repository.h" class ProximitiesRepository: public BaseProximitiesRepository { diff --git a/common/repositories/quest_globals_repository.h b/common/repositories/quest_globals_repository.h index 6be19d286..5e4f1095b 100644 --- a/common/repositories/quest_globals_repository.h +++ b/common/repositories/quest_globals_repository.h @@ -22,7 +22,7 @@ #define EQEMU_QUEST_GLOBALS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_quest_globals_repository.h" class QuestGlobalsRepository: public BaseQuestGlobalsRepository { diff --git a/common/repositories/raid_details_repository.h b/common/repositories/raid_details_repository.h index a9763096c..58f44f0bb 100644 --- a/common/repositories/raid_details_repository.h +++ b/common/repositories/raid_details_repository.h @@ -22,7 +22,7 @@ #define EQEMU_RAID_DETAILS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_raid_details_repository.h" class RaidDetailsRepository: public BaseRaidDetailsRepository { diff --git a/common/repositories/raid_leaders_repository.h b/common/repositories/raid_leaders_repository.h index 592f0ca01..03b258e39 100644 --- a/common/repositories/raid_leaders_repository.h +++ b/common/repositories/raid_leaders_repository.h @@ -22,7 +22,7 @@ #define EQEMU_RAID_LEADERS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" class RaidLeadersRepository { public: @@ -60,7 +60,7 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string InsertColumnsRaw() @@ -75,7 +75,7 @@ public: insert_columns.push_back(column); } - return std::string(implode(", ", insert_columns)); + return std::string(Strings::Implode(", ", insert_columns)); } static std::string TableName() @@ -190,19 +190,19 @@ public: update_values.push_back(columns[0] + " = " + std::to_string(raid_leaders_entry.gid)); update_values.push_back(columns[1] + " = " + std::to_string(raid_leaders_entry.rid)); - update_values.push_back(columns[2] + " = '" + EscapeString(raid_leaders_entry.marknpc) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(raid_leaders_entry.maintank) + "'"); - update_values.push_back(columns[4] + " = '" + EscapeString(raid_leaders_entry.assist) + "'"); - update_values.push_back(columns[5] + " = '" + EscapeString(raid_leaders_entry.puller) + "'"); - update_values.push_back(columns[6] + " = '" + EscapeString(raid_leaders_entry.leadershipaa) + "'"); - update_values.push_back(columns[7] + " = '" + EscapeString(raid_leaders_entry.mentoree) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(raid_leaders_entry.marknpc) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(raid_leaders_entry.maintank) + "'"); + update_values.push_back(columns[4] + " = '" + Strings::Escape(raid_leaders_entry.assist) + "'"); + update_values.push_back(columns[5] + " = '" + Strings::Escape(raid_leaders_entry.puller) + "'"); + update_values.push_back(columns[6] + " = '" + Strings::Escape(raid_leaders_entry.leadershipaa) + "'"); + update_values.push_back(columns[7] + " = '" + Strings::Escape(raid_leaders_entry.mentoree) + "'"); update_values.push_back(columns[8] + " = " + std::to_string(raid_leaders_entry.mentor_percent)); auto results = database.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), raid_leaders_entry. ) @@ -219,19 +219,19 @@ public: insert_values.push_back(std::to_string(raid_leaders_entry.gid)); insert_values.push_back(std::to_string(raid_leaders_entry.rid)); - insert_values.push_back("'" + EscapeString(raid_leaders_entry.marknpc) + "'"); - insert_values.push_back("'" + EscapeString(raid_leaders_entry.maintank) + "'"); - insert_values.push_back("'" + EscapeString(raid_leaders_entry.assist) + "'"); - insert_values.push_back("'" + EscapeString(raid_leaders_entry.puller) + "'"); - insert_values.push_back("'" + EscapeString(raid_leaders_entry.leadershipaa) + "'"); - insert_values.push_back("'" + EscapeString(raid_leaders_entry.mentoree) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_leaders_entry.marknpc) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_leaders_entry.maintank) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_leaders_entry.assist) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_leaders_entry.puller) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_leaders_entry.leadershipaa) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_leaders_entry.mentoree) + "'"); insert_values.push_back(std::to_string(raid_leaders_entry.mentor_percent)); auto results = database.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -256,15 +256,15 @@ public: insert_values.push_back(std::to_string(raid_leaders_entry.gid)); insert_values.push_back(std::to_string(raid_leaders_entry.rid)); - insert_values.push_back("'" + EscapeString(raid_leaders_entry.marknpc) + "'"); - insert_values.push_back("'" + EscapeString(raid_leaders_entry.maintank) + "'"); - insert_values.push_back("'" + EscapeString(raid_leaders_entry.assist) + "'"); - insert_values.push_back("'" + EscapeString(raid_leaders_entry.puller) + "'"); - insert_values.push_back("'" + EscapeString(raid_leaders_entry.leadershipaa) + "'"); - insert_values.push_back("'" + EscapeString(raid_leaders_entry.mentoree) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_leaders_entry.marknpc) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_leaders_entry.maintank) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_leaders_entry.assist) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_leaders_entry.puller) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_leaders_entry.leadershipaa) + "'"); + insert_values.push_back("'" + Strings::Escape(raid_leaders_entry.mentoree) + "'"); insert_values.push_back(std::to_string(raid_leaders_entry.mentor_percent)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -273,7 +273,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/raid_members_repository.h b/common/repositories/raid_members_repository.h index 1d904dfa6..76e1d0c39 100644 --- a/common/repositories/raid_members_repository.h +++ b/common/repositories/raid_members_repository.h @@ -22,7 +22,7 @@ #define EQEMU_RAID_MEMBERS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_raid_members_repository.h" class RaidMembersRepository: public BaseRaidMembersRepository { diff --git a/common/repositories/reports_repository.h b/common/repositories/reports_repository.h index 4b94ce7c8..a7b9b2512 100644 --- a/common/repositories/reports_repository.h +++ b/common/repositories/reports_repository.h @@ -22,7 +22,7 @@ #define EQEMU_REPORTS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_reports_repository.h" class ReportsRepository: public BaseReportsRepository { diff --git a/common/repositories/respawn_times_repository.h b/common/repositories/respawn_times_repository.h index 09561f056..85d6604b8 100644 --- a/common/repositories/respawn_times_repository.h +++ b/common/repositories/respawn_times_repository.h @@ -22,7 +22,7 @@ #define EQEMU_RESPAWN_TIMES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_respawn_times_repository.h" class RespawnTimesRepository: public BaseRespawnTimesRepository { diff --git a/common/repositories/rule_sets_repository.h b/common/repositories/rule_sets_repository.h index 20fae60d6..f2c1a364e 100644 --- a/common/repositories/rule_sets_repository.h +++ b/common/repositories/rule_sets_repository.h @@ -22,7 +22,7 @@ #define EQEMU_RULE_SETS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_rule_sets_repository.h" class RuleSetsRepository: public BaseRuleSetsRepository { diff --git a/common/repositories/rule_values_repository.h b/common/repositories/rule_values_repository.h index 703fd07a1..74e024734 100644 --- a/common/repositories/rule_values_repository.h +++ b/common/repositories/rule_values_repository.h @@ -22,7 +22,7 @@ #define EQEMU_RULE_VALUES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_rule_values_repository.h" class RuleValuesRepository: public BaseRuleValuesRepository { diff --git a/common/repositories/saylink_repository.h b/common/repositories/saylink_repository.h index a2abaceae..902a762e5 100644 --- a/common/repositories/saylink_repository.h +++ b/common/repositories/saylink_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SAYLINK_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_saylink_repository.h" class SaylinkRepository: public BaseSaylinkRepository { diff --git a/common/repositories/server_scheduled_events_repository.h b/common/repositories/server_scheduled_events_repository.h index edcc21dbc..33a683638 100644 --- a/common/repositories/server_scheduled_events_repository.h +++ b/common/repositories/server_scheduled_events_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SERVER_SCHEDULED_EVENTS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_server_scheduled_events_repository.h" class ServerScheduledEventsRepository: public BaseServerScheduledEventsRepository { diff --git a/common/repositories/shared_task_activity_state_repository.h b/common/repositories/shared_task_activity_state_repository.h index 1e48c7e76..281fd0b81 100644 --- a/common/repositories/shared_task_activity_state_repository.h +++ b/common/repositories/shared_task_activity_state_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SHARED_TASK_ACTIVITY_STATE_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_shared_task_activity_state_repository.h" class SharedTaskActivityStateRepository: public BaseSharedTaskActivityStateRepository { diff --git a/common/repositories/shared_task_dynamic_zones_repository.h b/common/repositories/shared_task_dynamic_zones_repository.h index 61ee9c9f5..cc0440f0b 100644 --- a/common/repositories/shared_task_dynamic_zones_repository.h +++ b/common/repositories/shared_task_dynamic_zones_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SHARED_TASK_DYNAMIC_ZONES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_shared_task_dynamic_zones_repository.h" class SharedTaskDynamicZonesRepository: public BaseSharedTaskDynamicZonesRepository { diff --git a/common/repositories/shared_task_members_repository.h b/common/repositories/shared_task_members_repository.h index 51b8606ad..b296f083a 100644 --- a/common/repositories/shared_task_members_repository.h +++ b/common/repositories/shared_task_members_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SHARED_TASK_MEMBERS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_shared_task_members_repository.h" class SharedTaskMembersRepository: public BaseSharedTaskMembersRepository { diff --git a/common/repositories/shared_tasks_repository.h b/common/repositories/shared_tasks_repository.h index 3ec764beb..3d14db9e1 100644 --- a/common/repositories/shared_tasks_repository.h +++ b/common/repositories/shared_tasks_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SHARED_TASKS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_shared_tasks_repository.h" class SharedTasksRepository: public BaseSharedTasksRepository { diff --git a/common/repositories/sharedbank_repository.h b/common/repositories/sharedbank_repository.h index 440412ff4..001931f6a 100644 --- a/common/repositories/sharedbank_repository.h +++ b/common/repositories/sharedbank_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SHAREDBANK_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" class SharedbankRepository { public: @@ -64,7 +64,7 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string InsertColumnsRaw() @@ -79,7 +79,7 @@ public: insert_columns.push_back(column); } - return std::string(implode(", ", insert_columns)); + return std::string(Strings::Implode(", ", insert_columns)); } static std::string TableName() @@ -206,13 +206,13 @@ public: update_values.push_back(columns[7] + " = " + std::to_string(sharedbank_entry.augslot4)); update_values.push_back(columns[8] + " = " + std::to_string(sharedbank_entry.augslot5)); update_values.push_back(columns[9] + " = " + std::to_string(sharedbank_entry.augslot6)); - update_values.push_back(columns[10] + " = '" + EscapeString(sharedbank_entry.custom_data) + "'"); + update_values.push_back(columns[10] + " = '" + Strings::Escape(sharedbank_entry.custom_data) + "'"); auto results = database.QueryDatabase( fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), sharedbank_entry. ) @@ -237,13 +237,13 @@ public: insert_values.push_back(std::to_string(sharedbank_entry.augslot4)); insert_values.push_back(std::to_string(sharedbank_entry.augslot5)); insert_values.push_back(std::to_string(sharedbank_entry.augslot6)); - insert_values.push_back("'" + EscapeString(sharedbank_entry.custom_data) + "'"); + insert_values.push_back("'" + Strings::Escape(sharedbank_entry.custom_data) + "'"); auto results = database.QueryDatabase( fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -276,9 +276,9 @@ public: insert_values.push_back(std::to_string(sharedbank_entry.augslot4)); insert_values.push_back(std::to_string(sharedbank_entry.augslot5)); insert_values.push_back(std::to_string(sharedbank_entry.augslot6)); - insert_values.push_back("'" + EscapeString(sharedbank_entry.custom_data) + "'"); + insert_values.push_back("'" + Strings::Escape(sharedbank_entry.custom_data) + "'"); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -287,7 +287,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/skill_caps_repository.h b/common/repositories/skill_caps_repository.h index 9ecbe24f2..5798b6c89 100644 --- a/common/repositories/skill_caps_repository.h +++ b/common/repositories/skill_caps_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SKILL_CAPS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_skill_caps_repository.h" class SkillCapsRepository: public BaseSkillCapsRepository { diff --git a/common/repositories/spawn2_repository.h b/common/repositories/spawn2_repository.h index fd633c738..310e32ba6 100644 --- a/common/repositories/spawn2_repository.h +++ b/common/repositories/spawn2_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SPAWN2_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_spawn2_repository.h" class Spawn2Repository: public BaseSpawn2Repository { diff --git a/common/repositories/spawn_condition_values_repository.h b/common/repositories/spawn_condition_values_repository.h index 96a5a7ee7..a056a8fbe 100644 --- a/common/repositories/spawn_condition_values_repository.h +++ b/common/repositories/spawn_condition_values_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SPAWN_CONDITION_VALUES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_spawn_condition_values_repository.h" class SpawnConditionValuesRepository: public BaseSpawnConditionValuesRepository { diff --git a/common/repositories/spawn_conditions_repository.h b/common/repositories/spawn_conditions_repository.h index 3e0197eb0..4d3e84a09 100644 --- a/common/repositories/spawn_conditions_repository.h +++ b/common/repositories/spawn_conditions_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SPAWN_CONDITIONS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_spawn_conditions_repository.h" class SpawnConditionsRepository: public BaseSpawnConditionsRepository { diff --git a/common/repositories/spawn_events_repository.h b/common/repositories/spawn_events_repository.h index 2df6b981e..bbd91888f 100644 --- a/common/repositories/spawn_events_repository.h +++ b/common/repositories/spawn_events_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SPAWN_EVENTS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_spawn_events_repository.h" class SpawnEventsRepository: public BaseSpawnEventsRepository { diff --git a/common/repositories/spawnentry_repository.h b/common/repositories/spawnentry_repository.h index 67416e61c..f813da315 100644 --- a/common/repositories/spawnentry_repository.h +++ b/common/repositories/spawnentry_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SPAWNENTRY_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_spawnentry_repository.h" class SpawnentryRepository: public BaseSpawnentryRepository { diff --git a/common/repositories/spawngroup_repository.h b/common/repositories/spawngroup_repository.h index b9390b958..c741ed705 100644 --- a/common/repositories/spawngroup_repository.h +++ b/common/repositories/spawngroup_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SPAWNGROUP_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_spawngroup_repository.h" class SpawngroupRepository: public BaseSpawngroupRepository { diff --git a/common/repositories/spell_buckets_repository.h b/common/repositories/spell_buckets_repository.h index 547ac3a3b..55fb29e10 100644 --- a/common/repositories/spell_buckets_repository.h +++ b/common/repositories/spell_buckets_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SPELL_BUCKETS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_spell_buckets_repository.h" class SpellBucketsRepository: public BaseSpellBucketsRepository { diff --git a/common/repositories/spell_globals_repository.h b/common/repositories/spell_globals_repository.h index eb6f19587..7172fa78d 100644 --- a/common/repositories/spell_globals_repository.h +++ b/common/repositories/spell_globals_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SPELL_GLOBALS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_spell_globals_repository.h" class SpellGlobalsRepository: public BaseSpellGlobalsRepository { diff --git a/common/repositories/spells_new_repository.h b/common/repositories/spells_new_repository.h index 3da162558..bbdd7e3a5 100644 --- a/common/repositories/spells_new_repository.h +++ b/common/repositories/spells_new_repository.h @@ -22,7 +22,7 @@ #define EQEMU_SPELLS_NEW_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_spells_new_repository.h" class SpellsNewRepository: public BaseSpellsNewRepository { diff --git a/common/repositories/start_zones_repository.h b/common/repositories/start_zones_repository.h index fedafb7d9..ab987ad58 100644 --- a/common/repositories/start_zones_repository.h +++ b/common/repositories/start_zones_repository.h @@ -22,7 +22,7 @@ #define EQEMU_START_ZONES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_start_zones_repository.h" class StartZonesRepository: public BaseStartZonesRepository { diff --git a/common/repositories/starting_items_repository.h b/common/repositories/starting_items_repository.h index 2a8d25f45..cdacee34b 100644 --- a/common/repositories/starting_items_repository.h +++ b/common/repositories/starting_items_repository.h @@ -22,7 +22,7 @@ #define EQEMU_STARTING_ITEMS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_starting_items_repository.h" class StartingItemsRepository: public BaseStartingItemsRepository { diff --git a/common/repositories/task_activities_repository.h b/common/repositories/task_activities_repository.h index b66bb8eee..b3c79340d 100644 --- a/common/repositories/task_activities_repository.h +++ b/common/repositories/task_activities_repository.h @@ -22,7 +22,7 @@ #define EQEMU_TASK_ACTIVITIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_task_activities_repository.h" class TaskActivitiesRepository: public BaseTaskActivitiesRepository { diff --git a/common/repositories/tasks_repository.h b/common/repositories/tasks_repository.h index 1e91ca9f6..26b9de229 100644 --- a/common/repositories/tasks_repository.h +++ b/common/repositories/tasks_repository.h @@ -22,7 +22,7 @@ #define EQEMU_TASKS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_tasks_repository.h" class TasksRepository: public BaseTasksRepository { diff --git a/common/repositories/tasksets_repository.h b/common/repositories/tasksets_repository.h index a98364993..42cf15116 100644 --- a/common/repositories/tasksets_repository.h +++ b/common/repositories/tasksets_repository.h @@ -22,7 +22,7 @@ #define EQEMU_TASKSETS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_tasksets_repository.h" class TasksetsRepository: public BaseTasksetsRepository { diff --git a/common/repositories/template/base_repository.template b/common/repositories/template/base_repository.template index d4ab7b6fc..128d8505a 100644 --- a/common/repositories/template/base_repository.template +++ b/common/repositories/template/base_repository.template @@ -13,7 +13,7 @@ #define EQEMU_BASE_{{TABLE_NAME_UPPER}}_REPOSITORY_H #include "../../database.h" -#include "../../string_util.h" +#include "../../strings.h" #include class Base{{TABLE_NAME_CLASS}}Repository { @@ -43,12 +43,12 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string SelectColumnsRaw() { - return std::string(implode(", ", SelectColumns())); + return std::string(Strings::Implode(", ", SelectColumns())); } static std::string TableName() @@ -153,7 +153,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), {{TABLE_NAME_VAR}}_entry.{{PRIMARY_KEY_STRING}} ) @@ -175,7 +175,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -201,7 +201,7 @@ public: {{INSERT_MANY_ENTRIES}} - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -210,7 +210,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/template/repository.template b/common/repositories/template/repository.template index 00d5b6db3..09e8f10a7 100644 --- a/common/repositories/template/repository.template +++ b/common/repositories/template/repository.template @@ -22,7 +22,7 @@ #define EQEMU_{{TABLE_NAME_UPPER}}_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_{{TABLE_NAME_VAR}}_repository.h" class {{TABLE_NAME_CLASS}}Repository: public Base{{TABLE_NAME_CLASS}}Repository { diff --git a/common/repositories/timers_repository.h b/common/repositories/timers_repository.h index dcd867210..e0490b57b 100644 --- a/common/repositories/timers_repository.h +++ b/common/repositories/timers_repository.h @@ -22,7 +22,7 @@ #define EQEMU_TIMERS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_timers_repository.h" class TimersRepository: public BaseTimersRepository { diff --git a/common/repositories/titles_repository.h b/common/repositories/titles_repository.h index 32b9fd5e3..d74b9735d 100644 --- a/common/repositories/titles_repository.h +++ b/common/repositories/titles_repository.h @@ -22,7 +22,7 @@ #define EQEMU_TITLES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_titles_repository.h" class TitlesRepository: public BaseTitlesRepository { diff --git a/common/repositories/tool_game_objects_repository.h b/common/repositories/tool_game_objects_repository.h index d4d6009b5..d25043305 100644 --- a/common/repositories/tool_game_objects_repository.h +++ b/common/repositories/tool_game_objects_repository.h @@ -22,7 +22,7 @@ #define EQEMU_TOOL_GAME_OBJECTS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_tool_game_objects_repository.h" class ToolGameObjectsRepository: public BaseToolGameObjectsRepository { diff --git a/common/repositories/trader_audit_repository.h b/common/repositories/trader_audit_repository.h index e7be6f677..d0773e506 100644 --- a/common/repositories/trader_audit_repository.h +++ b/common/repositories/trader_audit_repository.h @@ -22,7 +22,7 @@ #define EQEMU_TRADER_AUDIT_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" class TraderAuditRepository { public: @@ -56,7 +56,7 @@ public: static std::string ColumnsRaw() { - return std::string(implode(", ", Columns())); + return std::string(Strings::Implode(", ", Columns())); } static std::string InsertColumnsRaw() @@ -71,7 +71,7 @@ public: insert_columns.push_back(column); } - return std::string(implode(", ", insert_columns)); + return std::string(Strings::Implode(", ", insert_columns)); } static std::string TableName() @@ -180,10 +180,10 @@ public: auto columns = Columns(); - update_values.push_back(columns[0] + " = '" + EscapeString(trader_audit_entry.time) + "'"); - update_values.push_back(columns[1] + " = '" + EscapeString(trader_audit_entry.seller) + "'"); - update_values.push_back(columns[2] + " = '" + EscapeString(trader_audit_entry.buyer) + "'"); - update_values.push_back(columns[3] + " = '" + EscapeString(trader_audit_entry.itemname) + "'"); + update_values.push_back(columns[0] + " = '" + Strings::Escape(trader_audit_entry.time) + "'"); + update_values.push_back(columns[1] + " = '" + Strings::Escape(trader_audit_entry.seller) + "'"); + update_values.push_back(columns[2] + " = '" + Strings::Escape(trader_audit_entry.buyer) + "'"); + update_values.push_back(columns[3] + " = '" + Strings::Escape(trader_audit_entry.itemname) + "'"); update_values.push_back(columns[4] + " = " + std::to_string(trader_audit_entry.quantity)); update_values.push_back(columns[5] + " = " + std::to_string(trader_audit_entry.totalcost)); update_values.push_back(columns[6] + " = " + std::to_string(trader_audit_entry.trantype)); @@ -192,7 +192,7 @@ public: fmt::format( "UPDATE {} SET {} WHERE {} = {}", TableName(), - implode(", ", update_values), + Strings::Implode(", ", update_values), PrimaryKey(), trader_audit_entry. ) @@ -207,10 +207,10 @@ public: { std::vector insert_values; - insert_values.push_back("'" + EscapeString(trader_audit_entry.time) + "'"); - insert_values.push_back("'" + EscapeString(trader_audit_entry.seller) + "'"); - insert_values.push_back("'" + EscapeString(trader_audit_entry.buyer) + "'"); - insert_values.push_back("'" + EscapeString(trader_audit_entry.itemname) + "'"); + insert_values.push_back("'" + Strings::Escape(trader_audit_entry.time) + "'"); + insert_values.push_back("'" + Strings::Escape(trader_audit_entry.seller) + "'"); + insert_values.push_back("'" + Strings::Escape(trader_audit_entry.buyer) + "'"); + insert_values.push_back("'" + Strings::Escape(trader_audit_entry.itemname) + "'"); insert_values.push_back(std::to_string(trader_audit_entry.quantity)); insert_values.push_back(std::to_string(trader_audit_entry.totalcost)); insert_values.push_back(std::to_string(trader_audit_entry.trantype)); @@ -219,7 +219,7 @@ public: fmt::format( "{} VALUES ({})", BaseInsert(), - implode(",", insert_values) + Strings::Implode(",", insert_values) ) ); @@ -242,15 +242,15 @@ public: for (auto &trader_audit_entry: trader_audit_entries) { std::vector insert_values; - insert_values.push_back("'" + EscapeString(trader_audit_entry.time) + "'"); - insert_values.push_back("'" + EscapeString(trader_audit_entry.seller) + "'"); - insert_values.push_back("'" + EscapeString(trader_audit_entry.buyer) + "'"); - insert_values.push_back("'" + EscapeString(trader_audit_entry.itemname) + "'"); + insert_values.push_back("'" + Strings::Escape(trader_audit_entry.time) + "'"); + insert_values.push_back("'" + Strings::Escape(trader_audit_entry.seller) + "'"); + insert_values.push_back("'" + Strings::Escape(trader_audit_entry.buyer) + "'"); + insert_values.push_back("'" + Strings::Escape(trader_audit_entry.itemname) + "'"); insert_values.push_back(std::to_string(trader_audit_entry.quantity)); insert_values.push_back(std::to_string(trader_audit_entry.totalcost)); insert_values.push_back(std::to_string(trader_audit_entry.trantype)); - insert_chunks.push_back("(" + implode(",", insert_values) + ")"); + insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); } std::vector insert_values; @@ -259,7 +259,7 @@ public: fmt::format( "{} VALUES {}", BaseInsert(), - implode(",", insert_chunks) + Strings::Implode(",", insert_chunks) ) ); diff --git a/common/repositories/trader_repository.h b/common/repositories/trader_repository.h index 50cf496f5..d8fc47357 100644 --- a/common/repositories/trader_repository.h +++ b/common/repositories/trader_repository.h @@ -22,7 +22,7 @@ #define EQEMU_TRADER_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_trader_repository.h" class TraderRepository: public BaseTraderRepository { diff --git a/common/repositories/tradeskill_recipe_entries_repository.h b/common/repositories/tradeskill_recipe_entries_repository.h index 5a2f3b1ea..9ffa49519 100644 --- a/common/repositories/tradeskill_recipe_entries_repository.h +++ b/common/repositories/tradeskill_recipe_entries_repository.h @@ -22,7 +22,7 @@ #define EQEMU_TRADESKILL_RECIPE_ENTRIES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_tradeskill_recipe_entries_repository.h" class TradeskillRecipeEntriesRepository: public BaseTradeskillRecipeEntriesRepository { diff --git a/common/repositories/tradeskill_recipe_repository.h b/common/repositories/tradeskill_recipe_repository.h index 2f94d586f..9f9c3e01c 100644 --- a/common/repositories/tradeskill_recipe_repository.h +++ b/common/repositories/tradeskill_recipe_repository.h @@ -22,7 +22,7 @@ #define EQEMU_TRADESKILL_RECIPE_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_tradeskill_recipe_repository.h" class TradeskillRecipeRepository: public BaseTradeskillRecipeRepository { diff --git a/common/repositories/traps_repository.h b/common/repositories/traps_repository.h index 76d1e217b..579857a9b 100644 --- a/common/repositories/traps_repository.h +++ b/common/repositories/traps_repository.h @@ -22,7 +22,7 @@ #define EQEMU_TRAPS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_traps_repository.h" class TrapsRepository: public BaseTrapsRepository { diff --git a/common/repositories/tribute_levels_repository.h b/common/repositories/tribute_levels_repository.h index 04391798d..5100d05d0 100644 --- a/common/repositories/tribute_levels_repository.h +++ b/common/repositories/tribute_levels_repository.h @@ -22,7 +22,7 @@ #define EQEMU_TRIBUTE_LEVELS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_tribute_levels_repository.h" class TributeLevelsRepository: public BaseTributeLevelsRepository { diff --git a/common/repositories/tributes_repository.h b/common/repositories/tributes_repository.h index 860588524..793987301 100644 --- a/common/repositories/tributes_repository.h +++ b/common/repositories/tributes_repository.h @@ -22,7 +22,7 @@ #define EQEMU_TRIBUTES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_tributes_repository.h" class TributesRepository: public BaseTributesRepository { diff --git a/common/repositories/variables_repository.h b/common/repositories/variables_repository.h index 6e07e1bb2..f4ffedbe9 100644 --- a/common/repositories/variables_repository.h +++ b/common/repositories/variables_repository.h @@ -22,7 +22,7 @@ #define EQEMU_VARIABLES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_variables_repository.h" class VariablesRepository: public BaseVariablesRepository { diff --git a/common/repositories/veteran_reward_templates_repository.h b/common/repositories/veteran_reward_templates_repository.h index 3e9ad2745..a4246ad53 100644 --- a/common/repositories/veteran_reward_templates_repository.h +++ b/common/repositories/veteran_reward_templates_repository.h @@ -22,7 +22,7 @@ #define EQEMU_VETERAN_REWARD_TEMPLATES_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_veteran_reward_templates_repository.h" class VeteranRewardTemplatesRepository: public BaseVeteranRewardTemplatesRepository { diff --git a/common/repositories/zone_points_repository.h b/common/repositories/zone_points_repository.h index a4f885fc6..8c404c382 100644 --- a/common/repositories/zone_points_repository.h +++ b/common/repositories/zone_points_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ZONE_POINTS_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_zone_points_repository.h" class ZonePointsRepository: public BaseZonePointsRepository { diff --git a/common/repositories/zone_repository.h b/common/repositories/zone_repository.h index 41115ef44..95d6369be 100644 --- a/common/repositories/zone_repository.h +++ b/common/repositories/zone_repository.h @@ -22,7 +22,7 @@ #define EQEMU_ZONE_REPOSITORY_H #include "../database.h" -#include "../string_util.h" +#include "../strings.h" #include "base/base_zone_repository.h" class ZoneRepository: public BaseZoneRepository { diff --git a/common/rulesys.cpp b/common/rulesys.cpp index d5b7332d5..e8ad26d3e 100644 --- a/common/rulesys.cpp +++ b/common/rulesys.cpp @@ -18,7 +18,7 @@ #include "rulesys.h" #include "database.h" -#include "string_util.h" +#include "strings.h" #include #include #include @@ -367,7 +367,7 @@ void RuleManager::_SaveRule(Database *database, RuleType type, uint16 index) { m_activeRuleset, _GetRuleName(type, index), value_string, - EscapeString(_GetRuleNotes(type, index)).c_str() + Strings::Escape(_GetRuleNotes(type, index)).c_str() ); database->QueryDatabase(query); @@ -441,7 +441,7 @@ bool RuleManager::UpdateInjectedRules(Database *db, const char *ruleset_name, bo ruleset_id, // `ruleset_id` rd_iter.first, // `rule_name` rd_iter.second.first, // `rule_value` - EscapeString(*rd_iter.second.second) // `notes` + Strings::Escape(*rd_iter.second.second) // `notes` ) ); @@ -462,7 +462,7 @@ bool RuleManager::UpdateInjectedRules(Database *db, const char *ruleset_name, bo std::string query( fmt::format( "REPLACE INTO `rule_values`(`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES {}", - implode( + Strings::ImplodePair( ",", std::pair('(', ')'), join_tuple(",", std::pair('\'', '\''), injected_rule_entries) @@ -529,7 +529,7 @@ bool RuleManager::UpdateOrphanedRules(Database *db, bool quiet_update) std::string query ( fmt::format( "DELETE FROM `rule_values` WHERE `rule_name` IN ({})", - implode(",", std::pair('\'', '\''), orphaned_rule_entries) + Strings::ImplodePair(",", std::pair('\'', '\''), orphaned_rule_entries) ) ); @@ -577,7 +577,7 @@ bool RuleManager::RestoreRuleNotes(Database *db) std::string query( fmt::format( "UPDATE `rule_values` SET `notes` = '{}' WHERE `ruleset_id` = '{}' AND `rule_name` = '{}'", - EscapeString(rule.notes), + Strings::Escape(rule.notes), row[0], row[1] ) diff --git a/common/say_link.cpp b/common/say_link.cpp index a10dc4b2d..b4824ac48 100644 --- a/common/say_link.cpp +++ b/common/say_link.cpp @@ -20,7 +20,7 @@ #include "say_link.h" #include "emu_constants.h" -#include "string_util.h" +#include "strings.h" #include "item_instance.h" #include "item_data.h" #include "../zone/zonedb.h" @@ -334,7 +334,7 @@ std::string EQ::SayLinkEngine::InjectSaylinksIfNotExist(const char *message) LogSaylinkDetail("new_message pre pass 1 [{}]", new_message); // first pass - strip existing saylinks by putting placeholder anchors on them - for (auto &saylink: split_string(new_message, saylink_separator)) { + for (auto &saylink: Strings::Split(new_message, saylink_separator)) { if (!saylink.empty() && saylink.length() > saylink_length && saylink.find(saylink_partial) != std::string::npos) { saylinks.emplace_back(saylink); @@ -342,7 +342,7 @@ std::string EQ::SayLinkEngine::InjectSaylinksIfNotExist(const char *message) LogSaylinkDetail("Found saylink [{}]", saylink); // replace with anchor - find_replace( + Strings::FindReplace( new_message, fmt::format("{}", saylink), fmt::format("", saylink_index) @@ -358,11 +358,11 @@ std::string EQ::SayLinkEngine::InjectSaylinksIfNotExist(const char *message) // loop through brackets until none exist if (new_message.find('[') != std::string::npos) { - for (auto &b: split_string(new_message, "[")) { + for (auto &b: Strings::Split(new_message, "[")) { if (!b.empty() && b.find(']') != std::string::npos) { - std::vector right_split = split_string(b, "]"); + std::vector right_split = Strings::Split(b, "]"); if (!right_split.empty()) { - std::string bracket_message = trim(right_split[0]); + std::string bracket_message = Strings::Trim(right_split[0]); // we shouldn't see a saylink fragment here, ignore this bracket if (bracket_message.find(saylink_partial) != std::string::npos) { @@ -397,7 +397,7 @@ std::string EQ::SayLinkEngine::InjectSaylinksIfNotExist(const char *message) } // replace with anchor - find_replace( + Strings::FindReplace( new_message, fmt::format("[{}]", bracket_message), fmt::format("", link_index) @@ -413,16 +413,16 @@ std::string EQ::SayLinkEngine::InjectSaylinksIfNotExist(const char *message) LogSaylinkDetail("new_message post pass 2 (post brackets) [{}]", new_message); // strip any current delimiters of saylinks - find_replace(new_message, saylink_separator, ""); + Strings::FindReplace(new_message, saylink_separator, ""); // pop links onto anchors link_index = 0; for (auto &link: links) { // strip any current delimiters of saylinks - find_replace(link, saylink_separator, ""); + Strings::FindReplace(link, saylink_separator, ""); - find_replace( + Strings::FindReplace( new_message, fmt::format("", link_index), fmt::format("[\u0012{}\u0012]", link) @@ -436,14 +436,14 @@ std::string EQ::SayLinkEngine::InjectSaylinksIfNotExist(const char *message) saylink_index = 0; for (auto &link: saylinks) { // strip any current delimiters of saylinks - find_replace(link, saylink_separator, ""); + Strings::FindReplace(link, saylink_separator, ""); // check to see if we did a double anchor pass (existing saylink that was also inside brackets) // this means we found a saylink and we're checking to see if we're already encoded before double encoding if (new_message.find(fmt::format("\u0012\u0012", saylink_index)) != std::string::npos) { LogSaylinkDetail("Found encoded saylink at index [{}]", saylink_index); - find_replace( + Strings::FindReplace( new_message, fmt::format("\u0012\u0012", saylink_index), fmt::format("\u0012{}\u0012", link) @@ -452,7 +452,7 @@ std::string EQ::SayLinkEngine::InjectSaylinksIfNotExist(const char *message) continue; } - find_replace( + Strings::FindReplace( new_message, fmt::format("", saylink_index), fmt::format("\u0012{}\u0012", link) @@ -485,7 +485,7 @@ SaylinkRepository::Saylink EQ::SayLinkEngine::GetOrSaveSaylink(std::string sayli auto saylinks = SaylinkRepository::GetWhere( database, - fmt::format("phrase = '{}'", EscapeString(saylink_text)) + fmt::format("phrase = '{}'", Strings::Escape(saylink_text)) ); // return if found from the database @@ -508,3 +508,8 @@ SaylinkRepository::Saylink EQ::SayLinkEngine::GetOrSaveSaylink(std::string sayli return {}; } + +std::string Saylink::Create(std::string saylink_text, bool silent, std::string link_name) +{ + return EQ::SayLinkEngine::GenerateQuestSaylink(saylink_text, silent, link_name); +} diff --git a/common/say_link.h b/common/say_link.h index aec8d8879..501bfd58c 100644 --- a/common/say_link.h +++ b/common/say_link.h @@ -127,4 +127,9 @@ namespace EQ } /*EQEmu*/ +class Saylink { +public: + static std::string Create(std::string saylink_text, bool silent, std::string link_name); +}; + #endif /*COMMON_SAY_LINK_H*/ diff --git a/common/server_event_scheduler.cpp b/common/server_event_scheduler.cpp index 1034eebfe..4a99236a2 100644 --- a/common/server_event_scheduler.cpp +++ b/common/server_event_scheduler.cpp @@ -1,5 +1,5 @@ #include "../common/database.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "server_event_scheduler.h" #include "../common/cron/croncpp.h" #include diff --git a/common/shareddb.cpp b/common/shareddb.cpp index 27bfdbfb8..10b087ec7 100644 --- a/common/shareddb.cpp +++ b/common/shareddb.cpp @@ -35,7 +35,7 @@ #include "mysql.h" #include "rulesys.h" #include "shareddb.h" -#include "string_util.h" +#include "strings.h" #include "eqemu_config.h" #include "data_verification.h" #include "repositories/criteria/content_filter_criteria.h" @@ -970,7 +970,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_ } } - + if (GetVariable("disablenotransfer", variable_buffer)) { if (variable_buffer == "1") { disable_no_transfer = true; @@ -1041,7 +1041,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_ item.GuildFavor = std::stoul(row[ItemField::guildfavor]); item.Price = std::stoul(row[ItemField::price]); item.SellRate = std::stof(row[ItemField::sellrate]); - + // Display item.Color = std::stoul(row[ItemField::color]); item.EliteMaterial = std::stoul(row[ItemField::elitematerial]); @@ -1114,7 +1114,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_ item.Attack = std::stoi(row[ItemField::attack]); item.Avoidance = static_cast(EQ::Clamp(std::stoi(row[ItemField::avoidance]), -128, 127)); item.Clairvoyance = std::stoul(row[ItemField::clairvoyance]); - item.CombatEffects = StringIsNumber(row[ItemField::combateffects]) ? static_cast(EQ::Clamp(std::stoi(row[ItemField::combateffects]), -128, 127)) : 0; + item.CombatEffects = Strings::IsNumber(row[ItemField::combateffects]) ? static_cast(EQ::Clamp(std::stoi(row[ItemField::combateffects]), -128, 127)) : 0; item.DamageShield = std::stoi(row[ItemField::damageshield]); item.DotShielding = std::stoi(row[ItemField::dotshielding]); item.DSMitigation = std::stoul(row[ItemField::dsmitigation]); @@ -1187,7 +1187,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_ item.LDoNSellBackRate = std::stoul(row[ItemField::ldonsellbackrate]); item.LDoNSold = std::stoul(row[ItemField::ldonsold]); item.PointType = std::stoul(row[ItemField::pointtype]); - + // Bag item.BagSize = static_cast(std::stoul(row[ItemField::bagsize])); item.BagSlots = static_cast(EQ::Clamp(std::stoi(row[ItemField::bagslots]), 0, 10)); // Will need to be changed from std::min to just use database value when bag slots are increased @@ -1237,7 +1237,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_ item.Scroll.Level2 = static_cast(std::stoul(row[ItemField::scrolllevel2])); strn0cpy(item.ScrollName, row[ItemField::scrollname], sizeof(item.ScrollName)); - // Worn Effect + // Worn Effect item.Worn.Effect = std::stoi(row[ItemField::worneffect]); item.Worn.Type = static_cast(std::stoul(row[ItemField::worntype])); item.Worn.Level = static_cast(std::stoul(row[ItemField::wornlevel])); @@ -1251,7 +1251,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_ item.EvolvingMax = static_cast(std::stoul(row[ItemField::evomax])); // Scripting - item.CharmFileID = StringIsNumber(row[ItemField::charmfileid]) ? std::stoul(row[ItemField::charmfileid]) : 0; + item.CharmFileID = Strings::IsNumber(row[ItemField::charmfileid]) ? std::stoul(row[ItemField::charmfileid]) : 0; strn0cpy(item.CharmFile, row[ItemField::charmfile], sizeof(item.CharmFile)); strn0cpy(item.Filename, row[ItemField::filename], sizeof(item.Filename)); item.ScriptFileID = std::stoul(row[ItemField::scriptfileid]); @@ -1547,7 +1547,7 @@ bool SharedDatabase::GetCommandSettings(std::map aliases = SplitString(row[2], '|'); + std::vector aliases = Strings::Split(row[2], '|'); for (auto iter = aliases.begin(); iter != aliases.end(); ++iter) { if (iter->empty()) continue; @@ -1563,7 +1563,7 @@ bool SharedDatabase::UpdateInjectedCommandSettings(const std::vector('(', ')'), join_pair(",", std::pair('\'', '\''), injected) @@ -1588,7 +1588,7 @@ bool SharedDatabase::UpdateOrphanedCommandSettings(const std::vector('\'', '\''), orphaned) + Strings::ImplodePair(",", std::pair('\'', '\''), orphaned) ); if (!QueryDatabase(query).Success()) { @@ -2364,6 +2364,6 @@ void SharedDatabase::LoadCharacterInspectMessage(uint32 character_id, InspectMes } void SharedDatabase::SaveCharacterInspectMessage(uint32 character_id, const InspectMessage_Struct* message) { - const std::string query = StringFormat("REPLACE INTO `character_inspect_messages` (id, inspect_message) VALUES (%u, '%s')", character_id, EscapeString(message->text).c_str()); + const std::string query = StringFormat("REPLACE INTO `character_inspect_messages` (id, inspect_message) VALUES (%u, '%s')", character_id, Strings::Escape(message->text).c_str()); auto results = QueryDatabase(query); } diff --git a/common/string_util.cpp b/common/string_util.cpp deleted file mode 100644 index a13515254..000000000 --- a/common/string_util.cpp +++ /dev/null @@ -1,1288 +0,0 @@ -/* - * Copyright 2013 Facebook, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "string_util.h" -#include -#include -#include - -#ifdef _WINDOWS -#include - -#define snprintf _snprintf -#define strncasecmp _strnicmp -#define strcasecmp _stricmp - -#else - -#include -#include -#include - -#endif - -#ifndef va_copy -#define va_copy(d,s) ((d) = (s)) -#endif - -// original source: -// https://github.com/facebook/folly/blob/master/folly/String.cpp -// -const std::string vStringFormat(const char *format, va_list args) -{ - std::string output; - va_list tmpargs; - - va_copy(tmpargs, args); - int characters_used = vsnprintf(nullptr, 0, format, tmpargs); - va_end(tmpargs); - - // Looks like we have a valid format string. - if (characters_used > 0) { - output.resize(characters_used + 1); - - va_copy(tmpargs, args); - characters_used = vsnprintf(&output[0], output.capacity(), format, tmpargs); - va_end(tmpargs); - - output.resize(characters_used); - - // We shouldn't have a format error by this point, but I can't imagine what error we - // could have by this point. Still, return empty string; - if (characters_used < 0) { - output.clear(); - } - } - return output; -} - -const std::string str_tolower(std::string s) -{ - std::transform( - s.begin(), s.end(), s.begin(), - [](unsigned char c) { return ::tolower(c); } - ); - return s; -} - -const std::string str_toupper(std::string s) -{ - std::transform( - s.begin(), s.end(), s.begin(), - [](unsigned char c) { return ::toupper(c); } - ); - return s; -} - -const std::string ucfirst(std::string s) -{ - std::string output = s; - if (!s.empty()) { - output[0] = static_cast(::toupper(s[0])); - } - - return output; -} - -const std::string StringFormat(const char *format, ...) -{ - va_list args; - va_start(args, format); - std::string output = vStringFormat(format, args); - va_end(args); - return output; -} - -std::vector SplitString(const std::string &str, const char delim) -{ - std::vector ret; - std::string::size_type start = 0; - auto end = str.find(delim); - while (end != std::string::npos) { - ret.emplace_back(str, start, end - start); - start = end + 1; - end = str.find(delim, start); - } - // this will catch the last word since the string is unlikely to end with a delimiter - if (str.length() > start) { - ret.emplace_back(str, start, str.length() - start); - } - return ret; -} - -// this one takes delimiter length into consideration -std::vector split_string(std::string s, std::string delimiter) -{ - size_t pos_start = 0, pos_end, delim_len = delimiter.length(); - std::string token; - std::vector res; - - while ((pos_end = s.find(delimiter, pos_start)) != std::string::npos) { - token = s.substr(pos_start, pos_end - pos_start); - pos_start = pos_end + delim_len; - res.push_back(token); - } - - res.push_back(s.substr(pos_start)); - return res; -} - -std::string get_between(const std::string &s, std::string start_delim, std::string stop_delim) -{ - if (s.find(start_delim) == std::string::npos && s.find(stop_delim) == std::string::npos) { - return ""; - } - - auto first_split = split_string(s, start_delim); - if (!first_split.empty()) { - std::string remaining_block = first_split[1]; - auto second_split = split_string(remaining_block, stop_delim); - if (!second_split.empty()) { - std::string between = second_split[0]; - return between; - } - } - - return ""; -} - -std::string::size_type -search_deliminated_string(const std::string &haystack, const std::string &needle, const char deliminator) -{ - // this shouldn't go out of bounds, even without obvious bounds checks - auto pos = haystack.find(needle); - while (pos != std::string::npos) { - auto c = haystack[pos + needle.length()]; - if ((c == '\0' || c == deliminator) && (pos == 0 || haystack[pos - 1] == deliminator)) { - return pos; - } - pos = haystack.find(needle, pos + needle.length()); - } - return std::string::npos; -} - -std::string implode(std::string glue, std::vector src) -{ - if (src.empty()) { - return {}; - } - - std::ostringstream output; - std::vector::iterator src_iter; - - for (src_iter = src.begin(); src_iter != src.end(); src_iter++) { - output << *src_iter << glue; - } - - std::string final_output = output.str(); - final_output.resize(output.str().size() - glue.size()); - - return final_output; -} - -std::vector wrap(std::vector &src, std::string character) -{ - std::vector new_vector; - new_vector.reserve(src.size()); - - for (auto &e: src) { - if (e == "null") { - new_vector.emplace_back(e); - continue; - } - - new_vector.emplace_back(character + e + character); - } - - return new_vector; -} - -std::string EscapeString(const std::string &s) -{ - std::string ret; - - size_t sz = s.length(); - for (size_t i = 0; i < sz; ++i) { - char c = s[i]; - switch (c) { - case '\x00': - ret += "\\x00"; - break; - case '\n': - ret += "\\n"; - break; - case '\r': - ret += "\\r"; - break; - case '\\': - ret += "\\\\"; - break; - case '\'': - ret += "\\'"; - break; - case '\"': - ret += "\\\""; - break; - case '\x1a': - ret += "\\x1a"; - break; - default: - ret.push_back(c); - break; - } - } - - return ret; -} - -std::string EscapeString(const char *src, size_t sz) -{ - std::string ret; - - for (size_t i = 0; i < sz; ++i) { - char c = src[i]; - switch (c) { - case '\x00': - ret += "\\x00"; - break; - case '\n': - ret += "\\n"; - break; - case '\r': - ret += "\\r"; - break; - case '\\': - ret += "\\\\"; - break; - case '\'': - ret += "\\'"; - break; - case '\"': - ret += "\\\""; - break; - case '\x1a': - ret += "\\x1a"; - break; - default: - ret.push_back(c); - break; - } - } - - return ret; -} - -bool StringIsNumber(const std::string &s) -{ - try { - auto r = stod(s); - return true; - } - catch (std::exception &) { - return false; - } -} - -void ToLowerString(std::string &s) -{ - std::transform(s.begin(), s.end(), s.begin(), ::tolower); -} - -void ToUpperString(std::string &s) -{ - std::transform(s.begin(), s.end(), s.begin(), ::toupper); -} - -std::string JoinString(const std::vector &ar, const std::string &delim) -{ - std::string ret; - for (size_t i = 0; i < ar.size(); ++i) { - if (i != 0) { - ret += delim; - } - - ret += ar[i]; - } - - return ret; -} - -void find_replace(std::string &string_subject, const std::string &search_string, const std::string &replace_string) -{ - if (string_subject.find(search_string) == std::string::npos) { - return; - } - - size_t start_pos = 0; - while ((start_pos = string_subject.find(search_string, start_pos)) != std::string::npos) { - string_subject.replace(start_pos, search_string.length(), replace_string); - start_pos += replace_string.length(); - } -} - -std::string replace_string(std::string subject, const std::string &search, const std::string &replace) -{ - size_t pos = 0; - while ((pos = subject.find(search, pos)) != std::string::npos) { - subject.replace(pos, search.length(), replace); - pos += replace.length(); - } - return subject; -} - -void ParseAccountString(const std::string &s, std::string &account, std::string &loginserver) -{ - auto split = SplitString(s, ':'); - if (split.size() == 2) { - loginserver = split[0]; - account = split[1]; - } - else if (split.size() == 1) { - account = split[0]; - } -} - -//Const char based - -// normal strncpy doesnt put a null term on copied strings, this one does -// ref: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wcecrt/htm/_wcecrt_strncpy_wcsncpy.asp -char *strn0cpy(char *dest, const char *source, uint32 size) -{ - if (!dest) { - return 0; - } - if (size == 0 || source == 0) { - dest[0] = 0; - return dest; - } - strncpy(dest, source, size); - dest[size - 1] = 0; - return dest; -} - -// String N w/null Copy Truncated? -// return value =true if entire string(source) fit, false if it was truncated -bool strn0cpyt(char *dest, const char *source, uint32 size) -{ - if (!dest) { - return 0; - } - if (size == 0 || source == 0) { - dest[0] = 0; - return false; - } - strncpy(dest, source, size); - dest[size - 1] = 0; - return (bool) (source[strlen(dest)] == 0); -} - -const char *MakeLowerString(const char *source) -{ - static char str[128]; - if (!source) { - return nullptr; - } - MakeLowerString(source, str); - return str; -} - -void MakeLowerString(const char *source, char *target) -{ - if (!source || !target) { - *target = 0; - return; - } - while (*source) { - *target = tolower(*source); - target++; - source++; - } - *target = 0; -} - -uint32 hextoi(const char *num) -{ - if (num == nullptr) { - return 0; - } - - int len = strlen(num); - if (len < 3) { - return 0; - } - - if (num[0] != '0' || (num[1] != 'x' && num[1] != 'X')) { - return 0; - } - - uint32 ret = 0; - int mul = 1; - for (int i = len - 1; i >= 2; i--) { - if (num[i] >= 'A' && num[i] <= 'F') { - ret += ((num[i] - 'A') + 10) * mul; - } - else if (num[i] >= 'a' && num[i] <= 'f') { - ret += ((num[i] - 'a') + 10) * mul; - } - else if (num[i] >= '0' && num[i] <= '9') { - ret += (num[i] - '0') * mul; - } - else { - return 0; - } - mul *= 16; - } - return ret; -} - -uint64 hextoi64(const char *num) -{ - if (num == nullptr) { - return 0; - } - - int len = strlen(num); - if (len < 3) { - return 0; - } - - if (num[0] != '0' || (num[1] != 'x' && num[1] != 'X')) { - return 0; - } - - uint64 ret = 0; - int mul = 1; - for (int i = len - 1; i >= 2; i--) { - if (num[i] >= 'A' && num[i] <= 'F') { - ret += ((num[i] - 'A') + 10) * mul; - } - else if (num[i] >= 'a' && num[i] <= 'f') { - ret += ((num[i] - 'a') + 10) * mul; - } - else if (num[i] >= '0' && num[i] <= '9') { - ret += (num[i] - '0') * mul; - } - else { - return 0; - } - mul *= 16; - } - return ret; -} - -bool atobool(const char *iBool) -{ - - if (iBool == nullptr) { - return false; - } - if (!strcasecmp(iBool, "true")) { - return true; - } - if (!strcasecmp(iBool, "false")) { - return false; - } - if (!strcasecmp(iBool, "yes")) { - return true; - } - if (!strcasecmp(iBool, "no")) { - return false; - } - if (!strcasecmp(iBool, "on")) { - return true; - } - if (!strcasecmp(iBool, "off")) { - return false; - } - if (!strcasecmp(iBool, "enable")) { - return true; - } - if (!strcasecmp(iBool, "disable")) { - return false; - } - if (!strcasecmp(iBool, "enabled")) { - return true; - } - if (!strcasecmp(iBool, "disabled")) { - return false; - } - if (!strcasecmp(iBool, "y")) { - return true; - } - if (!strcasecmp(iBool, "n")) { - return false; - } - if (atoi(iBool)) { - return true; - } - return false; -} - -// removes the crap and turns the underscores into spaces. -char *CleanMobName(const char *in, char *out) -{ - unsigned i, j; - - for (i = j = 0; i < strlen(in); i++) { - // convert _ to space.. any other conversions like this? I *think* this - // is the only non alpha char that's not stripped but converted. - if (in[i] == '_') { - out[j++] = ' '; - } - else { - if (isalpha(in[i]) || (in[i] == '`')) { // numbers, #, or any other crap just gets skipped - out[j++] = in[i]; - } - } - } - out[j] = 0; // terimnate the string before returning it - return out; -} - - -void RemoveApostrophes(std::string &s) -{ - for (unsigned int i = 0; i < s.length(); ++i) - if (s[i] == '\'') { - s[i] = '_'; - } -} - -char *RemoveApostrophes(const char *s) -{ - auto NewString = new char[strlen(s) + 1]; - - strcpy(NewString, s); - - for (unsigned int i = 0; i < strlen(NewString); ++i) - if (NewString[i] == '\'') { - NewString[i] = '_'; - } - - return NewString; -} - -const char *ConvertArray(int64 input, char *returnchar) -{ - sprintf(returnchar, "%lld", input); - return returnchar; -} - -const char *ConvertArrayF(float input, char *returnchar) -{ - sprintf(returnchar, "%0.2f", input); - return returnchar; -} - -bool isAlphaNumeric(const char *text) -{ - for (unsigned int charIndex = 0; charIndex < strlen(text); charIndex++) { - if ((text[charIndex] < 'a' || text[charIndex] > 'z') && - (text[charIndex] < 'A' || text[charIndex] > 'Z') && - (text[charIndex] < '0' || text[charIndex] > '9')) { - return false; - } - } - - return true; -} - -// Function to convert single digit or two digit number into words -std::string convert2digit(int n, std::string suffix) -{ - // if n is zero - if (n == 0) { - return ""; - } - - // split n if it is more than 19 - if (n > 19) { - return NUM_TO_ENGLISH_Y[n / 10] + NUM_TO_ENGLISH_X[n % 10] + suffix; - } - else { - return NUM_TO_ENGLISH_X[n] + suffix; - } -} - -// Function to convert a given number (max 9-digits) into words -std::string numberToWords(unsigned long long int n) -{ - // string to store word representation of given number - std::string res; - - // this handles digits at ones & tens place - res = convert2digit((n % 100), ""); - - if (n > 100 && n % 100) { - res = "and " + res; - } - - // this handles digit at hundreds place - res = convert2digit(((n / 100) % 10), "Hundred ") + res; - - // this handles digits at thousands & tens thousands place - res = convert2digit(((n / 1000) % 100), "Thousand ") + res; - - // this handles digits at hundred thousands & one millions place - res = convert2digit(((n / 100000) % 100), "Lakh, ") + res; - - // this handles digits at ten millions & hundred millions place - res = convert2digit((n / 10000000) % 100, "Crore, ") + res; - - // this handles digits at ten millions & hundred millions place - res = convert2digit((n / 1000000000) % 100, "Billion, ") + res; - - return res; -} - -// first letter capitalized and rest made lower case -std::string FormatName(const std::string &char_name) -{ - std::string formatted(char_name); - if (!formatted.empty()) { - std::transform(formatted.begin(), formatted.end(), formatted.begin(), ::tolower); - formatted[0] = ::toupper(formatted[0]); - } - return formatted; -} - -bool IsAllowedWorldServerCharacterList(char c) -{ - const char *valid_characters = ":[](){}.!@#$%^&*-=+<>/\\|'\""; - if (strchr(valid_characters, c)) { - return true; - } - - return false; -} - -void SanitizeWorldServerName(char *name) -{ - std::string server_long_name = name; - - strcpy(name, SanitizeWorldServerName(server_long_name).c_str()); -} - -std::string SanitizeWorldServerName(std::string server_long_name) -{ - server_long_name.erase( - std::remove_if( - server_long_name.begin(), - server_long_name.end(), - [](char c) { - return !(std::isalpha(c) || std::isalnum(c) || std::isspace(c) || IsAllowedWorldServerCharacterList(c)); - } - ), server_long_name.end() - ); - - server_long_name = trim(server_long_name); - - // bad word filter - for (auto &piece: split_string(server_long_name, " ")) { - for (auto &word: GetBadWords()) { - // for shorter words that can actually be part of legitimate words - // make sure that it isn't part of another word by matching on a space - if (str_tolower(piece) == word) { - find_replace( - server_long_name, - piece, - repeat("*", (int) word.length()) - ); - continue; - } - - auto pos = str_tolower(piece).find(word); - if (str_tolower(piece).find(word) != std::string::npos && piece.length() > 4 && word.length() > 4) { - auto found_word = piece.substr(pos, word.length()); - std::string replaced_piece = piece.substr(pos, word.length()); - - find_replace( - server_long_name, - replaced_piece, - repeat("*", (int) word.length()) - ); - } - } - } - - return server_long_name; -} - -std::string repeat(std::string s, int n) -{ - std::string s1 = s; - for (int i = 1; i < n; i++) { - s += s1; - } - - return s; -} - -std::vector GetBadWords() -{ - return std::vector{ - "2g1c", - "acrotomophilia", - "anal", - "anilingus", - "anus", - "apeshit", - "arsehole", - "ass", - "asshole", - "assmunch", - "autoerotic", - "babeland", - "bangbros", - "bangbus", - "bareback", - "barenaked", - "bastard", - "bastardo", - "bastinado", - "bbw", - "bdsm", - "beaner", - "beaners", - "beaver", - "beastiality", - "bestiality", - "bimbos", - "birdlock", - "bitch", - "bitches", - "blowjob", - "blumpkin", - "bollocks", - "bondage", - "boner", - "boob", - "boobs", - "bukkake", - "bulldyke", - "bullshit", - "bung", - "bunghole", - "busty", - "butt", - "buttcheeks", - "butthole", - "camel toe", - "camgirl", - "camslut", - "camwhore", - "carpetmuncher", - "cialis", - "circlejerk", - "clit", - "clitoris", - "clusterfuck", - "cock", - "cocks", - "coprolagnia", - "coprophilia", - "cornhole", - "coon", - "coons", - "creampie", - "cum", - "cumming", - "cumshot", - "cumshots", - "cunnilingus", - "cunt", - "darkie", - "daterape", - "deepthroat", - "dendrophilia", - "dick", - "dildo", - "dingleberry", - "dingleberries", - "doggiestyle", - "doggystyle", - "dolcett", - "domination", - "dominatrix", - "dommes", - "hump", - "dvda", - "ecchi", - "ejaculation", - "erotic", - "erotism", - "escort", - "eunuch", - "fag", - "faggot", - "fecal", - "felch", - "fellatio", - "feltch", - "femdom", - "figging", - "fingerbang", - "fingering", - "fisting", - "footjob", - "frotting", - "fuck", - "fuckin", - "fucking", - "fucktards", - "fudgepacker", - "futanari", - "gangbang", - "gangbang", - "gaysex", - "genitals", - "goatcx", - "goatse", - "gokkun", - "goodpoop", - "goregasm", - "grope", - "g-spot", - "guro", - "handjob", - "hentai", - "homoerotic", - "honkey", - "hooker", - "horny", - "humping", - "incest", - "intercourse", - "jailbait", - "jigaboo", - "jiggaboo", - "jiggerboo", - "jizz", - "juggs", - "kike", - "kinbaku", - "kinkster", - "kinky", - "knobbing", - "livesex", - "lolita", - "lovemaking", - "masturbate", - "masturbating", - "masturbation", - "milf", - "mong", - "motherfucker", - "muffdiving", - "nambla", - "nawashi", - "negro", - "neonazi", - "nigga", - "nigger", - "nimphomania", - "nipple", - "nipples", - "nsfw", - "nude", - "nudity", - "nutten", - "nympho", - "nymphomania", - "octopussy", - "omorashi", - "orgasm", - "orgy", - "paedophile", - "paki", - "panties", - "panty", - "pedobear", - "pedophile", - "pegging", - "penis", - "pikey", - "pissing", - "pisspig", - "playboy", - "ponyplay", - "poof", - "poon", - "poontang", - "punany", - "poopchute", - "porn", - "porno", - "pornography", - "pthc", - "pubes", - "pussy", - "queaf", - "queef", - "quim", - "raghead", - "rape", - "raping", - "rapist", - "rectum", - "rimjob", - "rimming", - "sadism", - "santorum", - "scat", - "schlong", - "scissoring", - "semen", - "sex", - "sexcam", - "sexo", - "sexy", - "sexual", - "sexually", - "sexuality", - "shemale", - "shibari", - "shit", - "shitblimp", - "shitty", - "shota", - "shrimping", - "skeet", - "slanteye", - "slut", - "s&m", - "smut", - "snatch", - "snowballing", - "sodomize", - "sodomy", - "spastic", - "spic", - "splooge", - "spooge", - "spunk", - "strapon", - "strappado", - "suck", - "sucks", - "swastika", - "swinger", - "threesome", - "throating", - "thumbzilla", - "tight white", - "tit", - "tits", - "titties", - "titty", - "topless", - "tosser", - "towelhead", - "tranny", - "tribadism", - "tubgirl", - "tushy", - "twat", - "twink", - "twinkie", - "undressing", - "upskirt", - "urophilia", - "vagina", - "viagra", - "vibrator", - "vorarephilia", - "voyeur", - "voyeurweb", - "voyuer", - "vulva", - "wank", - "wetback", - "whore", - "worldsex", - "xx", - "xxx", - "yaoi", - "yiffy", - "zoophilia" - }; -} - -bool contains(std::vector container, std::string element) -{ - return std::find(container.begin(), container.end(), element) != container.end(); -} - -std::string ConvertSecondsToTime(int duration, bool is_milliseconds) -{ - if (duration <= 0) { - return "Unknown"; - } - - if (is_milliseconds && duration < 1000) { - return fmt::format( - "{} Millisecond{}", - duration, - duration != 1 ? "s" : "" - ); - } - - int timer_length = ( - is_milliseconds ? - static_cast(std::ceil(static_cast(duration) / 1000.0f)) : - duration - ); - - int days = int(timer_length / 86400); - timer_length %= 86400; - int hours = int(timer_length / 3600); - timer_length %= 3600; - int minutes = int(timer_length / 60); - timer_length %= 60; - int seconds = timer_length; - std::string time_string = "Unknown"; - std::string day_string = (days == 1 ? "Day" : "Days"); - std::string hour_string = (hours == 1 ? "Hour" : "Hours"); - std::string minute_string = (minutes == 1 ? "Minute" : "Minutes"); - std::string second_string = (seconds == 1 ? "Second" : "Seconds"); - if (days && hours && minutes && seconds) { // DHMS - time_string = fmt::format( - "{} {}, {} {}, {} {}, and {} {}", - days, - day_string, - hours, - hour_string, - minutes, - minute_string, - seconds, - second_string - ); - } else if (days && hours && minutes && !seconds) { // DHM - time_string = fmt::format( - "{} {}, {} {}, and {} {}", - days, - day_string, - hours, - hour_string, - minutes, - minute_string - ); - } else if (days && hours && !minutes && seconds) { // DHS - time_string = fmt::format( - "{} {}, {} {}, and {} {}", - days, - day_string, - hours, - hour_string, - seconds, - second_string - ); - } else if (days && hours && !minutes && !seconds) { // DH - time_string = fmt::format( - "{} {} and {} {}", - days, - day_string, - hours, - hour_string - ); - } else if (days && !hours && minutes && seconds) { // DMS - time_string = fmt::format( - "{} {}, {} {}, and {} {}", - days, - day_string, - minutes, - minute_string, - seconds, - second_string - ); - } else if (days && !hours && minutes && !seconds) { // DM - time_string = fmt::format( - "{} {} and {} {}", - days, - day_string, - minutes, - minute_string - ); - } else if (days && !hours && !minutes && seconds) { // DS - time_string = fmt::format( - "{} {} and {} {}", - days, - day_string, - seconds, - second_string - ); - } else if (days && !hours && !minutes && !seconds) { // D - time_string = fmt::format( - "{} {}", - days, - day_string - ); - } else if (!days && hours && minutes && seconds) { // HMS - time_string = fmt::format( - "{} {}, {} {}, and {} {}", - hours, - hour_string, - minutes, - minute_string, - seconds, - second_string - ); - } else if (!days && hours && minutes && !seconds) { // HM - time_string = fmt::format( - "{} {} and {} {}", - hours, - hour_string, - minutes, - minute_string - ); - } else if (!days && hours && !minutes && seconds) { // HS - time_string = fmt::format( - "{} {} and {} {}", - hours, - hour_string, - seconds, - second_string - ); - } else if (!days && hours && !minutes && !seconds) { // H - time_string = fmt::format( - "{} {}", - hours, - hour_string - ); - } else if (!days && !hours && minutes && seconds) { // MS - time_string = fmt::format( - "{} {} and {} {}", - minutes, - minute_string, - seconds, - second_string - ); - } else if (!days && !hours && minutes && !seconds) { // M - time_string = fmt::format( - "{} {}", - minutes, - minute_string - ); - } else if (!days && !hours && !minutes && seconds) { // S - time_string = fmt::format( - "{} {}", - seconds, - second_string - ); - } - return time_string; -} - -std::string ConvertMoneyToString(uint32 platinum, uint32 gold, uint32 silver, uint32 copper) -{ - std::string money_string = "Unknown"; - if (copper && silver && gold && platinum) { // CSGP - money_string = fmt::format( - "{} Platinum, {} Gold, {} Silver, and {} Copper", - commify(std::to_string(platinum)), - commify(std::to_string(gold)), - commify(std::to_string(silver)), - commify(std::to_string(copper)) - ); - } else if (copper && silver && gold && !platinum) { // CSG - money_string = fmt::format( - "{} Gold, {} Silver, and {} Copper", - commify(std::to_string(gold)), - commify(std::to_string(silver)), - commify(std::to_string(copper)) - ); - } else if (copper && silver && !gold && !platinum) { // CS - money_string = fmt::format( - "{} Silver and {} Copper", - commify(std::to_string(silver)), - commify(std::to_string(copper)) - ); - } else if (!copper && silver && gold && platinum) { // SGP - money_string = fmt::format( - "{} Platinum, {} Gold, and {} Silver", - commify(std::to_string(platinum)), - commify(std::to_string(gold)), - commify(std::to_string(silver)) - ); - } else if (!copper && silver && gold && !platinum) { // SG - money_string = fmt::format( - "{} Gold and {} Silver", - commify(std::to_string(gold)), - commify(std::to_string(silver)) - ); - } else if (copper && !silver && gold && platinum) { // CGP - money_string = fmt::format( - "{} Platinum, {} Gold, and {} Copper", - commify(std::to_string(platinum)), - commify(std::to_string(gold)), - commify(std::to_string(copper)) - ); - } else if (copper && !silver && gold && !platinum) { // CG - money_string = fmt::format( - "{} Gold and {} Copper", - commify(std::to_string(gold)), - commify(std::to_string(copper)) - ); - } else if (!copper && !silver && gold && platinum) { // GP - money_string = fmt::format( - "{} Platinum and {} Gold", - commify(std::to_string(platinum)), - commify(std::to_string(gold)) - ); - } else if (!copper && !silver && !gold && platinum) { // P - money_string = fmt::format( - "{} Platinum", - commify(std::to_string(platinum)) - ); - } else if (!copper && !silver && gold && !platinum) { // G - money_string = fmt::format( - "{} Gold", - commify(std::to_string(gold)) - ); - } else if (!copper && silver && !gold && !platinum) { // S - money_string = fmt::format( - "{} Silver", - commify(std::to_string(silver)) - ); - } else if (copper && !silver && !gold && !platinum) { // C - money_string = fmt::format( - "{} Copper", - commify(std::to_string(copper)) - ); - } - return money_string; -} - -std::string commify(const std::string &number) { - std::string temp_string; - - auto string_length = static_cast(number.length()); - - int i = 0; - for (i = string_length - 3; i >= 0; i -= 3) { - if (i > 0) { - temp_string = "," + number.substr(static_cast(i), 3) + temp_string; - } else { - temp_string = number.substr(static_cast(i), 3) + temp_string; - } - } - - if (i < 0) { - temp_string = number.substr(0, static_cast(3 + i)) + temp_string; - } - - return temp_string; -} diff --git a/common/string_util.h b/common/string_util.h deleted file mode 100644 index c0451f655..000000000 --- a/common/string_util.h +++ /dev/null @@ -1,237 +0,0 @@ -/* - * Copyright 2013 Facebook, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef _STRINGUTIL_H_ -#define _STRINGUTIL_H_ - -#include -#include -#include -#include -#include - -#ifndef _WIN32 -// this doesn't appear to affect linux-based systems..need feedback for _WIN64 -#include -#endif - -#ifdef _WINDOWS -#include -#include -#include -#endif - -#include "types.h" - -//std::string based -const std::string str_tolower(std::string s); -const std::string str_toupper(std::string s); -const std::string ucfirst(std::string s); -const std::string StringFormat(const char* format, ...); -const std::string vStringFormat(const char* format, va_list args); -std::vector wrap(std::vector &src, std::string character); -std::string implode(std::string glue, std::vector src); -std::string convert2digit(int n, std::string suffix); -std::string numberToWords(unsigned long long int n); -std::string ConvertMoneyToString(uint32 platinum, uint32 gold = 0, uint32 silver = 0, uint32 copper = 0); -std::string ConvertSecondsToTime(int duration, bool is_milliseconds = false); -inline std::string ConvertMillisecondsToTime(int duration) { - return ConvertSecondsToTime(duration, true); -} - -// For converstion of numerics into English -// Used for grid nodes, as NPC names remove numerals. -// But general purpose - -const std::string NUM_TO_ENGLISH_X[] = { "", "One ", "Two ", "Three ", "Four ", - "Five ", "Six ", "Seven ", "Eight ", "Nine ", "Ten ", "Eleven ", - "Twelve ", "Thirteen ", "Fourteen ", "Fifteen ", - "Sixteen ", "Seventeen ", "Eighteen ", "Nineteen " }; - -const std::string NUM_TO_ENGLISH_Y[] = { "", "", "Twenty ", "Thirty ", "Forty ", - "Fifty ", "Sixty ", "Seventy ", "Eighty ", "Ninety " }; - -/** - * @param str - * @param chars - * @return - */ -inline std::string <rim(std::string &str, const std::string &chars = "\t\n\v\f\r ") -{ - str.erase(0, str.find_first_not_of(chars)); - return str; -} - -/** - * @param str - * @param chars - * @return - */ -inline std::string &rtrim(std::string &str, const std::string &chars = "\t\n\v\f\r ") -{ - str.erase(str.find_last_not_of(chars) + 1); - return str; -} - -/** - * @param str - * @param chars - * @return - */ -inline std::string &trim(std::string &str, const std::string &chars = "\t\n\v\f\r ") -{ - return ltrim(rtrim(str, chars), chars); -} - -template -std::string implode(const std::string &glue, const std::pair &encapsulation, const std::vector &src) -{ - if (src.empty()) { - return {}; - } - - std::ostringstream oss; - - for (const T &src_iter : src) { - oss << encapsulation.first << src_iter << encapsulation.second << glue; - } - - std::string output(oss.str()); - output.resize(output.size() - glue.size()); - - return output; -} - -// _WIN32 builds require that #include be included in whatever code file the invocation is made from (no header files) -template -std::vector join_pair(const std::string &glue, const std::pair &encapsulation, const std::vector> &src) -{ - if (src.empty()) { - return {}; - } - - std::vector output; - - for (const std::pair &src_iter : src) { - output.push_back( - - fmt::format( - "{}{}{}{}{}{}{}", - encapsulation.first, - src_iter.first, - encapsulation.second, - glue, - encapsulation.first, - src_iter.second, - encapsulation.second - ) - ); - } - - return output; -} - -// _WIN32 builds require that #include be included in whatever code file the invocation is made from (no header files) -template -std::vector join_tuple(const std::string &glue, const std::pair &encapsulation, const std::vector> &src) -{ - if (src.empty()) { - return {}; - } - - std::vector output; - - for (const std::tuple &src_iter : src) { - - output.push_back( - - fmt::format( - "{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}", - encapsulation.first, - std::get<0>(src_iter), - encapsulation.second, - glue, - encapsulation.first, - std::get<1>(src_iter), - encapsulation.second, - glue, - encapsulation.first, - std::get<2>(src_iter), - encapsulation.second, - glue, - encapsulation.first, - std::get<3>(src_iter), - encapsulation.second - ) - ); - } - - return output; -} - -std::vector SplitString(const std::string &s, const char delim = ','); -std::vector split_string(std::string s, std::string delimiter); -std::string get_between(const std::string &s, std::string start_delim, std::string stop_delim); -std::string::size_type search_deliminated_string(const std::string &haystack, const std::string &needle, const char deliminator = ','); -std::string EscapeString(const char *src, size_t sz); -std::string EscapeString(const std::string &s); -bool StringIsNumber(const std::string &s); -void ToLowerString(std::string &s); -void ToUpperString(std::string &s); -std::string JoinString(const std::vector& ar, const std::string &delim); -void find_replace(std::string& string_subject, const std::string& search_string, const std::string& replace_string); -std::string replace_string(std::string subject, const std::string &search, const std::string &replace); -void ParseAccountString(const std::string &s, std::string &account, std::string &loginserver); -std::string commify(const std::string &number); - -//const char based - -bool atobool(const char* iBool); -bool isAlphaNumeric(const char *text); -bool strn0cpyt(char* dest, const char* source, uint32 size); -char *CleanMobName(const char *in, char *out); -char *RemoveApostrophes(const char *s); -char* strn0cpy(char* dest, const char* source, uint32 size); -const char *ConvertArray(int64 input, char *returnchar); -const char *ConvertArrayF(float input, char *returnchar); -const char *MakeLowerString(const char *source); -uint32 hextoi(const char* num); -uint64 hextoi64(const char* num); -void MakeLowerString(const char *source, char *target); -void RemoveApostrophes(std::string &s); -std::string convert2digit(int n, std::string suffix); -std::string numberToWords(unsigned long long int n); -std::string FormatName(const std::string& char_name); -bool IsAllowedWorldServerCharacterList(char c); -void SanitizeWorldServerName(char *name); -std::string SanitizeWorldServerName(std::string server_long_name); -std::string repeat(std::string s, int n); -std::vector GetBadWords(); -bool contains(std::vector container, std::string element); - -template -auto CleanMobName(InputIterator first, InputIterator last, OutputIterator result) -{ - for (; first != last; ++first) { - if(*first == '_') { - *result = ' '; - } else if (isalpha(*first) || *first == '`') { - *result = *first; - } - } - return result; -} - -#endif diff --git a/common/strings.cpp b/common/strings.cpp new file mode 100644 index 000000000..04588f225 --- /dev/null +++ b/common/strings.cpp @@ -0,0 +1,651 @@ +/* + * Copyright 2013 Facebook, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "strings.h" +#include +#include +#include + +#ifdef _WINDOWS +#include + +#define snprintf _snprintf +#define strncasecmp _strnicmp +#define strcasecmp _stricmp + +#else + +#include +#include +#include + +#endif + +#ifndef va_copy +#define va_copy(d,s) ((d) = (s)) +#endif + +//Const char based +#include "strings_legacy.cpp" // legacy c functions +#include "strings_misc.cpp" // anything non "Strings" scoped +#include "say_link.h" + +std::vector Strings::Split(const std::string &str, const char delim) +{ + std::vector ret; + std::string::size_type start = 0; + auto end = str.find(delim); + while (end != std::string::npos) { + ret.emplace_back(str, start, end - start); + start = end + 1; + end = str.find(delim, start); + } + // this will catch the last word since the string is unlikely to end with a delimiter + if (str.length() > start) { + ret.emplace_back(str, start, str.length() - start); + } + return ret; +} + +// this one takes delimiter length into consideration +std::vector Strings::Split(std::string s, std::string delimiter) +{ + size_t pos_start = 0, pos_end, delim_len = delimiter.length(); + std::string token; + std::vector res; + + while ((pos_end = s.find(delimiter, pos_start)) != std::string::npos) { + token = s.substr(pos_start, pos_end - pos_start); + pos_start = pos_end + delim_len; + res.push_back(token); + } + + res.push_back(s.substr(pos_start)); + return res; +} + +std::string Strings::Strings::GetBetween(const std::string &s, std::string start_delim, std::string stop_delim) +{ + if (s.find(start_delim) == std::string::npos && s.find(stop_delim) == std::string::npos) { + return ""; + } + + auto first_split = Strings::Split(s, start_delim); + if (!first_split.empty()) { + std::string remaining_block = first_split[1]; + auto second_split = Strings::Split(remaining_block, stop_delim); + if (!second_split.empty()) { + std::string between = second_split[0]; + return between; + } + } + + return ""; +} + +std::string::size_type +Strings::SearchDelim(const std::string &haystack, const std::string &needle, const char deliminator) +{ + // this shouldn't go out of bounds, even without obvious bounds checks + auto pos = haystack.find(needle); + while (pos != std::string::npos) { + auto c = haystack[pos + needle.length()]; + if ((c == '\0' || c == deliminator) && (pos == 0 || haystack[pos - 1] == deliminator)) { + return pos; + } + pos = haystack.find(needle, pos + needle.length()); + } + return std::string::npos; +} + + +std::string Strings::Implode(std::string glue, std::vector src) +{ + if (src.empty()) { + return {}; + } + + std::ostringstream output; + std::vector::iterator src_iter; + + for (src_iter = src.begin(); src_iter != src.end(); src_iter++) { + output << *src_iter << glue; + } + + std::string final_output = output.str(); + final_output.resize(output.str().size() - glue.size()); + + return final_output; +} + +std::vector wrap(std::vector &src, std::string character) +{ + std::vector new_vector; + new_vector.reserve(src.size()); + + for (auto &e: src) { + if (e == "null") { + new_vector.emplace_back(e); + continue; + } + + new_vector.emplace_back(character + e + character); + } + + return new_vector; +} + +std::string Strings::Escape(const std::string &s) +{ + std::string ret; + + size_t sz = s.length(); + for (size_t i = 0; i < sz; ++i) { + char c = s[i]; + switch (c) { + case '\x00': + ret += "\\x00"; + break; + case '\n': + ret += "\\n"; + break; + case '\r': + ret += "\\r"; + break; + case '\\': + ret += "\\\\"; + break; + case '\'': + ret += "\\'"; + break; + case '\"': + ret += "\\\""; + break; + case '\x1a': + ret += "\\x1a"; + break; + default: + ret.push_back(c); + break; + } + } + + return ret; +} + +bool Strings::IsNumber(const std::string &s) +{ + try { + auto r = stod(s); + return true; + } + catch (std::exception &) { + return false; + } +} + + +std::string Strings::Join(const std::vector &ar, const std::string &delim) +{ + std::string ret; + for (size_t i = 0; i < ar.size(); ++i) { + if (i != 0) { + ret += delim; + } + + ret += ar[i]; + } + + return ret; +} + +void +Strings::FindReplace(std::string &string_subject, const std::string &search_string, const std::string &replace_string) +{ + if (string_subject.find(search_string) == std::string::npos) { + return; + } + + size_t start_pos = 0; + while ((start_pos = string_subject.find(search_string, start_pos)) != std::string::npos) { + string_subject.replace(start_pos, search_string.length(), replace_string); + start_pos += replace_string.length(); + } +} + +std::string Strings::Replace(std::string subject, const std::string &search, const std::string &replace) +{ + size_t pos = 0; + while ((pos = subject.find(search, pos)) != std::string::npos) { + subject.replace(pos, search.length(), replace); + pos += replace.length(); + } + return subject; +} + +std::string Strings::Repeat(std::string s, int n) +{ + std::string s1 = s; + for (int i = 1; i < n; i++) { + s += s1; + } + + return s; +} + +bool Strings::Contains(std::vector container, std::string element) +{ + return std::find(container.begin(), container.end(), element) != container.end(); +} + +std::string Strings::Commify(const std::string &number) +{ + std::string temp_string; + + auto string_length = static_cast(number.length()); + + int i = 0; + for (i = string_length - 3; i >= 0; i -= 3) { + if (i > 0) { + temp_string = "," + number.substr(static_cast(i), 3) + temp_string; + } + else { + temp_string = number.substr(static_cast(i), 3) + temp_string; + } + } + + if (i < 0) { + temp_string = number.substr(0, static_cast(3 + i)) + temp_string; + } + + return temp_string; +} + +const std::string Strings::ToLower(std::string s) +{ + std::transform( + s.begin(), s.end(), s.begin(), + [](unsigned char c) { return ::tolower(c); } + ); + return s; +} +const std::string Strings::ToUpper(std::string s) +{ + std::transform( + s.begin(), s.end(), s.begin(), + [](unsigned char c) { return ::toupper(c); } + ); + return s; +} +const std::string Strings::UcFirst(std::string s) +{ + std::string output = s; + if (!s.empty()) { + output[0] = static_cast(::toupper(s[0])); + } + + return output; +} + + +std::vector Strings::Wrap(std::vector &src, std::string character) +{ + std::vector new_vector; + new_vector.reserve(src.size()); + + for (auto &e: src) { + if (e == "null") { + new_vector.emplace_back(e); + continue; + } + + new_vector.emplace_back(character + e + character); + } + + return new_vector; +} + +std::string Strings::NumberToWords(unsigned long long int n) +{ + // string to store word representation of given number + std::string res; + + // this handles digits at ones & tens place + res = Strings::ConvertToDigit((n % 100), ""); + + if (n > 100 && n % 100) { + res = "and " + res; + } + + // this handles digit at hundreds place + res = Strings::ConvertToDigit(((n / 100) % 10), "Hundred ") + res; + + // this handles digits at thousands & tens thousands place + res = Strings::ConvertToDigit(((n / 1000) % 100), "Thousand ") + res; + + // this handles digits at hundred thousands & one millions place + res = Strings::ConvertToDigit(((n / 100000) % 100), "Lakh, ") + res; + + // this handles digits at ten millions & hundred millions place + res = Strings::ConvertToDigit((n / 10000000) % 100, "Crore, ") + res; + + // this handles digits at ten millions & hundred millions place + res = Strings::ConvertToDigit((n / 1000000000) % 100, "Billion, ") + res; + + return res; +} +std::string Strings::Money(uint32 platinum, uint32 gold, uint32 silver, uint32 copper) +{ + std::string money_string = "Unknown"; + if (copper && silver && gold && platinum) { // CSGP + money_string = fmt::format( + "{} Platinum, {} Gold, {} Silver, and {} Copper", + Strings::Commify(std::to_string(platinum)), + Strings::Commify(std::to_string(gold)), + Strings::Commify(std::to_string(silver)), + Strings::Commify(std::to_string(copper)) + ); + } + else if (copper && silver && gold && !platinum) { // CSG + money_string = fmt::format( + "{} Gold, {} Silver, and {} Copper", + Strings::Commify(std::to_string(gold)), + Strings::Commify(std::to_string(silver)), + Strings::Commify(std::to_string(copper)) + ); + } + else if (copper && silver && !gold && !platinum) { // CS + money_string = fmt::format( + "{} Silver and {} Copper", + Strings::Commify(std::to_string(silver)), + Strings::Commify(std::to_string(copper)) + ); + } + else if (!copper && silver && gold && platinum) { // SGP + money_string = fmt::format( + "{} Platinum, {} Gold, and {} Silver", + Strings::Commify(std::to_string(platinum)), + Strings::Commify(std::to_string(gold)), + Strings::Commify(std::to_string(silver)) + ); + } + else if (!copper && silver && gold && !platinum) { // SG + money_string = fmt::format( + "{} Gold and {} Silver", + Strings::Commify(std::to_string(gold)), + Strings::Commify(std::to_string(silver)) + ); + } + else if (copper && !silver && gold && platinum) { // CGP + money_string = fmt::format( + "{} Platinum, {} Gold, and {} Copper", + Strings::Commify(std::to_string(platinum)), + Strings::Commify(std::to_string(gold)), + Strings::Commify(std::to_string(copper)) + ); + } + else if (copper && !silver && gold && !platinum) { // CG + money_string = fmt::format( + "{} Gold and {} Copper", + Strings::Commify(std::to_string(gold)), + Strings::Commify(std::to_string(copper)) + ); + } + else if (!copper && !silver && gold && platinum) { // GP + money_string = fmt::format( + "{} Platinum and {} Gold", + Strings::Commify(std::to_string(platinum)), + Strings::Commify(std::to_string(gold)) + ); + } + else if (!copper && !silver && !gold && platinum) { // P + money_string = fmt::format( + "{} Platinum", + Strings::Commify(std::to_string(platinum)) + ); + } + else if (!copper && !silver && gold && !platinum) { // G + money_string = fmt::format( + "{} Gold", + Strings::Commify(std::to_string(gold)) + ); + } + else if (!copper && silver && !gold && !platinum) { // S + money_string = fmt::format( + "{} Silver", + Strings::Commify(std::to_string(silver)) + ); + } + else if (copper && !silver && !gold && !platinum) { // C + money_string = fmt::format( + "{} Copper", + Strings::Commify(std::to_string(copper)) + ); + } + return money_string; +} +std::string Strings::SecondsToTime(int duration, bool is_milliseconds) +{ + if (duration <= 0) { + return "Unknown"; + } + + if (is_milliseconds && duration < 1000) { + return fmt::format( + "{} Millisecond{}", + duration, + duration != 1 ? "s" : "" + ); + } + + int timer_length = ( + is_milliseconds ? + static_cast(std::ceil(static_cast(duration) / 1000.0f)) : + duration + ); + + int days = int(timer_length / 86400); + timer_length %= 86400; + int hours = int(timer_length / 3600); + timer_length %= 3600; + int minutes = int(timer_length / 60); + timer_length %= 60; + int seconds = timer_length; + std::string time_string = "Unknown"; + std::string day_string = (days == 1 ? "Day" : "Days"); + std::string hour_string = (hours == 1 ? "Hour" : "Hours"); + std::string minute_string = (minutes == 1 ? "Minute" : "Minutes"); + std::string second_string = (seconds == 1 ? "Second" : "Seconds"); + if (days && hours && minutes && seconds) { // DHMS + time_string = fmt::format( + "{} {}, {} {}, {} {}, and {} {}", + days, + day_string, + hours, + hour_string, + minutes, + minute_string, + seconds, + second_string + ); + } + else if (days && hours && minutes && !seconds) { // DHM + time_string = fmt::format( + "{} {}, {} {}, and {} {}", + days, + day_string, + hours, + hour_string, + minutes, + minute_string + ); + } + else if (days && hours && !minutes && seconds) { // DHS + time_string = fmt::format( + "{} {}, {} {}, and {} {}", + days, + day_string, + hours, + hour_string, + seconds, + second_string + ); + } + else if (days && hours && !minutes && !seconds) { // DH + time_string = fmt::format( + "{} {} and {} {}", + days, + day_string, + hours, + hour_string + ); + } + else if (days && !hours && minutes && seconds) { // DMS + time_string = fmt::format( + "{} {}, {} {}, and {} {}", + days, + day_string, + minutes, + minute_string, + seconds, + second_string + ); + } + else if (days && !hours && minutes && !seconds) { // DM + time_string = fmt::format( + "{} {} and {} {}", + days, + day_string, + minutes, + minute_string + ); + } + else if (days && !hours && !minutes && seconds) { // DS + time_string = fmt::format( + "{} {} and {} {}", + days, + day_string, + seconds, + second_string + ); + } + else if (days && !hours && !minutes && !seconds) { // D + time_string = fmt::format( + "{} {}", + days, + day_string + ); + } + else if (!days && hours && minutes && seconds) { // HMS + time_string = fmt::format( + "{} {}, {} {}, and {} {}", + hours, + hour_string, + minutes, + minute_string, + seconds, + second_string + ); + } + else if (!days && hours && minutes && !seconds) { // HM + time_string = fmt::format( + "{} {} and {} {}", + hours, + hour_string, + minutes, + minute_string + ); + } + else if (!days && hours && !minutes && seconds) { // HS + time_string = fmt::format( + "{} {} and {} {}", + hours, + hour_string, + seconds, + second_string + ); + } + else if (!days && hours && !minutes && !seconds) { // H + time_string = fmt::format( + "{} {}", + hours, + hour_string + ); + } + else if (!days && !hours && minutes && seconds) { // MS + time_string = fmt::format( + "{} {} and {} {}", + minutes, + minute_string, + seconds, + second_string + ); + } + else if (!days && !hours && minutes && !seconds) { // M + time_string = fmt::format( + "{} {}", + minutes, + minute_string + ); + } + else if (!days && !hours && !minutes && seconds) { // S + time_string = fmt::format( + "{} {}", + seconds, + second_string + ); + } + return time_string; +} + +std::string &Strings::LTrim(std::string &str, const std::string &chars) +{ + str.erase(0, str.find_first_not_of(chars)); + return str; +} + +std::string Strings::MillisecondsToTime(int duration) +{ + return SecondsToTime(duration, true); +} + +std::string &Strings::RTrim(std::string &str, const std::string &chars) +{ + str.erase(str.find_last_not_of(chars) + 1); + return str; +} + +std::string &Strings::Trim(std::string &str, const std::string &chars) +{ + return LTrim(RTrim(str, chars), chars); +} + +// Function to convert single digit or two digit number into words +std::string Strings::ConvertToDigit(int n, std::string suffix) +{ + // if n is zero + if (n == 0) { + return ""; + } + + // split n if it is more than 19 + if (n > 19) { + return NUM_TO_ENGLISH_Y[n / 10] + NUM_TO_ENGLISH_X[n % 10] + suffix; + } + else { + return NUM_TO_ENGLISH_X[n] + suffix; + } +} diff --git a/common/strings.h b/common/strings.h new file mode 100644 index 000000000..d251405cf --- /dev/null +++ b/common/strings.h @@ -0,0 +1,216 @@ +/* + * Copyright 2013 Facebook, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef _STRINGUTIL_H_ +#define _STRINGUTIL_H_ + +#include +#include +#include +#include +#include + +#ifndef _WIN32 +// this doesn't appear to affect linux-based systems..need feedback for _WIN64 +#include + +#endif + +#ifdef _WINDOWS +#include +#include +#include +#endif + +#include "types.h" + +class Strings { +public: + static bool Contains(std::vector container, std::string element); + static bool IsNumber(const std::string &s); + static const std::string ToLower(std::string s); + static const std::string ToUpper(std::string s); + static const std::string UcFirst(std::string s); + static std::string <rim(std::string &str, const std::string &chars = "\t\n\v\f\r "); + static std::string &RTrim(std::string &str, const std::string &chars = "\t\n\v\f\r "); + static std::string &Trim(std::string &str, const std::string &chars = "\t\n\v\f\r "); + static std::string Commify(const std::string &number); + static std::string ConvertToDigit(int n, std::string suffix); + static std::string Escape(const std::string &s); + static std::string GetBetween(const std::string &s, std::string start_delim, std::string stop_delim); + static std::string Implode(std::string glue, std::vector src); + static std::string Join(const std::vector &ar, const std::string &delim); + static std::string MillisecondsToTime(int duration); + static std::string Money(uint32 platinum, uint32 gold = 0, uint32 silver = 0, uint32 copper = 0); + static std::string NumberToWords(unsigned long long int n); + static std::string Repeat(std::string s, int n); + static std::string Replace(std::string subject, const std::string &search, const std::string &replace); + static std::string SecondsToTime(int duration, bool is_milliseconds = false); + static std::string::size_type SearchDelim(const std::string &haystack, const std::string &needle, const char deliminator = ','); + static std::vector Split(const std::string &s, const char delim = ','); + static std::vector Split(std::string s, std::string delimiter); + static std::vector Wrap(std::vector &src, std::string character); + static void FindReplace(std::string &string_subject, const std::string &search_string, const std::string &replace_string); + + template + static std::string + ImplodePair(const std::string &glue, const std::pair &encapsulation, const std::vector &src) + { + if (src.empty()) { + return {}; + } + std::ostringstream oss; + for (const T &src_iter: src) { + oss << encapsulation.first << src_iter << encapsulation.second << glue; + } + std::string output(oss.str()); + output.resize(output.size() - glue.size()); + return output; + } +}; + +const std::string StringFormat(const char *format, ...); +const std::string vStringFormat(const char *format, va_list args); + +// For converstion of numerics into English +// Used for grid nodes, as NPC names remove numerals. +// But general purpose + +const std::string NUM_TO_ENGLISH_X[] = { + "", "One ", "Two ", "Three ", "Four ", + "Five ", "Six ", "Seven ", "Eight ", "Nine ", "Ten ", "Eleven ", + "Twelve ", "Thirteen ", "Fourteen ", "Fifteen ", + "Sixteen ", "Seventeen ", "Eighteen ", "Nineteen " +}; + +const std::string NUM_TO_ENGLISH_Y[] = { + "", "", "Twenty ", "Thirty ", "Forty ", + "Fifty ", "Sixty ", "Seventy ", "Eighty ", "Ninety " +}; + +// _WIN32 builds require that #include be included in whatever code file the invocation is made from (no header files) +template +std::vector join_pair( + const std::string &glue, + const std::pair &encapsulation, + const std::vector> &src +) +{ + if (src.empty()) { + return {}; + } + + std::vector output; + + for (const std::pair &src_iter: src) { + output.push_back( + + fmt::format( + "{}{}{}{}{}{}{}", + encapsulation.first, + src_iter.first, + encapsulation.second, + glue, + encapsulation.first, + src_iter.second, + encapsulation.second + ) + ); + } + + return output; +} + +// _WIN32 builds require that #include be included in whatever code file the invocation is made from (no header files) +template +std::vector join_tuple( + const std::string &glue, + const std::pair &encapsulation, + const std::vector> &src +) +{ + if (src.empty()) { + return {}; + } + + std::vector output; + + for (const std::tuple &src_iter: src) { + + output.push_back( + + fmt::format( + "{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}", + encapsulation.first, + std::get<0>(src_iter), + encapsulation.second, + glue, + encapsulation.first, + std::get<1>(src_iter), + encapsulation.second, + glue, + encapsulation.first, + std::get<2>(src_iter), + encapsulation.second, + glue, + encapsulation.first, + std::get<3>(src_iter), + encapsulation.second + ) + ); + } + + return output; +} + +// misc functions +std::string SanitizeWorldServerName(std::string server_long_name); +std::vector GetBadWords(); +void ParseAccountString(const std::string &s, std::string &account, std::string &loginserver); + +// old c string functions + +bool atobool(const char *iBool); +bool isAlphaNumeric(const char *text); +bool strn0cpyt(char *dest, const char *source, uint32 size); +char *CleanMobName(const char *in, char *out); +char *RemoveApostrophes(const char *s); +char *strn0cpy(char *dest, const char *source, uint32 size); +const char *ConvertArray(int64 input, char *returnchar); +const char *ConvertArrayF(float input, char *returnchar); +const char *MakeLowerString(const char *source); +uint32 hextoi(const char *num); +uint64 hextoi64(const char *num); +void MakeLowerString(const char *source, char *target); +void RemoveApostrophes(std::string &s); +std::string FormatName(const std::string &char_name); +bool IsAllowedWorldServerCharacterList(char c); +void SanitizeWorldServerName(char *name); + +template +auto CleanMobName(InputIterator first, InputIterator last, OutputIterator result) +{ + for (; first != last; ++first) { + if (*first == '_') { + *result = ' '; + } + else if (isalpha(*first) || *first == '`') { + *result = *first; + } + } + return result; +} + +#endif diff --git a/common/strings_legacy.cpp b/common/strings_legacy.cpp new file mode 100644 index 000000000..f86bd60c9 --- /dev/null +++ b/common/strings_legacy.cpp @@ -0,0 +1,335 @@ +#include +#include "strings.h" +#include +#include +#include + +#ifdef _WINDOWS +#include + +#define snprintf _snprintf +#define strncasecmp _strnicmp +#define strcasecmp _stricmp + +#else + +#include +#include +#include + +#endif + +#ifndef va_copy +#define va_copy(d,s) ((d) = (s)) +#endif + +// normal strncpy doesnt put a null term on copied strings, this one does +// ref: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wcecrt/htm/_wcecrt_strncpy_wcsncpy.asp +char *strn0cpy(char *dest, const char *source, uint32 size) +{ + if (!dest) { + return 0; + } + if (size == 0 || source == 0) { + dest[0] = 0; + return dest; + } + strncpy(dest, source, size); + dest[size - 1] = 0; + return dest; +} + +// String N w/null Copy Truncated? +// return value =true if entire string(source) fit, false if it was truncated +bool strn0cpyt(char *dest, const char *source, uint32 size) +{ + if (!dest) { + return 0; + } + if (size == 0 || source == 0) { + dest[0] = 0; + return false; + } + strncpy(dest, source, size); + dest[size - 1] = 0; + return (bool) (source[strlen(dest)] == 0); +} + +const char *MakeLowerString(const char *source) +{ + static char str[128]; + if (!source) { + return nullptr; + } + MakeLowerString(source, str); + return str; +} + +void MakeLowerString(const char *source, char *target) +{ + if (!source || !target) { + *target = 0; + return; + } + while (*source) { + *target = tolower(*source); + target++; + source++; + } + *target = 0; +} + +uint32 hextoi(const char *num) +{ + if (num == nullptr) { + return 0; + } + + int len = strlen(num); + if (len < 3) { + return 0; + } + + if (num[0] != '0' || (num[1] != 'x' && num[1] != 'X')) { + return 0; + } + + uint32 ret = 0; + int mul = 1; + for (int i = len - 1; i >= 2; i--) { + if (num[i] >= 'A' && num[i] <= 'F') { + ret += ((num[i] - 'A') + 10) * mul; + } + else if (num[i] >= 'a' && num[i] <= 'f') { + ret += ((num[i] - 'a') + 10) * mul; + } + else if (num[i] >= '0' && num[i] <= '9') { + ret += (num[i] - '0') * mul; + } + else { + return 0; + } + mul *= 16; + } + return ret; +} + +uint64 hextoi64(const char *num) +{ + if (num == nullptr) { + return 0; + } + + int len = strlen(num); + if (len < 3) { + return 0; + } + + if (num[0] != '0' || (num[1] != 'x' && num[1] != 'X')) { + return 0; + } + + uint64 ret = 0; + int mul = 1; + for (int i = len - 1; i >= 2; i--) { + if (num[i] >= 'A' && num[i] <= 'F') { + ret += ((num[i] - 'A') + 10) * mul; + } + else if (num[i] >= 'a' && num[i] <= 'f') { + ret += ((num[i] - 'a') + 10) * mul; + } + else if (num[i] >= '0' && num[i] <= '9') { + ret += (num[i] - '0') * mul; + } + else { + return 0; + } + mul *= 16; + } + return ret; +} + +bool atobool(const char *iBool) +{ + + if (iBool == nullptr) { + return false; + } + if (!strcasecmp(iBool, "true")) { + return true; + } + if (!strcasecmp(iBool, "false")) { + return false; + } + if (!strcasecmp(iBool, "yes")) { + return true; + } + if (!strcasecmp(iBool, "no")) { + return false; + } + if (!strcasecmp(iBool, "on")) { + return true; + } + if (!strcasecmp(iBool, "off")) { + return false; + } + if (!strcasecmp(iBool, "enable")) { + return true; + } + if (!strcasecmp(iBool, "disable")) { + return false; + } + if (!strcasecmp(iBool, "enabled")) { + return true; + } + if (!strcasecmp(iBool, "disabled")) { + return false; + } + if (!strcasecmp(iBool, "y")) { + return true; + } + if (!strcasecmp(iBool, "n")) { + return false; + } + if (atoi(iBool)) { + return true; + } + return false; +} + +// removes the crap and turns the underscores into spaces. +char *CleanMobName(const char *in, char *out) +{ + unsigned i, j; + + for (i = j = 0; i < strlen(in); i++) { + // convert _ to space.. any other conversions like this? I *think* this + // is the only non alpha char that's not stripped but converted. + if (in[i] == '_') { + out[j++] = ' '; + } + else { + if (isalpha(in[i]) || (in[i] == '`')) { // numbers, #, or any other crap just gets skipped + out[j++] = in[i]; + } + } + } + out[j] = 0; // terimnate the string before returning it + return out; +} + + +void RemoveApostrophes(std::string &s) +{ + for (unsigned int i = 0; i < s.length(); ++i) + if (s[i] == '\'') { + s[i] = '_'; + } +} + +char *RemoveApostrophes(const char *s) +{ + auto NewString = new char[strlen(s) + 1]; + + strcpy(NewString, s); + + for (unsigned int i = 0; i < strlen(NewString); ++i) + if (NewString[i] == '\'') { + NewString[i] = '_'; + } + + return NewString; +} + +const char *ConvertArray(int64 input, char *returnchar) +{ + sprintf(returnchar, "%lld", input); + return returnchar; +} + +const char *ConvertArrayF(float input, char *returnchar) +{ + sprintf(returnchar, "%0.2f", input); + return returnchar; +} + +bool isAlphaNumeric(const char *text) +{ + for (unsigned int charIndex = 0; charIndex < strlen(text); charIndex++) { + if ((text[charIndex] < 'a' || text[charIndex] > 'z') && + (text[charIndex] < 'A' || text[charIndex] > 'Z') && + (text[charIndex] < '0' || text[charIndex] > '9')) { + return false; + } + } + + return true; +} + +// first letter capitalized and rest made lower case +std::string FormatName(const std::string &char_name) +{ + std::string formatted(char_name); + if (!formatted.empty()) { + std::transform(formatted.begin(), formatted.end(), formatted.begin(), ::tolower); + formatted[0] = ::toupper(formatted[0]); + } + return formatted; +} + +bool IsAllowedWorldServerCharacterList(char c) +{ + const char *valid_characters = ":[](){}.!@#$%^&*-=+<>/\\|'\""; + if (strchr(valid_characters, c)) { + return true; + } + + return false; +} + +void SanitizeWorldServerName(char *name) +{ + std::string server_long_name = name; + + strcpy(name, SanitizeWorldServerName(server_long_name).c_str()); +} + +// original source: +// https://github.com/facebook/folly/blob/master/folly/String.cpp +// +const std::string vStringFormat(const char *format, va_list args) +{ + std::string output; + va_list tmpargs; + + va_copy(tmpargs, args); + int characters_used = vsnprintf(nullptr, 0, format, tmpargs); + va_end(tmpargs); + + // Looks like we have a valid format string. + if (characters_used > 0) { + output.resize(characters_used + 1); + + va_copy(tmpargs, args); + characters_used = vsnprintf(&output[0], output.capacity(), format, tmpargs); + va_end(tmpargs); + + output.resize(characters_used); + + // We shouldn't have a format error by this point, but I can't imagine what error we + // could have by this point. Still, return empty string; + if (characters_used < 0) { + output.clear(); + } + } + return output; +} + +const std::string StringFormat(const char *format, ...) +{ + va_list args; + va_start(args, format); + std::string output = vStringFormat(format, args); + va_end(args); + return output; +} diff --git a/common/strings_misc.cpp b/common/strings_misc.cpp new file mode 100644 index 000000000..08355e15e --- /dev/null +++ b/common/strings_misc.cpp @@ -0,0 +1,371 @@ +#include +#include "strings.h" +#include +#include +#include + +#ifdef _WINDOWS +#include + +#define snprintf _snprintf +#define strncasecmp _strnicmp +#define strcasecmp _stricmp + +#else + +#include +#include +#include + +#endif + +#ifndef va_copy +#define va_copy(d,s) ((d) = (s)) +#endif + +std::string SanitizeWorldServerName(std::string server_long_name) +{ + server_long_name.erase( + std::remove_if( + server_long_name.begin(), + server_long_name.end(), + [](char c) { + return !(std::isalpha(c) || std::isalnum(c) || std::isspace(c) || IsAllowedWorldServerCharacterList(c)); + } + ), server_long_name.end() + ); + + server_long_name = Strings::Trim(server_long_name); + + // bad word filter + for (auto &piece: Strings::Split(server_long_name, " ")) { + for (auto &word: GetBadWords()) { + // for shorter words that can actually be part of legitimate words + // make sure that it isn't part of another word by matching on a space + if (Strings::ToLower(piece) == word) { + Strings::FindReplace( + server_long_name, + piece, + Strings::Repeat("*", (int) word.length()) + ); + continue; + } + + auto pos = Strings::ToLower(piece).find(word); + if (Strings::ToLower(piece).find(word) != std::string::npos && piece.length() > 4 && word.length() > 4) { + auto found_word = piece.substr(pos, word.length()); + std::string replaced_piece = piece.substr(pos, word.length()); + + Strings::FindReplace( + server_long_name, + replaced_piece, + Strings::Repeat("*", (int) word.length()) + ); + } + } + } + + return server_long_name; +} + +std::vector GetBadWords() +{ + return std::vector{ + "2g1c", + "acrotomophilia", + "anal", + "anilingus", + "anus", + "apeshit", + "arsehole", + "ass", + "asshole", + "assmunch", + "autoerotic", + "babeland", + "bangbros", + "bangbus", + "bareback", + "barenaked", + "bastard", + "bastardo", + "bastinado", + "bbw", + "bdsm", + "beaner", + "beaners", + "beaver", + "beastiality", + "bestiality", + "bimbos", + "birdlock", + "bitch", + "bitches", + "blowjob", + "blumpkin", + "bollocks", + "bondage", + "boner", + "boob", + "boobs", + "bukkake", + "bulldyke", + "bullshit", + "bung", + "bunghole", + "busty", + "butt", + "buttcheeks", + "butthole", + "camel toe", + "camgirl", + "camslut", + "camwhore", + "carpetmuncher", + "cialis", + "circlejerk", + "clit", + "clitoris", + "clusterfuck", + "cock", + "cocks", + "coprolagnia", + "coprophilia", + "cornhole", + "coon", + "coons", + "creampie", + "cum", + "cumming", + "cumshot", + "cumshots", + "cunnilingus", + "cunt", + "darkie", + "daterape", + "deepthroat", + "dendrophilia", + "dick", + "dildo", + "dingleberry", + "dingleberries", + "doggiestyle", + "doggystyle", + "dolcett", + "domination", + "dominatrix", + "dommes", + "hump", + "dvda", + "ecchi", + "ejaculation", + "erotic", + "erotism", + "escort", + "eunuch", + "fag", + "faggot", + "fecal", + "felch", + "fellatio", + "feltch", + "femdom", + "figging", + "fingerbang", + "fingering", + "fisting", + "footjob", + "frotting", + "fuck", + "fuckin", + "fucking", + "fucktards", + "fudgepacker", + "futanari", + "gangbang", + "gangbang", + "gaysex", + "genitals", + "goatcx", + "goatse", + "gokkun", + "goodpoop", + "goregasm", + "grope", + "g-spot", + "guro", + "handjob", + "hentai", + "homoerotic", + "honkey", + "hooker", + "horny", + "humping", + "incest", + "intercourse", + "jailbait", + "jigaboo", + "jiggaboo", + "jiggerboo", + "jizz", + "juggs", + "kike", + "kinbaku", + "kinkster", + "kinky", + "knobbing", + "livesex", + "lolita", + "lovemaking", + "masturbate", + "masturbating", + "masturbation", + "milf", + "mong", + "motherfucker", + "muffdiving", + "nambla", + "nawashi", + "negro", + "neonazi", + "nigga", + "nigger", + "nimphomania", + "nipple", + "nipples", + "nsfw", + "nude", + "nudity", + "nutten", + "nympho", + "nymphomania", + "octopussy", + "omorashi", + "orgasm", + "orgy", + "paedophile", + "paki", + "panties", + "panty", + "pedobear", + "pedophile", + "pegging", + "penis", + "pikey", + "pissing", + "pisspig", + "playboy", + "ponyplay", + "poof", + "poon", + "poontang", + "punany", + "poopchute", + "porn", + "porno", + "pornography", + "pthc", + "pubes", + "pussy", + "queaf", + "queef", + "quim", + "raghead", + "rape", + "raping", + "rapist", + "rectum", + "rimjob", + "rimming", + "sadism", + "santorum", + "scat", + "schlong", + "scissoring", + "semen", + "sex", + "sexcam", + "sexo", + "sexy", + "sexual", + "sexually", + "sexuality", + "shemale", + "shibari", + "shit", + "shitblimp", + "shitty", + "shota", + "shrimping", + "skeet", + "slanteye", + "slut", + "s&m", + "smut", + "snatch", + "snowballing", + "sodomize", + "sodomy", + "spastic", + "spic", + "splooge", + "spooge", + "spunk", + "strapon", + "strappado", + "suck", + "sucks", + "swastika", + "swinger", + "threesome", + "throating", + "thumbzilla", + "tight white", + "tit", + "tits", + "titties", + "titty", + "topless", + "tosser", + "towelhead", + "tranny", + "tribadism", + "tubgirl", + "tushy", + "twat", + "twink", + "twinkie", + "undressing", + "upskirt", + "urophilia", + "vagina", + "viagra", + "vibrator", + "vorarephilia", + "voyeur", + "voyeurweb", + "voyuer", + "vulva", + "wank", + "wetback", + "whore", + "worldsex", + "xx", + "xxx", + "yaoi", + "yiffy", + "zoophilia" + }; +} + +void ParseAccountString(const std::string &s, std::string &account, std::string &loginserver) +{ + auto split = Strings::Split(s, ':'); + if (split.size() == 2) { + loginserver = split[0]; + account = split[1]; + } + else if (split.size() == 1) { + account = split[0]; + } +} diff --git a/eqlaunch/worldserver.cpp b/eqlaunch/worldserver.cpp index c50b58e09..98e34da81 100644 --- a/eqlaunch/worldserver.cpp +++ b/eqlaunch/worldserver.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "../common/eqemu_logsys.h" #include "../common/servertalk.h" #include "../common/eqemu_config.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "worldserver.h" #include "zone_launch.h" diff --git a/loginserver/account_management.cpp b/loginserver/account_management.cpp index 2c3506db0..92a5c33aa 100644 --- a/loginserver/account_management.cpp +++ b/loginserver/account_management.cpp @@ -3,7 +3,7 @@ #include "../common/event/task_scheduler.h" #include "../common/event/event_loop.h" #include "../common/net/dns.h" -#include "../common/string_util.h" +#include "../common/strings.h" extern LoginServer server; EQ::Event::TaskScheduler task_runner; @@ -378,7 +378,7 @@ uint32 AccountManagement::CheckExternalLoginserverUserCredentials( } ); - auto s = SplitString(server.options.GetEQEmuLoginServerAddress(), ':'); + auto s = Strings::Split(server.options.GetEQEmuLoginServerAddress(), ':'); if (s.size() == 2) { auto address = s[0]; auto port = std::stoi(s[1]); diff --git a/loginserver/client.cpp b/loginserver/client.cpp index 01a5abf50..eb60d1c68 100644 --- a/loginserver/client.cpp +++ b/loginserver/client.cpp @@ -2,7 +2,7 @@ #include "login_server.h" #include "../common/misc_functions.h" #include "../common/eqemu_logsys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "encryption.h" #include "account_management.h" @@ -217,7 +217,7 @@ void Client::Handle_Login(const char *data, unsigned int size) else { if (server.options.IsPasswordLoginAllowed()) { cred = (&outbuffer[1 + user.length()]); - auto components = SplitString(user, ':'); + auto components = Strings::Split(user, ':'); if (components.size() == 2) { db_loginserver = components[0]; user = components[1]; diff --git a/loginserver/database.cpp b/loginserver/database.cpp index 18612dac6..2653b3231 100644 --- a/loginserver/database.cpp +++ b/loginserver/database.cpp @@ -3,7 +3,7 @@ #include "database.h" #include "login_server.h" #include "../common/eqemu_logsys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/util/uuid.h" extern LoginServer server; @@ -71,8 +71,8 @@ bool Database::GetLoginDataFromAccountInfo( { auto query = fmt::format( "SELECT id, account_password FROM login_accounts WHERE account_name = '{0}' AND source_loginserver = '{1}' LIMIT 1", - EscapeString(name), - EscapeString(loginserver) + Strings::Escape(name), + Strings::Escape(loginserver) ); auto results = QueryDatabase(query); @@ -125,8 +125,8 @@ bool Database::GetLoginTokenDataFromToken( "SELECT tbllogintokens.Id, tbllogintokens.IpAddress, tbllogintokenclaims.Name, tbllogintokenclaims.Value FROM tbllogintokens " "JOIN tbllogintokenclaims ON tbllogintokens.Id = tbllogintokenclaims.TokenId WHERE tbllogintokens.Expires > NOW() " "AND tbllogintokens.Id='{0}' AND tbllogintokens.IpAddress='{1}'", - EscapeString(token), - EscapeString(ip) + Strings::Escape(token), + Strings::Escape(ip) ); auto results = QueryDatabase(query); @@ -168,7 +168,7 @@ unsigned int Database::GetFreeID(const std::string &loginserver) { auto query = fmt::format( "SELECT IFNULL(MAX(id), 0) + 1 FROM login_accounts WHERE source_loginserver = '{0}'", - EscapeString(loginserver) + Strings::Escape(loginserver) ); auto results = QueryDatabase(query); @@ -225,10 +225,10 @@ uint32 Database::CreateLoginAccount( "INSERT INTO login_accounts (id, source_loginserver, account_name, account_password, account_email, last_login_date, last_ip_address, created_at) " "VALUES ({0}, '{1}', '{2}', '{3}', '{4}', NOW(), '127.0.0.1', NOW())", free_id, - EscapeString(loginserver), - EscapeString(name), - EscapeString(password), - EscapeString(email) + Strings::Escape(loginserver), + Strings::Escape(name), + Strings::Escape(password), + Strings::Escape(email) ); auto results = QueryDatabase(query); @@ -258,9 +258,9 @@ bool Database::CreateLoginDataWithID( "INSERT INTO login_accounts (id, source_loginserver, account_name, account_password, account_email, last_login_date, last_ip_address, created_at) " "VALUES ({0}, '{1}', '{2}', '{3}', 'local_creation', NOW(), '127.0.0.1', NOW())", id, - EscapeString(loginserver), - EscapeString(in_account_name), - EscapeString(in_account_password) + Strings::Escape(loginserver), + Strings::Escape(in_account_name), + Strings::Escape(in_account_password) ); auto results = QueryDatabase(query); @@ -288,8 +288,8 @@ bool Database::DoesLoginServerAccountExist( auto query = fmt::format( "SELECT account_name FROM login_accounts WHERE account_name = '{0}' AND source_loginserver = '{1}'", - EscapeString(name), - EscapeString(loginserver) + Strings::Escape(name), + Strings::Escape(loginserver) ); auto results = QueryDatabase(query); @@ -321,8 +321,8 @@ void Database::UpdateLoginserverAccountPasswordHash( auto query = fmt::format( "UPDATE login_accounts SET account_password = '{0}' WHERE account_name = '{1}' AND source_loginserver = '{2}'", hash, - EscapeString(name), - EscapeString(loginserver) + Strings::Escape(name), + Strings::Escape(loginserver) ); QueryDatabase(query); @@ -353,8 +353,8 @@ Database::DbWorldRegistration Database::GetWorldRegistration( " JOIN login_server_list_types AS SLT ON WSR.login_server_list_type_id = SLT.id\n" "WHERE\n" " WSR.short_name = '{}' AND WSR.long_name = '{}' AND WSR.login_server_admin_id = {} LIMIT 1", - EscapeString(short_name), - EscapeString(long_name), + Strings::Escape(short_name), + Strings::Escape(long_name), login_world_server_admin_id ); @@ -426,9 +426,9 @@ void Database::UpdateLSAccountInfo( "REPLACE login_accounts SET id = {0}, account_name = '{1}', account_password = sha('{2}'), " "account_email = '{3}', last_ip_address = '0.0.0.0', last_login_date = now()", id, - EscapeString(name), - EscapeString(password), - EscapeString(email) + Strings::Escape(name), + Strings::Escape(password), + Strings::Escape(email) ); QueryDatabase(query); @@ -444,7 +444,7 @@ void Database::UpdateWorldRegistration(unsigned int id, std::string long_name, s auto query = fmt::format( "UPDATE login_world_servers SET last_login_date = NOW(), last_ip_address = '{0}', long_name = '{1}' WHERE id = {2}", ip_address, - EscapeString(long_name), + Strings::Escape(long_name), id ); @@ -463,7 +463,7 @@ bool Database::UpdateLoginWorldAdminAccountPassword( auto results = QueryDatabase( fmt::format( "UPDATE login_server_admins SET account_password = '{}' WHERE id = {}", - EscapeString(admin_account_password_hash), + Strings::Escape(admin_account_password_hash), id ) ); @@ -484,8 +484,8 @@ bool Database::UpdateLoginWorldAdminAccountPasswordByUsername( auto results = QueryDatabase( fmt::format( "UPDATE login_server_admins SET account_password = '{}' WHERE account_name = '{}'", - EscapeString(admin_account_password_hash), - EscapeString(admin_account_username) + Strings::Escape(admin_account_password_hash), + Strings::Escape(admin_account_username) ) ); @@ -518,8 +518,8 @@ bool Database::CreateWorldRegistration( "INSERT INTO login_world_servers SET id = {0}, long_name = '{1}', short_name = '{2}', last_ip_address = '{3}', \n" "login_server_list_type_id = 3, login_server_admin_id = {4}, is_server_trusted = 0, tag_description = ''", id, - EscapeString(server_long_name), - EscapeString(server_short_name), + Strings::Escape(server_long_name), + Strings::Escape(server_short_name), server_remote_ip, server_admin_id ); @@ -598,11 +598,11 @@ uint32 Database::CreateLoginserverWorldAdminAccount( "INSERT INTO login_server_admins (account_name, account_password, first_name, last_name, email, registration_date, " "registration_ip_address) " "VALUES ('{0}', '{1}', '{2}', '{3}', '{4}', NOW(), '{5}')", - EscapeString(account_name), - EscapeString(account_password), - EscapeString(first_name), - EscapeString(last_name), - EscapeString(email), + Strings::Escape(account_name), + Strings::Escape(account_password), + Strings::Escape(first_name), + Strings::Escape(last_name), + Strings::Escape(email), ip_address ); @@ -621,7 +621,7 @@ bool Database::DoesLoginserverWorldAdminAccountExist( { auto query = fmt::format( "SELECT account_name FROM login_server_admins WHERE account_name = '{0}' LIMIT 1", - EscapeString(account_name) + Strings::Escape(account_name) ); auto results = QueryDatabase(query); @@ -638,7 +638,7 @@ Database::DbLoginServerAdmin Database::GetLoginServerAdmin(const std::string &ac auto query = fmt::format( "SELECT id, account_name, account_password, first_name, last_name, email, registration_date, registration_ip_address" " FROM login_server_admins WHERE account_name = '{0}' LIMIT 1", - EscapeString(account_name) + Strings::Escape(account_name) ); auto results = QueryDatabase(query); @@ -673,8 +673,8 @@ Database::DbLoginServerAccount Database::GetLoginServerAccountByAccountName( "SELECT id, account_name, account_password, account_email, source_loginserver, last_ip_address, last_login_date, " "created_at, updated_at" " FROM login_accounts WHERE account_name = '{0}' and source_loginserver = '{1}' LIMIT 1", - EscapeString(account_name), - EscapeString(source_loginserver) + Strings::Escape(account_name), + Strings::Escape(source_loginserver) ); auto results = QueryDatabase(query); diff --git a/loginserver/login_server.h b/loginserver/login_server.h index 015a35fcc..b80cf6ee5 100644 --- a/loginserver/login_server.h +++ b/loginserver/login_server.h @@ -11,7 +11,7 @@ #include "loginserver_webserver.h" /** - * Login server struct, contains every variable for the server that needs to exist outside the scope of main() + * Login server struct, Contains every variable for the server that needs to exist outside the scope of main() */ struct LoginServer { diff --git a/loginserver/loginserver_webserver.cpp b/loginserver/loginserver_webserver.cpp index bea7dc8ae..eb0acb551 100644 --- a/loginserver/loginserver_webserver.cpp +++ b/loginserver/loginserver_webserver.cpp @@ -2,7 +2,7 @@ #include "server_manager.h" #include "login_server.h" #include "../common/json/json.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "account_management.h" extern LoginServer server; @@ -444,7 +444,7 @@ namespace LoginserverWebserver { auto header_value = header.second; if (header_key == "Authorization") { authorization_key = header.second; - find_replace(authorization_key, "Bearer ", ""); + Strings::FindReplace(authorization_key, "Bearer ", ""); if (LoginserverWebserver::TokenManager::TokenExists(authorization_key)) { user_token = server.token_manager->GetToken(authorization_key); } diff --git a/loginserver/main.cpp b/loginserver/main.cpp index 46f2313b3..c2975d372 100644 --- a/loginserver/main.cpp +++ b/loginserver/main.cpp @@ -10,7 +10,7 @@ #include "login_server.h" #include "loginserver_webserver.h" #include "loginserver_command_handler.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include #include #include diff --git a/loginserver/world_server.cpp b/loginserver/world_server.cpp index 24004347d..f2caf6473 100644 --- a/loginserver/world_server.cpp +++ b/loginserver/world_server.cpp @@ -2,7 +2,7 @@ #include "login_server.h" #include "login_types.h" #include "../common/ip_util.h" -#include "../common/string_util.h" +#include "../common/strings.h" extern LoginServer server; @@ -1360,12 +1360,12 @@ void WorldServer::OnKeepAlive(EQ::Timer *t) void WorldServer::FormatWorldServerName(char *name, int8 server_list_type) { std::string server_long_name = name; - server_long_name = trim(server_long_name); + server_long_name = Strings::Trim(server_long_name); bool name_set_to_bottom = false; if (server_list_type == LS::ServerType::Standard) { if (server.options.IsWorldDevTestServersListBottom()) { - std::string s = str_tolower(server_long_name); + std::string s = Strings::ToLower(server_long_name); if (s.find("dev") != std::string::npos) { server_long_name = fmt::format("|D| {}", server_long_name); name_set_to_bottom = true; diff --git a/queryserv/database.cpp b/queryserv/database.cpp index 950a21f5c..5550880fb 100644 --- a/queryserv/database.cpp +++ b/queryserv/database.cpp @@ -47,7 +47,7 @@ #include "database.h" #include "../common/eq_packet_structs.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/servertalk.h" Database::Database() diff --git a/queryserv/lfguild.cpp b/queryserv/lfguild.cpp index df2a50c24..847738dcf 100644 --- a/queryserv/lfguild.cpp +++ b/queryserv/lfguild.cpp @@ -3,7 +3,7 @@ #include "database.h" #include "worldserver.h" #include "../common/eqemu_logsys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/packet_dump.h" #include "../common/rulesys.h" diff --git a/queryserv/queryserv.cpp b/queryserv/queryserv.cpp index bfffb5c73..81c299fb4 100644 --- a/queryserv/queryserv.cpp +++ b/queryserv/queryserv.cpp @@ -24,7 +24,7 @@ #include "../common/servertalk.h" #include "../common/platform.h" #include "../common/crash.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/event/event_loop.h" #include "../common/timer.h" #include "database.h" diff --git a/shared_memory/main.cpp b/shared_memory/main.cpp index d6e57d6f8..6e9453a54 100644 --- a/shared_memory/main.cpp +++ b/shared_memory/main.cpp @@ -26,7 +26,7 @@ #include "../common/crash.h" #include "../common/rulesys.h" #include "../common/eqemu_exception.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "items.h" #include "npc_faction.h" #include "loot.h" @@ -229,7 +229,7 @@ int main(int argc, char **argv) } break; case '-': { - auto split = SplitString(argv[i], '='); + auto split = Strings::Split(argv[i], '='); if (split.size() >= 2) { auto command = split[0]; auto argument = split[1]; diff --git a/tests/atobool_test.h b/tests/atobool_test.h index 5cc9ad872..21ef277d1 100644 --- a/tests/atobool_test.h +++ b/tests/atobool_test.h @@ -20,7 +20,7 @@ #define __EQEMU_TESTS_ATOBOOL_H #include "cppunit/cpptest.h" -#include "../common/string_util.h" +#include "../common/strings.h" class atoboolTest : public Test::Suite { typedef void(atoboolTest::*TestFunction)(void); diff --git a/tests/hextoi_32_64_test.h b/tests/hextoi_32_64_test.h index 1ad6c9d24..cd7bb83bd 100644 --- a/tests/hextoi_32_64_test.h +++ b/tests/hextoi_32_64_test.h @@ -20,7 +20,7 @@ #define __EQEMU_TESTS_HEXTOI_32_64_H #include "cppunit/cpptest.h" -#include "../common/string_util.h" +#include "../common/strings.h" class hextoi_32_64_Test : public Test::Suite { typedef void(hextoi_32_64_Test::*TestFunction)(void); @@ -100,12 +100,12 @@ public: // A bit excessive to do an exhaustive test like this // but it usefully tests multi digit hex. void DoubleDigitUpper32Test() { - + std::string prepend = "0x"; std::string hexToTest; std::string hexElements = "0123456789ABCDEF"; - uint32 value = 0; + uint32 value = 0; for (std::string::iterator firstDigitIter = hexElements.begin(); firstDigitIter != hexElements.end(); ++firstDigitIter) { for (std::string::iterator secondDigitIter = hexElements.begin(); secondDigitIter != hexElements.end(); ++secondDigitIter) { std::string hexToTest = prepend + *firstDigitIter + *secondDigitIter; @@ -122,7 +122,7 @@ public: std::string hexToTest; std::string hexElements = "0123456789abcdef"; - uint32 value = 0; + uint32 value = 0; for (std::string::iterator firstDigitIter = hexElements.begin(); firstDigitIter != hexElements.end(); ++firstDigitIter) { for (std::string::iterator secondDigitIter = hexElements.begin(); secondDigitIter != hexElements.end(); ++secondDigitIter) { std::string hexToTest = prepend + *firstDigitIter + *secondDigitIter; @@ -151,7 +151,7 @@ public: std::string hexToTest; std::string hexElements = "0123456789ABCDEF"; - uint64 value = 0; + uint64 value = 0; for (std::string::iterator firstDigitIter = hexElements.begin(); firstDigitIter != hexElements.end(); ++firstDigitIter) { std::string hexToTest = prepend + *firstDigitIter; TEST_ASSERT(hextoi64(hexToTest.c_str()) == value); @@ -165,7 +165,7 @@ public: std::string hexToTest; std::string hexElements = "0123456789abcdef"; - uint64 value = 0; + uint64 value = 0; for (std::string::iterator firstDigitIter = hexElements.begin(); firstDigitIter != hexElements.end(); ++firstDigitIter) { std::string hexToTest = prepend + *firstDigitIter; TEST_ASSERT(hextoi64(hexToTest.c_str()) == value); @@ -176,12 +176,12 @@ public: // A bit excessive to do an exhaustive test like this // but it usefully tests multi digit hex. void DoubleDigitUpper64Test() { - + std::string prepend = "0x"; std::string hexToTest; std::string hexElements = "0123456789ABCDEF"; - uint64 value = 0; + uint64 value = 0; for (std::string::iterator firstDigitIter = hexElements.begin(); firstDigitIter != hexElements.end(); ++firstDigitIter) { for (std::string::iterator secondDigitIter = hexElements.begin(); secondDigitIter != hexElements.end(); ++secondDigitIter) { std::string hexToTest = prepend + *firstDigitIter + *secondDigitIter; @@ -198,7 +198,7 @@ public: std::string hexToTest; std::string hexElements = "0123456789abcdef"; - uint64 value = 0; + uint64 value = 0; for (std::string::iterator firstDigitIter = hexElements.begin(); firstDigitIter != hexElements.end(); ++firstDigitIter) { for (std::string::iterator secondDigitIter = hexElements.begin(); secondDigitIter != hexElements.end(); ++secondDigitIter) { std::string hexToTest = prepend + *firstDigitIter + *secondDigitIter; diff --git a/tests/string_util_test.h b/tests/string_util_test.h index 1fdd325f9..b16c0936c 100644 --- a/tests/string_util_test.h +++ b/tests/string_util_test.h @@ -20,7 +20,7 @@ #define __EQEMU_TESTS_STRING_UTIL_H #include "cppunit/cpptest.h" -#include "../common/string_util.h" +#include "../common/strings.h" class StringUtilTest : public Test::Suite { typedef void(StringUtilTest::*TestFunction)(void); @@ -42,7 +42,7 @@ public: char c = 'a'; int i = 2014; float f = 3.1416; - + auto s = StringFormat(fmt, c, i, f); TEST_ASSERT_EQUALS(s.length(), 17); TEST_ASSERT(s.compare("Test: a 2014 3.14") == 0); @@ -62,7 +62,7 @@ public: t[8] = '\"'; t[9] = '\x1a'; - auto s = EscapeString(t); + auto s = Strings::Escape(t); TEST_ASSERT(s.compare("abc\\x00\\n\\r\\\\\\'\\\"\\x1a") == 0); } @@ -79,40 +79,40 @@ public: t[8] = '\"'; t[9] = '\x1a'; - auto s = EscapeString(t, 10); + auto s = Strings::Escape(t, 10); TEST_ASSERT(s.compare("abc\\x00\\n\\r\\\\\\'\\\"\\x1a") == 0); } void SearchDeliminatedStringTest() { std::string h = "befallen,charasis,dalnir,frontiermtns,gukbottom,iceclad,lakeofillomen,northkarana,qey2hh1,soldunga,southro,wakening,podisease,velketor,akheva,riwwi,bothunder,poair"; - TEST_ASSERT(search_deliminated_string(h, "befallen") == 0); - TEST_ASSERT(search_deliminated_string(h, "charasis") == 9); - TEST_ASSERT(search_deliminated_string(h, "dalnir") == 18); - TEST_ASSERT(search_deliminated_string(h, "frontiermtns") == 25); - TEST_ASSERT(search_deliminated_string(h, "gukbottom") == 38); - TEST_ASSERT(search_deliminated_string(h, "iceclad") == 48); - TEST_ASSERT(search_deliminated_string(h, "lakeofillomen") == 56); - TEST_ASSERT(search_deliminated_string(h, "northkarana") == 70); - TEST_ASSERT(search_deliminated_string(h, "qey2hh1") == 82); - TEST_ASSERT(search_deliminated_string(h, "soldunga") == 90); - TEST_ASSERT(search_deliminated_string(h, "southro") == 99); - TEST_ASSERT(search_deliminated_string(h, "wakening") == 107); - TEST_ASSERT(search_deliminated_string(h, "podisease") == 116); - TEST_ASSERT(search_deliminated_string(h, "velketor") == 126); - TEST_ASSERT(search_deliminated_string(h, "akheva") == 135); - TEST_ASSERT(search_deliminated_string(h, "riwwi") == 142); - TEST_ASSERT(search_deliminated_string(h, "bothunder") == 148); - TEST_ASSERT(search_deliminated_string(h, "poair") == 158); - TEST_ASSERT(search_deliminated_string(h, "pod") == std::string::npos); - TEST_ASSERT(search_deliminated_string(h, "air") == std::string::npos); - TEST_ASSERT(search_deliminated_string(h, "bef") == std::string::npos); - TEST_ASSERT(search_deliminated_string(h, "wwi") == std::string::npos); + TEST_ASSERT(Strings::SearchDelim(h, "befallen") == 0); + TEST_ASSERT(Strings::SearchDelim(h, "charasis") == 9); + TEST_ASSERT(Strings::SearchDelim(h, "dalnir") == 18); + TEST_ASSERT(Strings::SearchDelim(h, "frontiermtns") == 25); + TEST_ASSERT(Strings::SearchDelim(h, "gukbottom") == 38); + TEST_ASSERT(Strings::SearchDelim(h, "iceclad") == 48); + TEST_ASSERT(Strings::SearchDelim(h, "lakeofillomen") == 56); + TEST_ASSERT(Strings::SearchDelim(h, "northkarana") == 70); + TEST_ASSERT(Strings::SearchDelim(h, "qey2hh1") == 82); + TEST_ASSERT(Strings::SearchDelim(h, "soldunga") == 90); + TEST_ASSERT(Strings::SearchDelim(h, "southro") == 99); + TEST_ASSERT(Strings::SearchDelim(h, "wakening") == 107); + TEST_ASSERT(Strings::SearchDelim(h, "podisease") == 116); + TEST_ASSERT(Strings::SearchDelim(h, "velketor") == 126); + TEST_ASSERT(Strings::SearchDelim(h, "akheva") == 135); + TEST_ASSERT(Strings::SearchDelim(h, "riwwi") == 142); + TEST_ASSERT(Strings::SearchDelim(h, "bothunder") == 148); + TEST_ASSERT(Strings::SearchDelim(h, "poair") == 158); + TEST_ASSERT(Strings::SearchDelim(h, "pod") == std::string::npos); + TEST_ASSERT(Strings::SearchDelim(h, "air") == std::string::npos); + TEST_ASSERT(Strings::SearchDelim(h, "bef") == std::string::npos); + TEST_ASSERT(Strings::SearchDelim(h, "wwi") == std::string::npos); } void SplitStringTest() { std::string s = "123,456,789,"; - auto v = SplitString(s, ','); + auto v = Strings::Split(s, ','); TEST_ASSERT(v.size() == 3); TEST_ASSERT(v[0] == "123"); TEST_ASSERT(v[1] == "456"); diff --git a/ucs/chatchannel.cpp b/ucs/chatchannel.cpp index da3390f55..58c109e49 100644 --- a/ucs/chatchannel.cpp +++ b/ucs/chatchannel.cpp @@ -18,7 +18,7 @@ */ #include "../common/eqemu_logsys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "chatchannel.h" #include "clientlist.h" #include "database.h" @@ -693,7 +693,7 @@ void ServerToClient45SayLink(std::string& clientSayLink, const std::string& serv return; } - auto segments = SplitString(serverSayLink, '\x12'); + auto segments = Strings::Split(serverSayLink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { @@ -732,7 +732,7 @@ void ServerToClient50SayLink(std::string& clientSayLink, const std::string& serv return; } - auto segments = SplitString(serverSayLink, '\x12'); + auto segments = Strings::Split(serverSayLink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { @@ -771,7 +771,7 @@ void ServerToClient55SayLink(std::string& clientSayLink, const std::string& serv return; } - auto segments = SplitString(serverSayLink, '\x12'); + auto segments = Strings::Split(serverSayLink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { diff --git a/ucs/clientlist.cpp b/ucs/clientlist.cpp index 18f18a276..b0245d9a4 100644 --- a/ucs/clientlist.cpp +++ b/ucs/clientlist.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/global_define.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/eqemu_logsys.h" #include "../common/misc_functions.h" diff --git a/ucs/database.cpp b/ucs/database.cpp index d3e01b54d..c8aafff58 100644 --- a/ucs/database.cpp +++ b/ucs/database.cpp @@ -47,7 +47,7 @@ #include "database.h" #include "../common/eq_packet_structs.h" #include "../common/misc_functions.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "chatchannel.h" extern Clientlist *g_Clientlist; diff --git a/ucs/worldserver.cpp b/ucs/worldserver.cpp index f1b3f5bff..aa18b95e1 100644 --- a/ucs/worldserver.cpp +++ b/ucs/worldserver.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "../common/misc_functions.h" #include "../common/packet_functions.h" #include "../common/md5.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "worldserver.h" #include "clientlist.h" #include "ucsconfig.h" @@ -159,7 +159,7 @@ void Client45ToServerSayLink(std::string& serverSayLink, const std::string& clie return; } - auto segments = SplitString(clientSayLink, '\x12'); + auto segments = Strings::Split(clientSayLink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { @@ -196,7 +196,7 @@ void Client50ToServerSayLink(std::string& serverSayLink, const std::string& clie return; } - auto segments = SplitString(clientSayLink, '\x12'); + auto segments = Strings::Split(clientSayLink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { @@ -231,7 +231,7 @@ void Client55ToServerSayLink(std::string& serverSayLink, const std::string& clie return; } - auto segments = SplitString(clientSayLink, '\x12'); + auto segments = Strings::Split(clientSayLink, '\x12'); for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) { if (segment_iter & 1) { diff --git a/utils/scripts/generators/repository-generator.pl b/utils/scripts/generators/repository-generator.pl index 975f4a227..2a35d9c23 100644 --- a/utils/scripts/generators/repository-generator.pl +++ b/utils/scripts/generators/repository-generator.pl @@ -273,7 +273,7 @@ foreach my $table_to_generate (@tables) { # update one if ($extra ne "auto_increment") { - my $query_value = sprintf('\'" + EscapeString(%s_entry.%s) + "\'");', $table_name, $column_name_formatted); + my $query_value = sprintf('\'" + Strings::Escape(%s_entry.%s) + "\'");', $table_name, $column_name_formatted); if ($data_type =~ /int|float|double|decimal/) { $query_value = sprintf('" + std::to_string(%s_entry.%s));', $table_name, $column_name_formatted); } @@ -289,7 +289,7 @@ foreach my $table_to_generate (@tables) { } # insert - my $value = sprintf("\"'\" + EscapeString(%s_entry.%s) + \"'\"", $table_name, $column_name_formatted); + my $value = sprintf("\"'\" + Strings::Escape(%s_entry.%s) + \"'\"", $table_name, $column_name_formatted); if ($data_type =~ /int|float|double|decimal/) { $value = sprintf('std::to_string(%s_entry.%s)', $table_name, $column_name_formatted); } diff --git a/world/adventure.cpp b/world/adventure.cpp index f9bf01882..8b6b67a0f 100644 --- a/world/adventure.cpp +++ b/world/adventure.cpp @@ -3,7 +3,7 @@ #include "../common/extprofile.h" #include "../common/rulesys.h" #include "../common/misc_functions.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/random.h" #include "adventure.h" #include "adventure_manager.h" diff --git a/world/adventure_manager.cpp b/world/adventure_manager.cpp index 06ea03bb0..62a473256 100644 --- a/world/adventure_manager.cpp +++ b/world/adventure_manager.cpp @@ -1,6 +1,6 @@ #include "../common/global_define.h" #include "../common/misc_functions.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/servertalk.h" #include "../common/rulesys.h" #include "../common/random.h" diff --git a/world/client.cpp b/world/client.cpp index b8bc0dd78..c08cb419a 100644 --- a/world/client.cpp +++ b/world/client.cpp @@ -31,7 +31,7 @@ #include "../common/languages.h" #include "../common/skills.h" #include "../common/extprofile.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/emu_versions.h" #include "../common/random.h" #include "../common/shareddb.h" @@ -768,7 +768,7 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) { } if (eqs->ClientVersion() == EQ::versions::ClientVersion::Titanium) { - character_limit = Titanium::constants::CHARACTER_CREATION_LIMIT; + character_limit = Titanium::constants::CHARACTER_CREATION_LIMIT; } auto query = fmt::format( diff --git a/world/cliententry.cpp b/world/cliententry.cpp index 0003e70f1..b41eefe04 100644 --- a/world/cliententry.cpp +++ b/world/cliententry.cpp @@ -25,7 +25,7 @@ #include "zoneserver.h" #include "world_config.h" #include "../common/guilds.h" -#include "../common/string_util.h" +#include "../common/strings.h" extern uint32 numplayers; extern LoginServerList loginserverlist; diff --git a/world/clientlist.cpp b/world/clientlist.cpp index 8fb35964b..1c2b7705b 100644 --- a/world/clientlist.cpp +++ b/world/clientlist.cpp @@ -22,7 +22,7 @@ #include "zonelist.h" #include "client.h" #include "worlddb.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/guilds.h" #include "../common/races.h" #include "../common/classes.h" diff --git a/world/console.cpp b/world/console.cpp index cf57bdbfd..57f35a188 100644 --- a/world/console.cpp +++ b/world/console.cpp @@ -27,7 +27,7 @@ #include "worlddb.h" #include "zonelist.h" #include "zoneserver.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/md5.h" #include "eqemu_api_world_data_service.h" #include "world_store.h" @@ -164,7 +164,7 @@ void ConsoleWho( if (strcasecmp(arg.c_str(), "gm") == 0) { whom.gmlookup = 1; } - else if (StringIsNumber(arg)) { + else if (Strings::IsNumber(arg)) { if (whom.lvllow == 0xFFFF) { whom.lvllow = atoi(arg.c_str()); whom.lvlhigh = whom.lvllow; @@ -200,7 +200,7 @@ void ConsoleUptime( return; } - if (StringIsNumber(args[0]) && atoi(args[0].c_str()) > 0) { + if (Strings::IsNumber(args[0]) && atoi(args[0].c_str()) > 0) { auto pack = new ServerPacket(ServerOP_Uptime, sizeof(ServerUptime_Struct)); ServerUptime_Struct *sus = (ServerUptime_Struct *) pack->pBuffer; snprintf(sus->adminname, sizeof(sus->adminname), "*%s", connection->UserName().c_str()); @@ -285,7 +285,7 @@ void ConsoleEmote( 0, AccountStatus::Player, atoi(args[1].c_str()), - JoinString(join_args, " ").c_str() + Strings::Join(join_args, " ").c_str() ); } else { @@ -296,7 +296,7 @@ void ConsoleEmote( 0, AccountStatus::Player, atoi(args[1].c_str()), - JoinString(join_args, " ").c_str() + Strings::Join(join_args, " ").c_str() ); } else { @@ -305,7 +305,7 @@ void ConsoleEmote( 0, AccountStatus::Player, atoi(args[1].c_str()), - JoinString(join_args, " ").c_str() + Strings::Join(join_args, " ").c_str() ); } } @@ -361,7 +361,7 @@ void ConsoleTell( auto join_args = args; join_args.erase(join_args.begin(), join_args.begin() + 1); - zoneserver_list.SendChannelMessage(tmpname, to.c_str(), 7, 0, JoinString(join_args, " ").c_str()); + zoneserver_list.SendChannelMessage(tmpname, to.c_str(), 7, 0, Strings::Join(join_args, " ").c_str()); } /** @@ -382,7 +382,7 @@ void ConsoleBroadcast( char tmpname[64]; tmpname[0] = '*'; strcpy(&tmpname[1], connection->UserName().c_str()); - zoneserver_list.SendChannelMessage(tmpname, 0, 6, 0, JoinString(args, " ").c_str()); + zoneserver_list.SendChannelMessage(tmpname, 0, 6, 0, Strings::Join(args, " ").c_str()); } /** @@ -403,7 +403,7 @@ void ConsoleGMSay( char tmpname[64]; tmpname[0] = '*'; strcpy(&tmpname[1], connection->UserName().c_str()); - zoneserver_list.SendChannelMessage(tmpname, 0, 11, 0, JoinString(args, " ").c_str()); + zoneserver_list.SendChannelMessage(tmpname, 0, 11, 0, Strings::Join(args, " ").c_str()); } /** @@ -422,7 +422,7 @@ void ConsoleGuildSay( } auto from = args[0]; - auto guild_id = StringIsNumber(args[1]) ? std::stoul(args[1]) : 0; + auto guild_id = Strings::IsNumber(args[1]) ? std::stoul(args[1]) : 0; if (!guild_id) { return; } @@ -433,7 +433,7 @@ void ConsoleGuildSay( auto message = fmt::format( "{} tells the guild, '{}'", from, - JoinString(join_args, " ") + Strings::Join(join_args, " ") ); zoneserver_list.SendEmoteMessage(0, guild_id, AccountStatus::Player, Chat::Guild, message.c_str()); @@ -457,7 +457,7 @@ void ConsoleOOC( char tmpname[64]; tmpname[0] = '*'; strcpy(&tmpname[1], connection->UserName().c_str()); - zoneserver_list.SendChannelMessage(tmpname, 0, 5, 0, JoinString(args, " ").c_str()); + zoneserver_list.SendChannelMessage(tmpname, 0, 5, 0, Strings::Join(args, " ").c_str()); } /** @@ -478,7 +478,7 @@ void ConsoleAuction( char tmpname[64]; tmpname[0] = '*'; strcpy(&tmpname[1], connection->UserName().c_str()); - zoneserver_list.SendChannelMessage(tmpname, 0, 4, 0, JoinString(args, " ").c_str()); + zoneserver_list.SendChannelMessage(tmpname, 0, 4, 0, Strings::Join(args, " ").c_str()); } /** @@ -584,7 +584,7 @@ void ConsoleZoneShutdown( ServerZoneStateChange_struct *s = (ServerZoneStateChange_struct *) pack->pBuffer; pack->opcode = ServerOP_ZoneShutdown; strcpy(s->adminname, tmpname); - if (StringIsNumber(args[0])) { + if (Strings::IsNumber(args[0])) { s->ZoneServerID = atoi(args[0].c_str()); } else { @@ -628,7 +628,7 @@ void ConsoleZoneBootup( return; } - if (args[1].length() == 0 || !StringIsNumber(args[0])) { + if (args[1].length() == 0 || !Strings::IsNumber(args[0])) { connection->SendLine("Usage: zonebootup ZoneServerID# zoneshortname"); } else { @@ -754,7 +754,7 @@ void ConsoleFlag( return; } - if (args[1].length() == 0 || !StringIsNumber(args[0])) { + if (args[1].length() == 0 || !Strings::IsNumber(args[0])) { connection->SendLine("Usage: flag [status] [accountname]"); } else { @@ -828,7 +828,7 @@ void ConsoleWorldShutdown( { if (args.size() == 2) { int32 time, interval; - if (StringIsNumber(args[0]) && StringIsNumber(args[1]) && ((time = atoi(args[0].c_str())) > 0) && + if (Strings::IsNumber(args[0]) && Strings::IsNumber(args[1]) && ((time = atoi(args[0].c_str())) > 0) && ((interval = atoi(args[1].c_str())) > 0)) { zoneserver_list.WorldShutDown(time, interval); } diff --git a/world/console.old.cpp b/world/console.old.cpp index f2e848e57..59c782512 100644 --- a/world/console.old.cpp +++ b/world/console.old.cpp @@ -38,7 +38,7 @@ #include "../common/opcodemgr.h" #include "../common/rulesys.h" #include "../common/ruletypes.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "world_config.h" #include "zoneserver.h" #include "zonelist.h" diff --git a/world/eql_config.cpp b/world/eql_config.cpp index 2b536c666..c42883497 100644 --- a/world/eql_config.cpp +++ b/world/eql_config.cpp @@ -20,7 +20,7 @@ #include "worlddb.h" #include "launcher_link.h" #include "launcher_list.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "world_store.h" #include #include diff --git a/world/eqw.cpp b/world/eqw.cpp index 3b480836d..7c37f3e45 100644 --- a/world/eqw.cpp +++ b/world/eqw.cpp @@ -25,7 +25,7 @@ #include "../common/races.h" #include "../common/classes.h" #include "../common/misc.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "zoneserver.h" #include "zonelist.h" #include "clientlist.h" diff --git a/world/launcher_link.cpp b/world/launcher_link.cpp index 8f3fa1aaf..8335980f3 100644 --- a/world/launcher_link.cpp +++ b/world/launcher_link.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "../common/md5.h" #include "../common/packet_dump.h" #include "../common/servertalk.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/misc_functions.h" #include "worlddb.h" #include "eql_config.h" diff --git a/world/login_server.cpp b/world/login_server.cpp index edcdacf23..3948a9c65 100644 --- a/world/login_server.cpp +++ b/world/login_server.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "../common/misc_functions.h" #include "../common/eq_packet_structs.h" #include "../common/packet_dump.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/eqemu_logsys.h" #include "login_server.h" #include "login_server_list.h" diff --git a/world/main.cpp b/world/main.cpp index 031193278..6173c0c65 100644 --- a/world/main.cpp +++ b/world/main.cpp @@ -28,7 +28,7 @@ #include #include -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/eqemu_logsys.h" #include "../common/queue.h" #include "../common/timer.h" @@ -248,10 +248,10 @@ static void GMSayHookCallBackProcessWorld(uint16 log_category, std::string messa } // Replace Occurrences of % or MessageStatus will crash - find_replace(message, std::string("%"), std::string(".")); + Strings::FindReplace(message, std::string("%"), std::string(".")); if (message.find('\n') != std::string::npos) { - auto message_split = SplitString(message, '\n'); + auto message_split = Strings::Split(message, '\n'); for (size_t iter = 0; iter < message_split.size(); ++iter) { zoneserver_list.SendEmoteMessage( diff --git a/world/shared_task_manager.cpp b/world/shared_task_manager.cpp index 541f35712..3ba26820d 100644 --- a/world/shared_task_manager.cpp +++ b/world/shared_task_manager.cpp @@ -1029,7 +1029,7 @@ void SharedTaskManager::InvitePlayerByPlayerName(SharedTask *s, const std::strin { auto character = CharacterDataRepository::GetWhere( *m_database, - fmt::format("`name` = '{}' LIMIT 1", EscapeString(player_name)) + fmt::format("`name` = '{}' LIMIT 1", Strings::Escape(player_name)) ); auto character_id = !character.empty() ? character.front().id : 0; diff --git a/world/world_store.cpp b/world/world_store.cpp index 62c484172..cb114e614 100644 --- a/world/world_store.cpp +++ b/world/world_store.cpp @@ -34,7 +34,7 @@ uint32 WorldStore::GetZoneID(const char *in_zone_name) return 0; } - std::string zone_name = str_tolower(in_zone_name); + std::string zone_name = Strings::ToLower(in_zone_name); return GetZoneID(zone_name); } diff --git a/world/worlddb.cpp b/world/worlddb.cpp index 7e6490d0b..8b2b27c6f 100644 --- a/world/worlddb.cpp +++ b/world/worlddb.cpp @@ -17,7 +17,7 @@ */ #include "worlddb.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/eq_packet_structs.h" #include "../common/inventory_profile.h" #include "../common/rulesys.h" diff --git a/world/zonelist.cpp b/world/zonelist.cpp index b548fa94a..4e79369e9 100644 --- a/world/zonelist.cpp +++ b/world/zonelist.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "world_config.h" #include "../common/misc_functions.h" #include "../common/servertalk.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/random.h" #include "../common/json/json.h" #include "../common/event_sub.h" @@ -50,7 +50,7 @@ ZSList::~ZSList() { void ZSList::ShowUpTime(WorldTCPConnection* con, const char* adminname) { uint32 ms = Timer::GetCurrentTime(); - std::string time_string = ConvertMillisecondsToTime(ms); + std::string time_string = Strings::MillisecondsToTime(ms); con->SendEmoteMessage( adminname, 0, diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp index 1f1284ccf..758307fc5 100644 --- a/world/zoneserver.cpp +++ b/world/zoneserver.cpp @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "../common/guilds.h" #include "../common/packet_dump.h" #include "../common/misc.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "cliententry.h" #include "wguild_mgr.h" #include "lfplist.h" @@ -1343,7 +1343,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) { zoneserver_list.SendPacket(pack); content_service.SetExpansionContext()->ReloadContentFlags(); break; - } + } case ServerOP_ReloadLogs: { zoneserver_list.SendPacket(pack); LogSys.LoadLogDatabaseSettings(); diff --git a/zone/aa.cpp b/zone/aa.cpp index b6a106bdc..e23dbba15 100644 --- a/zone/aa.cpp +++ b/zone/aa.cpp @@ -22,7 +22,7 @@ Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net) #include "../common/eq_packet_structs.h" #include "../common/races.h" #include "../common/spdat.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "aa.h" #include "client.h" #include "corpse.h" @@ -310,7 +310,7 @@ void Mob::WakeTheDead(uint16 spell_id, Corpse *corpse_to_use, Mob *target, uint3 //pet.duration += GetFocusEffect(focusSwarmPetDuration, spell_id) / 1000; //TODO: Does WTD use pet focus? pet.npc_id = WAKE_THE_DEAD_NPCTYPEID; - + NPCType *made_npc = nullptr; const NPCType *npc_type = content_db.LoadNPCTypesData(WAKE_THE_DEAD_NPCTYPEID); @@ -545,7 +545,7 @@ void Client::ResetAA() { m_pp.raid_leadership_points = 0; m_pp.group_leadership_exp = 0; m_pp.raid_leadership_exp = 0; - + database.DeleteCharacterAAs(CharacterID()); database.DeleteCharacterLeadershipAAs(CharacterID()); } @@ -1766,7 +1766,7 @@ bool ZoneDatabase::LoadAlternateAdvancementAbilities(std::unordered_map= 0) { @@ -1927,9 +1927,9 @@ void Client::TogglePassiveAlternativeAdvancement(const AA::Rank &rank, uint32 ab //Enable TogglePurchaseAlternativeAdvancementRank(rank.next_id); Message(Chat::Spells, "You enable an ability."); //Message live gives you. Should come from spell. - + AA::Rank *rank_next = zone->GetAlternateAdvancementRank(rank.next_id); - + //Add checks for any special cases for toggle. if (IsEffectinAlternateAdvancementRankEffects(*rank_next, SE_Weapon_Stance)) { weaponstance.aabonus_enabled = true; @@ -1990,7 +1990,7 @@ bool Client::IsEffectinAlternateAdvancementRankEffects(const AA::Rank &rank, int } void Client::ResetAlternateAdvancementRank(uint32 aa_id) { - + /* Resets your AA to baseline */ @@ -2010,7 +2010,7 @@ void Client::ResetAlternateAdvancementRank(uint32 aa_id) { } void Client::TogglePurchaseAlternativeAdvancementRank(int rank_id){ - + /* Stripped down version of purchasing AA. Will give no messages. Used with toggle hotkey functions. diff --git a/zone/attack.cpp b/zone/attack.cpp index 4ce86b393..b1dcd2ff1 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "../common/rulesys.h" #include "../common/skills.h" #include "../common/spdat.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/data_verification.h" #include "../common/misc_functions.h" #include "queryserv.h" diff --git a/zone/aura.cpp b/zone/aura.cpp index 40cf4a481..302e4e02e 100644 --- a/zone/aura.cpp +++ b/zone/aura.cpp @@ -1,4 +1,4 @@ -#include "../common/string_util.h" +#include "../common/strings.h" #include "aura.h" #include "client.h" diff --git a/zone/bot.cpp b/zone/bot.cpp index 6a006fd33..27cbfbee8 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -23,7 +23,7 @@ #include "doors.h" #include "quest_parser_collection.h" #include "lua_parser.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/say_link.h" extern volatile bool is_zone_loaded; @@ -9929,7 +9929,7 @@ bool Bot::UseDiscipline(uint32 spell_id, uint32 target) { fmt::format( "{} can use this discipline in {}.", GetCleanName(), - ConvertSecondsToTime(remaining_time) + Strings::SecondsToTime(remaining_time) ).c_str() ); return false; diff --git a/zone/bot_command.cpp b/zone/bot_command.cpp index a6a600cd9..e14ceaa89 100644 --- a/zone/bot_command.cpp +++ b/zone/bot_command.cpp @@ -53,7 +53,7 @@ #include "../common/ptimer.h" #include "../common/rulesys.h" #include "../common/serverinfo.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/say_link.h" #include "../common/eqemu_logsys.h" #include "../common/emu_constants.h" @@ -5270,7 +5270,7 @@ void bot_subcommand_bot_create(Client *c, const Seperator *sep) return; } std::string bot_name = sep->arg[1]; - bot_name = ucfirst(bot_name); + bot_name = Strings::UcFirst(bot_name); if (sep->arg[2][0] == '\0' || !sep->IsNumber(2)) { c->Message(Chat::White, "Invalid Class!"); return; @@ -5938,7 +5938,7 @@ void bot_subcommand_bot_list(Client *c, const Seperator *sep) } auto* bot = entity_list.GetBotByBotName(bots_iter.Name); - auto bot_spawn_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( + auto bot_spawn_saylink = Saylink::Create( fmt::format("^spawn {}", bots_iter.Name), false, bots_iter.Name @@ -7318,7 +7318,7 @@ void bot_subcommand_botgroup_list(Client *c, const Seperator *sep) botgroups_iter.first, botgroups_iter.second, database.botdb.IsBotGroupAutoSpawn(botgroups_iter.first) ? " (Auto Spawn)" : "", - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("^botgroupload {}", botgroups_iter.first), false, "Load" @@ -8825,7 +8825,7 @@ void bot_subcommand_inventory_list(Client *c, const Seperator *sep) slot_id, EQ::invslot::GetInvPossessionsSlotName(slot_id), linker.GenerateLink(), - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("^inventoryremove {}", slot_id), false, "Remove" @@ -9354,7 +9354,7 @@ uint32 helper_bot_create(Client *bot_owner, std::string bot_name, uint8 bot_clas if (!Bot::IsValidRaceClassCombo(bot_race, bot_class)) { const char* bot_race_name = GetRaceIDName(bot_race); const char* bot_class_name = GetClassIDName(bot_class); - std::string view_saylink = EQ::SayLinkEngine::GenerateQuestSaylink(fmt::format("^viewcombos {}", bot_race), false, "view"); + std::string view_saylink = Saylink::Create(fmt::format("^viewcombos {}", bot_race), false, "view"); bot_owner->Message( Chat::White, fmt::format( diff --git a/zone/bot_database.cpp b/zone/bot_database.cpp index a51e143d7..0ffa1b05f 100644 --- a/zone/bot_database.cpp +++ b/zone/bot_database.cpp @@ -20,7 +20,7 @@ #include "../common/global_define.h" #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/eqemu_logsys.h" #include "zonedb.h" @@ -45,7 +45,7 @@ bool BotDatabase::LoadBotCommandSettings(std::map('(', ')'), join_pair(",", std::pair('\'', '\''), injected) @@ -89,7 +89,7 @@ bool BotDatabase::UpdateOrphanedBotCommandSettings(const std::vector('\'', '\''), orphaned) + Strings::ImplodePair(",", std::pair('\'', '\''), orphaned) ); if (!database.QueryDatabase(query).Success()) { @@ -2361,7 +2361,7 @@ bool BotDatabase::LoadBotGroupIDByBotGroupName(const std::string& group_name, ui query = fmt::format( "SELECT `groups_index` FROM `bot_groups` WHERE `group_name` = '{}' LIMIT 1", - EscapeString(group_name) + Strings::Escape(group_name) ); auto results = database.QueryDatabase(query); diff --git a/zone/botspellsai.cpp b/zone/botspellsai.cpp index 2653af032..97fa63d36 100644 --- a/zone/botspellsai.cpp +++ b/zone/botspellsai.cpp @@ -19,7 +19,7 @@ #ifdef BOTS #include "bot.h" -#include "../common/string_util.h" +#include "../common/strings.h" #if EQDEBUG >= 12 #define BotAI_DEBUG_Spells 25 diff --git a/zone/client.cpp b/zone/client.cpp index de4875681..16fcc0365 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -36,7 +36,7 @@ extern volatile bool RunLoops; #include "../common/spdat.h" #include "../common/guilds.h" #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/data_verification.h" #include "../common/profanity_manager.h" #include "data_bucket.h" @@ -3901,7 +3901,7 @@ void Client::EnteringMessages(Client* client) if (database.GetVariable("Rules", rules)) { uint8 flag = database.GetAgreementFlag(client->AccountID()); if (!flag) { - auto rules_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto rules_link = Saylink::Create( "#serverrules", false, "rules" @@ -3928,7 +3928,7 @@ void Client::SendRules() return; } - auto lines = split_string(rules, "|"); + auto lines = Strings::Split(rules, "|"); auto line_number = 1; for (auto&& line : lines) { Message( @@ -6337,7 +6337,7 @@ void Client::NPCSpawn(NPC *target_npc, const char *identifier, uint32 extra) return; } - std::string spawn_type = str_tolower(identifier); + std::string spawn_type = Strings::ToLower(identifier); bool is_add = spawn_type.find("add") != std::string::npos; bool is_create = spawn_type.find("create") != std::string::npos; bool is_delete = spawn_type.find("delete") != std::string::npos; @@ -9522,60 +9522,60 @@ void Client::ShowDevToolsMenu() /** * Search entity commands */ - menu_search += EQ::SayLinkEngine::GenerateQuestSaylink("#list corpses", false, "Corpses"); - menu_search += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#list doors", false, "Doors"); - menu_search += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#finditem", false, "Items"); - menu_search += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#list npcs", false, "NPC"); - menu_search += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#list objects", false, "Objects"); - menu_search += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#list players", false, "Players"); - menu_search += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#findzone", false, "Zones"); + menu_search += Saylink::Create("#list corpses", false, "Corpses"); + menu_search += " | " + Saylink::Create("#list doors", false, "Doors"); + menu_search += " | " + Saylink::Create("#finditem", false, "Items"); + menu_search += " | " + Saylink::Create("#list npcs", false, "NPC"); + menu_search += " | " + Saylink::Create("#list objects", false, "Objects"); + menu_search += " | " + Saylink::Create("#list players", false, "Players"); + menu_search += " | " + Saylink::Create("#findzone", false, "Zones"); /** * Show */ - menu_show += EQ::SayLinkEngine::GenerateQuestSaylink("#showzonepoints", false, "Zone Points"); - menu_show += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#showzonegloballoot", false, "Zone Global Loot"); + menu_show += Saylink::Create("#showzonepoints", false, "Zone Points"); + menu_show += " | " + Saylink::Create("#showzonegloballoot", false, "Zone Global Loot"); /** * Reload */ - menu_reload_one += EQ::SayLinkEngine::GenerateQuestSaylink("#reload aa", false, "AAs"); - menu_reload_one += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload alternate_currencies", false, "Alternate Currencies"); - menu_reload_one += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload blocked_spells", false, "Blocked Spells"); - menu_reload_one += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload content_flags", false, "Content Flags"); + menu_reload_one += Saylink::Create("#reload aa", false, "AAs"); + menu_reload_one += " | " + Saylink::Create("#reload alternate_currencies", false, "Alternate Currencies"); + menu_reload_one += " | " + Saylink::Create("#reload blocked_spells", false, "Blocked Spells"); + menu_reload_one += " | " + Saylink::Create("#reload content_flags", false, "Content Flags"); - menu_reload_two += EQ::SayLinkEngine::GenerateQuestSaylink("#reload doors", false, "Doors"); - menu_reload_two += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload ground_spawns", false, "Ground Spawns"); + menu_reload_two += Saylink::Create("#reload doors", false, "Doors"); + menu_reload_two += " | " + Saylink::Create("#reload ground_spawns", false, "Ground Spawns"); - menu_reload_three += EQ::SayLinkEngine::GenerateQuestSaylink("#reload logs", false, "Level Based Experience Modifiers"); - menu_reload_three += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload logs", false, "Log Settings"); + menu_reload_three += Saylink::Create("#reload logs", false, "Level Based Experience Modifiers"); + menu_reload_three += " | " + Saylink::Create("#reload logs", false, "Log Settings"); - menu_reload_four += EQ::SayLinkEngine::GenerateQuestSaylink("#reload merchants", false, "Merchants"); - menu_reload_four += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload npc_emotes", false, "NPC Emotes"); - menu_reload_four += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload objects", false, "Objects"); + menu_reload_four += Saylink::Create("#reload merchants", false, "Merchants"); + menu_reload_four += " | " + Saylink::Create("#reload npc_emotes", false, "NPC Emotes"); + menu_reload_four += " | " + Saylink::Create("#reload objects", false, "Objects"); - menu_reload_five += EQ::SayLinkEngine::GenerateQuestSaylink("#reload perl_export", false, "Perl Event Export Settings"); - menu_reload_five += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload quest", false, "Quests"); + menu_reload_five += Saylink::Create("#reload perl_export", false, "Perl Event Export Settings"); + menu_reload_five += " | " + Saylink::Create("#reload quest", false, "Quests"); - menu_reload_six += EQ::SayLinkEngine::GenerateQuestSaylink("#reload rules", false, "Rules"); - menu_reload_six += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload static", false, "Static Zone Data"); - menu_reload_six += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload tasks", false, "Tasks"); - - menu_reload_seven += EQ::SayLinkEngine::GenerateQuestSaylink("#reload titles", false, "Titles"); - menu_reload_seven += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload traps 1", false, "Traps"); - menu_reload_seven += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload variables", false, "Variables"); - menu_reload_seven += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload veteran_rewards", false, "Veteran Rewards"); - - menu_reload_eight += EQ::SayLinkEngine::GenerateQuestSaylink("#reload world", false, "World"); - menu_reload_eight += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload zone", false, "Zone"); - menu_reload_eight += " | " + EQ::SayLinkEngine::GenerateQuestSaylink("#reload zone_points", false, "Zone Points"); + menu_reload_six += Saylink::Create("#reload rules", false, "Rules"); + menu_reload_six += " | " + Saylink::Create("#reload static", false, "Static Zone Data"); + menu_reload_six += " | " + Saylink::Create("#reload tasks", false, "Tasks"); + + menu_reload_seven += Saylink::Create("#reload titles", false, "Titles"); + menu_reload_seven += " | " + Saylink::Create("#reload traps 1", false, "Traps"); + menu_reload_seven += " | " + Saylink::Create("#reload variables", false, "Variables"); + menu_reload_seven += " | " + Saylink::Create("#reload veteran_rewards", false, "Veteran Rewards"); + + menu_reload_eight += Saylink::Create("#reload world", false, "World"); + menu_reload_eight += " | " + Saylink::Create("#reload zone", false, "Zone"); + menu_reload_eight += " | " + Saylink::Create("#reload zone_points", false, "Zone Points"); /** * Show window status */ - menu_toggle = EQ::SayLinkEngine::GenerateQuestSaylink("#devtools enable", false, "Enable"); + menu_toggle = Saylink::Create("#devtools enable", false, "Enable"); if (IsDevToolsEnabled()) { - menu_toggle = EQ::SayLinkEngine::GenerateQuestSaylink("#devtools disable", false, "Disable"); + menu_toggle = Saylink::Create("#devtools disable", false, "Disable"); } /** @@ -9597,7 +9597,7 @@ void Client::ShowDevToolsMenu() Chat::White, fmt::format( "Show Menu | {}", - EQ::SayLinkEngine::GenerateQuestSaylink("#dev", false, "#dev") + Saylink::Create("#dev", false, "#dev") ).c_str() ); @@ -9689,7 +9689,7 @@ void Client::ShowDevToolsMenu() ).c_str() ); - auto help_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto help_link = Saylink::Create( "#help", false, "#help" @@ -10439,7 +10439,7 @@ void Client::SetAFK(uint8 afk_flag) { void Client::SendToInstance(std::string instance_type, std::string zone_short_name, uint32 instance_version, float x, float y, float z, float heading, std::string instance_identifier, uint32 duration) { uint32 zone_id = ZoneID(zone_short_name); - std::string current_instance_type = str_tolower(instance_type); + std::string current_instance_type = Strings::ToLower(instance_type); std::string instance_type_name = "public"; if (current_instance_type.find("solo") != std::string::npos) { instance_type_name = GetCleanName(); @@ -11190,7 +11190,7 @@ void Client::ReconnectUCS() void Client::SendReloadCommandMessages() { SendChatLineBreak(); - auto aa_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto aa_link = Saylink::Create( "#reload aa", false, "#reload aa" @@ -11204,7 +11204,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto alternate_currencies_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto alternate_currencies_link = Saylink::Create( "#reload alternate_currencies", false, "#reload alternate_currencies" @@ -11218,7 +11218,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto blocked_spells_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto blocked_spells_link = Saylink::Create( "#reload blocked_spells", false, "#reload blocked_spells" @@ -11232,7 +11232,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto content_flags_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto content_flags_link = Saylink::Create( "#reload content_flags", false, "#reload content_flags" @@ -11246,7 +11246,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto doors_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto doors_link = Saylink::Create( "#reload doors", false, "#reload doors" @@ -11260,7 +11260,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto ground_spawns_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto ground_spawns_link = Saylink::Create( "#reload ground_spawns", false, "#reload ground_spawns" @@ -11274,7 +11274,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto level_mods_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto level_mods_link = Saylink::Create( "#reload level_mods", false, "#reload level_mods" @@ -11288,7 +11288,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto logs_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto logs_link = Saylink::Create( "#reload logs", false, "#reload logs" @@ -11302,7 +11302,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto merchants_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto merchants_link = Saylink::Create( "#reload merchants", false, "#reload merchants" @@ -11316,7 +11316,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto npc_emotes_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto npc_emotes_link = Saylink::Create( "#reload npc_emotes", false, "#reload npc_emotes" @@ -11330,7 +11330,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto objects_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto objects_link = Saylink::Create( "#reload objects", false, "#reload objects" @@ -11344,7 +11344,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto perl_export_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto perl_export_link = Saylink::Create( "#reload perl_export", false, "#reload perl_export" @@ -11358,19 +11358,19 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto quest_link_one = EQ::SayLinkEngine::GenerateQuestSaylink( + auto quest_link_one = Saylink::Create( "#reload quest", false, "#reload quest" ); - auto quest_link_two = EQ::SayLinkEngine::GenerateQuestSaylink( + auto quest_link_two = Saylink::Create( "#reload quest", false, "0" ); - auto quest_link_three = EQ::SayLinkEngine::GenerateQuestSaylink( + auto quest_link_three = Saylink::Create( "#reload quest 1", false, "1" @@ -11386,7 +11386,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto rules_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto rules_link = Saylink::Create( "#reload rules", false, "#reload rules" @@ -11400,7 +11400,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto static_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto static_link = Saylink::Create( "#reload static", false, "#reload static" @@ -11414,7 +11414,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto tasks_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto tasks_link = Saylink::Create( "#reload tasks", false, "#reload tasks" @@ -11428,7 +11428,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto titles_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto titles_link = Saylink::Create( "#reload titles", false, "#reload titles" @@ -11442,19 +11442,19 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto traps_link_one = EQ::SayLinkEngine::GenerateQuestSaylink( + auto traps_link_one = Saylink::Create( "#reload traps", false, "#reload traps" ); - auto traps_link_two = EQ::SayLinkEngine::GenerateQuestSaylink( + auto traps_link_two = Saylink::Create( "#reload traps", false, "0" ); - auto traps_link_three = EQ::SayLinkEngine::GenerateQuestSaylink( + auto traps_link_three = Saylink::Create( "#reload traps 1", false, "1" @@ -11470,7 +11470,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto variables_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto variables_link = Saylink::Create( "#reload variables", false, "#reload variables" @@ -11484,7 +11484,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto veteran_rewards_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto veteran_rewards_link = Saylink::Create( "#reload veteran_rewards", false, "#reload veteran_rewards" @@ -11498,25 +11498,25 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto world_link_one = EQ::SayLinkEngine::GenerateQuestSaylink( + auto world_link_one = Saylink::Create( "#reload world", false, "#reload world" ); - auto world_link_two = EQ::SayLinkEngine::GenerateQuestSaylink( + auto world_link_two = Saylink::Create( "#reload world", false, "0" ); - auto world_link_three = EQ::SayLinkEngine::GenerateQuestSaylink( + auto world_link_three = Saylink::Create( "#reload world 1", false, "1" ); - auto world_link_four = EQ::SayLinkEngine::GenerateQuestSaylink( + auto world_link_four = Saylink::Create( "#reload world 2", false, "2" @@ -11533,7 +11533,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto zone_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto zone_link = Saylink::Create( "#reload zone", false, "#reload zone" @@ -11547,7 +11547,7 @@ void Client::SendReloadCommandMessages() { ).c_str() ); - auto zone_points_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto zone_points_link = Saylink::Create( "#reload zone_points", false, "#reload zone_points" @@ -11623,12 +11623,12 @@ bool Client::CheckMerchantDataBucket(uint8 bucket_comparison, std::string bucket } passes = true; - + break; } case MerchantBucketComparison::BucketIsAny: { - bucket_checks = split_string(bucket_value, "|"); + bucket_checks = Strings::Split(bucket_value, "|"); if (bucket_checks.empty()) { break; } @@ -11649,7 +11649,7 @@ bool Client::CheckMerchantDataBucket(uint8 bucket_comparison, std::string bucket } case MerchantBucketComparison::BucketIsNotAny: { - bucket_checks = split_string(bucket_value, "|"); + bucket_checks = Strings::Split(bucket_value, "|"); if (bucket_checks.empty()) { break; } @@ -11670,7 +11670,7 @@ bool Client::CheckMerchantDataBucket(uint8 bucket_comparison, std::string bucket } case MerchantBucketComparison::BucketIsBetween: { - bucket_checks = split_string(bucket_value, "|"); + bucket_checks = Strings::Split(bucket_value, "|"); if (bucket_checks.empty()) { break; } @@ -11687,7 +11687,7 @@ bool Client::CheckMerchantDataBucket(uint8 bucket_comparison, std::string bucket } case MerchantBucketComparison::BucketIsNotBetween: { - bucket_checks = split_string(bucket_value, "|"); + bucket_checks = Strings::Split(bucket_value, "|"); if (bucket_checks.empty()) { break; } @@ -11713,7 +11713,7 @@ std::map Client::GetMerchantDataBuckets() auto query = fmt::format( "SELECT `key`, `value` FROM data_buckets WHERE `key` LIKE '{}-%'", - EscapeString(GetBucketKey()) + Strings::Escape(GetBucketKey()) ); auto results = database.QueryDatabase(query); diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 38d222766..ef345980c 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -45,7 +45,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "../common/rulesys.h" #include "../common/skills.h" #include "../common/spdat.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/zone_numbers.h" #include "data_bucket.h" #include "event_codes.h" @@ -795,7 +795,7 @@ void Client::CompleteConnect() if (zone && zone->GetInstanceTimer()) { bool is_permanent = false; uint32 remaining_time = database.GetTimeRemainingInstance(zone->GetInstanceID(), is_permanent); - auto time_string = ConvertSecondsToTime(remaining_time); + auto time_string = Strings::SecondsToTime(remaining_time); Message( Chat::Yellow, fmt::format( @@ -4230,7 +4230,7 @@ void Client::Handle_OP_ClickDoor(const EQApplicationPacket *app) fmt::format( "Door ({}) [{}]", currentdoor->GetEntityID(), - EQ::SayLinkEngine::GenerateQuestSaylink("#door edit", false, "#door edit") + Saylink::Create("#door edit", false, "#door edit") ).c_str() ); } @@ -4852,7 +4852,7 @@ void Client::Handle_OP_ConsiderCorpse(const EQApplicationPacket *app) uint32 decay_time = target->GetDecayTime(); if (decay_time) { - auto time_string = ConvertSecondsToTime(decay_time, true); + auto time_string = Strings::SecondsToTime(decay_time, true); Message( Chat::NPCQuestSay, fmt::format( @@ -12945,7 +12945,7 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app) Chat::White, fmt::format( "You can use the ability /shield in {}.", - ConvertSecondsToTime(remaining_time) + Strings::SecondsToTime(remaining_time) ).c_str() ); return; @@ -13100,7 +13100,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app) auto hacker_str = fmt::format("Vendor Cheat: attempted to buy {} of {}: {} that cost {} cp but only has {} pp {} gp {} sp {} cp", mpo->quantity, item->ID, item->Name, mpo->price, m_pp.platinum, m_pp.gold, m_pp.silver, m_pp.copper); - database.SetMQDetectionFlag(AccountName(), GetName(), EscapeString(hacker_str), zone->GetShortName()); + database.SetMQDetectionFlag(AccountName(), GetName(), Strings::Escape(hacker_str), zone->GetShortName()); safe_delete(outapp); safe_delete(inst); return; @@ -14027,7 +14027,7 @@ void Client::Handle_OP_TargetCommand(const EQApplicationPacket *app) { auto hacker_str = fmt::format("{} attempting to target something untargetable, {} bodytype: {}", GetName(), GetTarget()->GetName(), (int)GetTarget()->GetBodyType()); - database.SetMQDetectionFlag(AccountName(), GetName(), EscapeString(hacker_str), zone->GetShortName()); + database.SetMQDetectionFlag(AccountName(), GetName(), Strings::Escape(hacker_str), zone->GetShortName()); SetTarget((Mob*)nullptr); return; } @@ -14064,7 +14064,7 @@ void Client::Handle_OP_TargetCommand(const EQApplicationPacket *app) (zone->newzone_data.maxclip * zone->newzone_data.maxclip), GetX(), GetY(), GetZ(), GetTarget()->GetName(), GetTarget()->GetX(), GetTarget()->GetY(), GetTarget()->GetZ()); - database.SetMQDetectionFlag(AccountName(), GetName(), EscapeString(hacker_str), zone->GetShortName()); + database.SetMQDetectionFlag(AccountName(), GetName(), Strings::Escape(hacker_str), zone->GetShortName()); SetTarget(nullptr); return; } @@ -14078,7 +14078,7 @@ void Client::Handle_OP_TargetCommand(const EQApplicationPacket *app) GetName(), (zone->newzone_data.maxclip * zone->newzone_data.maxclip), GetX(), GetY(), GetZ(), GetTarget()->GetName(), GetTarget()->GetX(), GetTarget()->GetY(), GetTarget()->GetZ()); - database.SetMQDetectionFlag(AccountName(), GetName(), EscapeString(hacker_str), zone->GetShortName()); + database.SetMQDetectionFlag(AccountName(), GetName(), Strings::Escape(hacker_str), zone->GetShortName()); SetTarget(nullptr); return; } diff --git a/zone/client_process.cpp b/zone/client_process.cpp index 3734f31ab..a415e347e 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -42,7 +42,7 @@ #include "../common/rulesys.h" #include "../common/skills.h" #include "../common/spdat.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "event_codes.h" #include "expedition.h" #include "guild_mgr.h" @@ -918,7 +918,7 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) { // Account for merchant lists with gaps. if (ml.slot >= slot_id) { if (ml.slot > slot_id) { - LogDebug("(WARNING) Merchantlist contains gap at slot [{}]. Merchant: [{}], NPC: [{}]", slot_id, merchant_id, npcid); + LogDebug("(WARNING) Merchantlist Contains gap at slot [{}]. Merchant: [{}], NPC: [{}]", slot_id, merchant_id, npcid); } slot_id = ml.slot + 1; @@ -967,7 +967,7 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) { //this resets the slot zone->tmpmerchanttable[npcid] = temporary_merchant_list; if (npc && handy_item) { - int greet_id = zone->random.Int(MERCHANT_GREETING, MERCHANT_HANDY_ITEM4); + int greet_id = zone->random.Int(MERCHANT_GREETING, MERCHANT_HANDY_ITEM4); auto handy_id = std::to_string(greet_id); if (greet_id != MERCHANT_GREETING) { MessageString(Chat::NPCQuestSay, GENERIC_STRINGID_SAY, npc->GetCleanName(), handy_id.c_str(), GetName(), handy_item->Name); diff --git a/zone/combat_record.cpp b/zone/combat_record.cpp index 28de1c8ab..8d746b52d 100644 --- a/zone/combat_record.cpp +++ b/zone/combat_record.cpp @@ -1,6 +1,6 @@ #include "combat_record.h" #include "../common/eqemu_logsys.h" -#include "../common/string_util.h" +#include "../common/strings.h" void CombatRecord::Start(std::string in_mob_name) { @@ -22,7 +22,7 @@ void CombatRecord::Stop() mob_name, time_in_combat > 0 ? (damage_received / time_in_combat) : damage_received, time_in_combat > 0 ? (heal_received / time_in_combat) : heal_received, - time_in_combat > 0 ? ConvertSecondsToTime(time_in_combat) : "", + time_in_combat > 0 ? Strings::SecondsToTime(time_in_combat) : "", time_in_combat ); } diff --git a/zone/command.cpp b/zone/command.cpp index 8d15f9960..8883d3de2 100755 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -16,7 +16,7 @@ #include "../common/features.h" #include "../common/ptimer.h" #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/say_link.h" #include "../common/net/eqstream.h" #include "../common/file_util.h" @@ -592,7 +592,7 @@ void command_help(Client *c, const Seperator *sep) { int found_count = 0; std::string command_link; - std::string search_criteria = str_tolower(sep->argplus[1]); + std::string search_criteria = Strings::ToLower(sep->argplus[1]); for (const auto& cur : commandlist) { if (!search_criteria.empty()) { @@ -605,7 +605,7 @@ void command_help(Client *c, const Seperator *sep) continue; } - command_link = EQ::SayLinkEngine::GenerateQuestSaylink( + command_link = Saylink::Create( fmt::format( "{}{}", COMMAND_CHAR, @@ -664,7 +664,7 @@ void command_findaliases(Client *c, const Seperator *sep) return; } - std::string search_criteria = str_tolower(sep->argplus[1]); + std::string search_criteria = Strings::ToLower(sep->argplus[1]); auto find_iter = commandaliases.find(search_criteria); if (find_iter == commandaliases.end()) { @@ -687,7 +687,7 @@ void command_findaliases(Client *c, const Seperator *sep) return; } - auto current_commmand_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto current_commmand_link = Saylink::Create( fmt::format( "{}{}", COMMAND_CHAR, @@ -712,7 +712,7 @@ void command_findaliases(Client *c, const Seperator *sep) continue; } - alias_link = EQ::SayLinkEngine::GenerateQuestSaylink( + alias_link = Saylink::Create( fmt::format( "{}{}", COMMAND_CHAR, diff --git a/zone/corpse.cpp b/zone/corpse.cpp index 866d9e1a0..f663e3154 100644 --- a/zone/corpse.cpp +++ b/zone/corpse.cpp @@ -33,7 +33,7 @@ Child of the Mob class. #include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/say_link.h" #include "corpse.h" @@ -1028,8 +1028,8 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a client->Message( Chat::Yellow, fmt::format( - "This corpse contains {}.", - ConvertMoneyToString( + "This corpse Contains {}.", + Strings::Money( GetPlatinum(), GetGold(), GetSilver(), @@ -1038,7 +1038,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a ).c_str() ); } else { - client->Message(Chat::Yellow, "This corpse contains no money."); + client->Message(Chat::Yellow, "This corpse Contains no money."); } auto outapp = new EQApplicationPacket(OP_MoneyOnCorpse, sizeof(moneyOnCorpseStruct)); @@ -1534,7 +1534,7 @@ void Corpse::QueryLoot(Client* to) { Chat::White, fmt::format( "Money | {}", - ConvertMoneyToString( + Strings::Money( platinum, gold, silver, diff --git a/zone/data_bucket.cpp b/zone/data_bucket.cpp index 13dccef66..59b9a1b76 100644 --- a/zone/data_bucket.cpp +++ b/zone/data_bucket.cpp @@ -1,6 +1,6 @@ #include "data_bucket.h" #include -#include "../common/string_util.h" +#include "../common/strings.h" #include "zonedb.h" #include "zone_store.h" #include @@ -35,16 +35,16 @@ void DataBucket::SetData(std::string bucket_key, std::string bucket_value, std:: query = StringFormat( "UPDATE `data_buckets` SET `value` = '%s' %s WHERE `id` = %i", - EscapeString(bucket_value).c_str(), - EscapeString(update_expired_time).c_str(), + Strings::Escape(bucket_value).c_str(), + Strings::Escape(update_expired_time).c_str(), bucket_id ); } else { query = StringFormat( "INSERT INTO `data_buckets` (`key`, `value`, `expires`) VALUES ('%s', '%s', '%lld')", - EscapeString(bucket_key).c_str(), - EscapeString(bucket_value).c_str(), + Strings::Escape(bucket_key).c_str(), + Strings::Escape(bucket_value).c_str(), expires_time_unix ); } @@ -133,7 +133,7 @@ std::string DataBucket::GetDataRemaining(std::string bucket_key) { uint64 DataBucket::DoesBucketExist(std::string bucket_key) { std::string query = StringFormat( "SELECT `id` from `data_buckets` WHERE `key` = '%s' AND (`expires` > %lld OR `expires` = 0) LIMIT 1", - EscapeString(bucket_key).c_str(), + Strings::Escape(bucket_key).c_str(), (long long) std::time(nullptr) ); @@ -157,7 +157,7 @@ uint64 DataBucket::DoesBucketExist(std::string bucket_key) { bool DataBucket::DeleteData(std::string bucket_key) { std::string query = StringFormat( "DELETE FROM `data_buckets` WHERE `key` = '%s'", - EscapeString(bucket_key).c_str() + Strings::Escape(bucket_key).c_str() ); auto results = database.QueryDatabase(query); diff --git a/zone/dialogue_window.cpp b/zone/dialogue_window.cpp index d719f72a8..c786ac041 100644 --- a/zone/dialogue_window.cpp +++ b/zone/dialogue_window.cpp @@ -16,28 +16,28 @@ void DialogueWindow::Render(Client *c, std::string markdown) c->SetEntityVariable(DIAWIND_RESPONSE_TWO_KEY.c_str(), ""); // simple find and replace for the markdown - find_replace(output, "~", ""); - find_replace(output, "{y}", ""); - find_replace(output, "{lb}", ""); - find_replace(output, "{r}", ""); - find_replace(output, "{g}", ""); - find_replace(output, "{gold}", ""); - find_replace(output, "{orange}", ""); - find_replace(output, "{gray}", ""); - find_replace(output, "{tan}", ""); - find_replace(output, "{bullet}", "•"); - find_replace(output, "{name}", fmt::format("{}", c->GetCleanName())); - find_replace(output, "{linebreak}", "--------------------------------------------------------------------"); - find_replace(output, "{rowpad}", R"({tdpad}<"td>{tdpad}<"td><"tr>)"); - find_replace(output, "{tdpad}", "----------------------"); - find_replace(output, "{in}", "        "); + Strings::FindReplace(output, "~", ""); + Strings::FindReplace(output, "{y}", ""); + Strings::FindReplace(output, "{lb}", ""); + Strings::FindReplace(output, "{r}", ""); + Strings::FindReplace(output, "{g}", ""); + Strings::FindReplace(output, "{gold}", ""); + Strings::FindReplace(output, "{orange}", ""); + Strings::FindReplace(output, "{gray}", ""); + Strings::FindReplace(output, "{tan}", ""); + Strings::FindReplace(output, "{bullet}", "•"); + Strings::FindReplace(output, "{name}", fmt::format("{}", c->GetCleanName())); + Strings::FindReplace(output, "{linebreak}", "--------------------------------------------------------------------"); + Strings::FindReplace(output, "{rowpad}", R"({tdpad}<"td>{tdpad}<"td><"tr>)"); + Strings::FindReplace(output, "{tdpad}", "----------------------"); + Strings::FindReplace(output, "{in}", "        "); // mysterious voice bool render_mysterious_voice = false; if (markdown.find("{mysterious}") != std::string::npos) { render_mysterious_voice = true; LogDiaWind("Client [{}] Rendering mysterious voice", c->GetCleanName()); - find_replace(output, "{mysterious}", ""); + Strings::FindReplace(output, "{mysterious}", ""); } // noquotes @@ -45,7 +45,7 @@ void DialogueWindow::Render(Client *c, std::string markdown) if (markdown.find("noquotes") != std::string::npos) { render_noquotes = true; LogDiaWind("Client [{}] Rendering noquotes", c->GetCleanName()); - find_replace(output, "noquotes", ""); + Strings::FindReplace(output, "noquotes", ""); } // nobracket @@ -53,30 +53,30 @@ void DialogueWindow::Render(Client *c, std::string markdown) if (markdown.find("nobracket") != std::string::npos) { render_nobracket = true; LogDiaWind("Client [{}] Rendering nobracket", c->GetCleanName()); - find_replace(output, "nobracket", ""); + Strings::FindReplace(output, "nobracket", ""); } bool render_hiddenresponse = false; if (markdown.find("hiddenresponse") != std::string::npos) { render_hiddenresponse = true; LogDiaWind("Client [{}] Rendering hiddenresponse", c->GetCleanName()); - find_replace(output, "hiddenresponse", ""); + Strings::FindReplace(output, "hiddenresponse", ""); } // animations - std::string animation = get_between(output, "+", "+"); + std::string animation = Strings::GetBetween(output, "+", "+"); if (!animation.empty()) { LogDiaWind("Client [{}] Animation is not empty, contents are [{}]", c->GetCleanName(), animation); - find_replace(output, fmt::format("+{}+", animation), ""); + Strings::FindReplace(output, fmt::format("+{}+", animation), ""); // we treat the animation field differently if it is a number - if (StringIsNumber(animation)) { + if (Strings::IsNumber(animation)) { LogDiaWindDetail("Client [{}] Animation is a number, firing animation [{}]", c->GetCleanName(), animation); target->DoAnim(std::stoi(animation)); } else { for (auto &a: animations) { - if (a.first.find(str_tolower(animation)) != std::string::npos) { + if (a.first.find(Strings::ToLower(animation)) != std::string::npos) { LogDiaWindDetail( "Client [{}] Animation is a string, firing animation [{}] [{}]", c->GetCleanName(), @@ -105,14 +105,14 @@ void DialogueWindow::Render(Client *c, std::string markdown) } // window expire time - std::string expire_time = get_between(output, "=", "="); + std::string expire_time = Strings::GetBetween(output, "=", "="); uint32 window_expire_seconds = 0; if (!expire_time.empty()) { LogDiaWind("Client [{}] Window expire time is not empty, contents are [{}]", c->GetCleanName(), expire_time); - find_replace(output, fmt::format("={}=", expire_time), ""); + Strings::FindReplace(output, fmt::format("={}=", expire_time), ""); // we treat the animation field differently if it is a number - if (StringIsNumber(expire_time)) { + if (Strings::IsNumber(expire_time)) { LogDiaWindDetail( "Client [{}] Window expire time is a number, setting expiration to [{}]", c->GetCleanName(), @@ -133,12 +133,12 @@ void DialogueWindow::Render(Client *c, std::string markdown) if (markdown.find("wintype:") != std::string::npos) { LogDiaWind("Client [{}] Rendering wintype option", c->GetCleanName()); - auto first_split = split_string(output, "wintype:"); + auto first_split = Strings::Split(output, "wintype:"); if (!first_split.empty()) { // assumed that there is more after the wintype declaration // wintype:0 +animation+ etc. - auto second_split = split_string(first_split[1], " "); + auto second_split = Strings::Split(first_split[1], " "); if (!second_split.empty()) { wintype = second_split[0]; LogDiaWindDetail("Client [{}] Rendering wintype option wintype [{}]", c->GetCleanName(), wintype); @@ -155,7 +155,7 @@ void DialogueWindow::Render(Client *c, std::string markdown) ); } - find_replace(output, fmt::format("wintype:{}", wintype), ""); + Strings::FindReplace(output, fmt::format("wintype:{}", wintype), ""); } } @@ -164,12 +164,12 @@ void DialogueWindow::Render(Client *c, std::string markdown) if (markdown.find("popupid:") != std::string::npos) { LogDiaWind("Client [{}] Rendering popupid option", c->GetCleanName()); - auto first_split = split_string(output, "popupid:"); + auto first_split = Strings::Split(output, "popupid:"); if (!first_split.empty()) { // assumed that there is more after the popupid declaration // popupid:0 +animation+ etc. - auto second_split = split_string(first_split[1], " "); + auto second_split = Strings::Split(first_split[1], " "); if (!second_split.empty()) { popupid = second_split[0]; LogDiaWindDetail("Client [{}] Rendering popupid option popupid [{}]", c->GetCleanName(), popupid); @@ -186,11 +186,11 @@ void DialogueWindow::Render(Client *c, std::string markdown) ); } - find_replace(output, fmt::format("popupid:{}", popupid), ""); + Strings::FindReplace(output, fmt::format("popupid:{}", popupid), ""); // set the popup id if (!popupid.empty()) { - popup_id = (StringIsNumber(popupid) ? std::atoi(popupid.c_str()) : 0); + popup_id = (Strings::IsNumber(popupid) ? std::atoi(popupid.c_str()) : 0); } } } @@ -200,9 +200,9 @@ void DialogueWindow::Render(Client *c, std::string markdown) if (markdown.find("secondresponseid:") != std::string::npos) { LogDiaWind("Client [{}] Rendering secondresponseid option", c->GetCleanName()); - auto first_split = split_string(output, "secondresponseid:"); + auto first_split = Strings::Split(output, "secondresponseid:"); if (!first_split.empty()) { - auto second_split = split_string(first_split[1], " "); + auto second_split = Strings::Split(first_split[1], " "); if (!second_split.empty()) { secondresponseid = second_split[0]; LogDiaWindDetail("Client [{}] Rendering secondresponseid option secondresponseid [{}]", @@ -219,10 +219,10 @@ void DialogueWindow::Render(Client *c, std::string markdown) ); } - find_replace(output, fmt::format("secondresponseid:{}", secondresponseid), ""); + Strings::FindReplace(output, fmt::format("secondresponseid:{}", secondresponseid), ""); if (!secondresponseid.empty()) { - negative_id = (StringIsNumber(secondresponseid) ? std::atoi(secondresponseid.c_str()) : 0); + negative_id = (Strings::IsNumber(secondresponseid) ? std::atoi(secondresponseid.c_str()) : 0); } } } @@ -237,20 +237,20 @@ void DialogueWindow::Render(Client *c, std::string markdown) LogDiaWind("Client [{}] Rendering button_one option.", c->GetCleanName()); - button_one = get_between(output, "{button_one:", "}"); + button_one = Strings::GetBetween(output, "{button_one:", "}"); LogDiaWind("Client [{}] button_one [{}]", c->GetCleanName(), button_one); if (!button_one.empty()) { - find_replace(output, fmt::format("{{button_one:{}}}", button_one), ""); - button_one_name = trim(button_one); + Strings::FindReplace(output, fmt::format("{{button_one:{}}}", button_one), ""); + button_one_name = Strings::Trim(button_one); } - button_two = get_between(output, "{button_two:", "}"); + button_two = Strings::GetBetween(output, "{button_two:", "}"); LogDiaWind("Client [{}] button_two [{}]", c->GetCleanName(), button_two); if (!button_two.empty()) { - find_replace(output, fmt::format("{{button_two:{}}}", button_two), ""); - button_two_name = trim(button_two); + Strings::FindReplace(output, fmt::format("{{button_two:{}}}", button_two), ""); + button_two_name = Strings::Trim(button_two); } LogDiaWind( @@ -270,7 +270,7 @@ void DialogueWindow::Render(Client *c, std::string markdown) std::string strip_saylinks = output; std::map replacements = {}; while (strip_saylinks.find('[') != std::string::npos && strip_saylinks.find(']') != std::string::npos) { - std::string bracket_message = get_between(strip_saylinks, "[", "]"); + std::string bracket_message = Strings::GetBetween(strip_saylinks, "[", "]"); // strip saylinks and normalize to [regular message] size_t link_open = bracket_message.find('\x12'); @@ -284,12 +284,12 @@ void DialogueWindow::Render(Client *c, std::string markdown) ); } - find_replace(strip_saylinks, fmt::format("[{}]", bracket_message), ""); + Strings::FindReplace(strip_saylinks, fmt::format("[{}]", bracket_message), ""); } // write replacement strips for (auto &replacement: replacements) { - find_replace(output, replacement.first, replacement.second.substr(0, replacement.second.size() - 1)); + Strings::FindReplace(output, replacement.first, replacement.second.substr(0, replacement.second.size() - 1)); } // copy @@ -298,7 +298,7 @@ void DialogueWindow::Render(Client *c, std::string markdown) // while brackets still exist int response_index = 0; while (content.find('[') != std::string::npos && content.find(']') != std::string::npos) { - std::string bracket_message = get_between(content, "[", "]"); + std::string bracket_message = Strings::GetBetween(content, "[", "]"); LogDiaWindDetail( "Client [{}] Rendering responses ({}) [{}]", @@ -311,7 +311,7 @@ void DialogueWindow::Render(Client *c, std::string markdown) responses.emplace_back(bracket_message); // pop the response off of the message - find_replace(content, fmt::format("[{}]", bracket_message), ""); + Strings::FindReplace(content, fmt::format("[{}]", bracket_message), ""); // too many iterations / safety net if (response_index > 100) { @@ -326,7 +326,7 @@ void DialogueWindow::Render(Client *c, std::string markdown) if (responses.size() > 1) { for (auto &r: responses) { bracket_responses.emplace_back( - fmt::format("[{}]", EQ::SayLinkEngine::GenerateQuestSaylink(r, false, r)) + fmt::format("[{}]", Saylink::Create(r, false, r)) ); } } @@ -346,13 +346,13 @@ void DialogueWindow::Render(Client *c, std::string markdown) // handle silent prompts from the [> silent syntax std::string silent_message; if (responses.empty() && markdown.find('[') != std::string::npos && markdown.find('>') != std::string::npos) { - silent_message = get_between(output, "[", ">"); + silent_message = Strings::GetBetween(output, "[", ">"); // temporary and used during the response c->SetEntityVariable(DIAWIND_RESPONSE_ONE_KEY.c_str(), silent_message.c_str()); // pop the silent message off - find_replace(output, fmt::format("[{}>", silent_message), ""); + Strings::FindReplace(output, fmt::format("[{}>", silent_message), ""); } else if (!responses.empty()) { // handle silent prompts from the single respond bracket syntax [] @@ -362,13 +362,13 @@ void DialogueWindow::Render(Client *c, std::string markdown) c->SetEntityVariable(DIAWIND_RESPONSE_ONE_KEY.c_str(), silent_message.c_str()); // pop the silent message off - find_replace(output, fmt::format("[{}]", silent_message), ""); + Strings::FindReplace(output, fmt::format("[{}]", silent_message), ""); } // strip brackets if (render_nobracket) { - find_replace(output, "[", ""); - find_replace(output, "]", ""); + Strings::FindReplace(output, "[", ""); + Strings::FindReplace(output, "]", ""); } // render title @@ -385,13 +385,13 @@ void DialogueWindow::Render(Client *c, std::string markdown) // title std::string popup_title; if (markdown.find("{title:") != std::string::npos) { - popup_title = get_between(output, "{title:", "}"); + popup_title = Strings::GetBetween(output, "{title:", "}"); LogDiaWind("Client [{}] Rendering title option title [{}]", c->GetCleanName(), popup_title); if (!popup_title.empty()) { - find_replace(output, fmt::format("{{title:{}}}", popup_title), ""); - title = trim(popup_title); + Strings::FindReplace(output, fmt::format("{{title:{}}}", popup_title), ""); + title = Strings::Trim(popup_title); } } @@ -407,7 +407,7 @@ void DialogueWindow::Render(Client *c, std::string markdown) // click response // window type response - uint32 window_type = (StringIsNumber(wintype) ? std::atoi(wintype.c_str()) : 0); + uint32 window_type = (Strings::IsNumber(wintype) ? std::atoi(wintype.c_str()) : 0); std::string click_response_button = (window_type == 1 ? "Yes" : "OK"); std::string click_response = fmt::format( "Click [{}] to continue...", @@ -449,7 +449,7 @@ void DialogueWindow::Render(Client *c, std::string markdown) // while brackets still exist int tag_index = 0; while (output.find('{') != std::string::npos && output.find('}') != std::string::npos) { - std::string color_tag = get_between(output, "{", "}"); + std::string color_tag = Strings::GetBetween(output, "{", "}"); LogDiaWindDetail( "Client [{}] Rendering color tags ({}) [{}]", @@ -464,7 +464,7 @@ void DialogueWindow::Render(Client *c, std::string markdown) // build html tag html_tag = fmt::format("", color.second); // pop the response off of the message - find_replace(output, fmt::format("{{{}}}", color.first), html_tag); + Strings::FindReplace(output, fmt::format("{{{}}}", color.first), html_tag); } } @@ -479,9 +479,9 @@ void DialogueWindow::Render(Client *c, std::string markdown) // build the final output string std::string final_output; - final_output = fmt::format("{}{}{}

{}", quote_string, trim(output), quote_string, click_response); + final_output = fmt::format("{}{}{}

{}", quote_string, Strings::Trim(output), quote_string, click_response); if (render_hiddenresponse) { - final_output = fmt::format("{}{}{}", quote_string, trim(output), quote_string); + final_output = fmt::format("{}{}{}", quote_string, Strings::Trim(output), quote_string); } // send popup @@ -500,6 +500,6 @@ void DialogueWindow::Render(Client *c, std::string markdown) // if multiple brackets are presented, send message if (!bracket_responses.empty()) { c->Message(Chat::White, " --- Select Response from Options --- "); - c->Message(Chat::White, implode(" ", bracket_responses).c_str()); + c->Message(Chat::White, Strings::Implode(" ", bracket_responses).c_str()); } } diff --git a/zone/doors.cpp b/zone/doors.cpp index 9ed2c4dc6..8de6ca295 100644 --- a/zone/doors.cpp +++ b/zone/doors.cpp @@ -18,7 +18,7 @@ #include "../common/global_define.h" #include "../common/eqemu_logsys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "client.h" #include "doors.h" diff --git a/zone/effects.cpp b/zone/effects.cpp index 544d2f910..dd924be37 100644 --- a/zone/effects.cpp +++ b/zone/effects.cpp @@ -571,7 +571,7 @@ bool Client::TrainDiscipline(uint32 itemid) { uint32 spell_id = item->Scroll.Effect; if(!IsValidSpell(spell_id)) { - Message(Chat::Red, "This tome contains invalid knowledge."); + Message(Chat::Red, "This tome Contains invalid knowledge."); return(false); } @@ -649,7 +649,7 @@ bool Client::MemorizeSpellFromItem(uint32 item_id) { uint32 spell_id = item->Scroll.Effect; if(!IsValidSpell(spell_id)) { - Message(Chat::Red, "This scroll contains invalid knowledge."); + Message(Chat::Red, "This scroll Contains invalid knowledge."); return false; } @@ -755,7 +755,7 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) { //make sure we can use it.. if(!IsValidSpell(spell_id)) { - Message(Chat::Red, "This tome contains invalid knowledge."); + Message(Chat::Red, "This tome Contains invalid knowledge."); return(false); } @@ -801,7 +801,7 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) { Chat::White, fmt::format( "You can use this discipline in {}.", - ConvertSecondsToTime(remaining_time) + Strings::SecondsToTime(remaining_time) ).c_str() ); return false; diff --git a/zone/embparser.cpp b/zone/embparser.cpp index 98341a858..91e42c2d0 100644 --- a/zone/embparser.cpp +++ b/zone/embparser.cpp @@ -21,7 +21,7 @@ #include "../common/global_define.h" #include "../common/seperator.h" #include "../common/misc_functions.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/features.h" #include "masterentity.h" #include "embparser.h" @@ -934,7 +934,7 @@ int PerlembParser::SendCommands( "Script Error | Package [{}] Event [{}] Error [{}]", pkgprefix, event, - trim(e) + Strings::Trim(e) ) ); } @@ -1413,7 +1413,7 @@ void PerlembParser::ExportEventVariables( ExportVar(package_name.c_str(), "version", zone->GetInstanceVersion()); break; } - + case EVENT_LOOT_ZONE: case EVENT_LOOT: { Seperator sep(data); @@ -1666,12 +1666,12 @@ void PerlembParser::ExportEventVariables( ExportVar(package_name.c_str(), "from_z", sep.arg[2]); break; } - + case EVENT_CONSIDER: { ExportVar(package_name.c_str(), "entity_id", std::stoi(data)); break; } - + case EVENT_CONSIDER_CORPSE: { ExportVar(package_name.c_str(), "corpse_entity_id", std::stoi(data)); break; diff --git a/zone/embparser_api.cpp b/zone/embparser_api.cpp index baf150bca..5e7334173 100644 --- a/zone/embparser_api.cpp +++ b/zone/embparser_api.cpp @@ -3638,7 +3638,7 @@ std::string Perl__getenvironmentaldamagename(uint8 damage_type) std::string Perl__commify(perl::scalar number) { - return commify(number.c_str()); + return Strings::Commify(number.c_str()); } bool Perl__checknamefilter(std::string name) diff --git a/zone/entity.cpp b/zone/entity.cpp index 459797738..653acda55 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -3335,7 +3335,7 @@ void EntityList::CorpseFix(Client* c) cur->GetFixedZ(c->GetPosition()), c->GetHeading() ); - + fixed_count++; } } @@ -5129,7 +5129,7 @@ std::vector EntityList::GetBotListByClientName(std::string client_name) } for (auto bot : bot_list) { - if (bot->GetOwner() && str_tolower(bot->GetOwner()->GetCleanName()) == str_tolower(client_name)) { + if (bot->GetOwner() && Strings::ToLower(bot->GetOwner()->GetCleanName()) == Strings::ToLower(client_name)) { client_bot_list.push_back(bot); } } diff --git a/zone/exp.cpp b/zone/exp.cpp index b0fa4ac3a..c76ee959b 100644 --- a/zone/exp.cpp +++ b/zone/exp.cpp @@ -19,7 +19,7 @@ #include "../common/global_define.h" #include "../common/features.h" #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "client.h" #include "data_bucket.h" @@ -1160,7 +1160,7 @@ uint8 Client::GetCharMaxLevelFromQGlobal() { for (const auto& global : global_map) { if (global.name == "CharMaxLevel") { - if (StringIsNumber(global.value)) { + if (Strings::IsNumber(global.value)) { return static_cast(std::stoul(global.value)); } } @@ -1178,7 +1178,7 @@ uint8 Client::GetCharMaxLevelFromBucket() auto bucket_value = DataBucket::GetData(new_bucket_name); if (!bucket_value.empty()) { - if (StringIsNumber(bucket_value)) { + if (Strings::IsNumber(bucket_value)) { return static_cast(std::stoul(bucket_value)); } } @@ -1190,7 +1190,7 @@ uint8 Client::GetCharMaxLevelFromBucket() bucket_value = DataBucket::GetData(old_bucket_name); if (!bucket_value.empty()) { - if (StringIsNumber(bucket_value)) { + if (Strings::IsNumber(bucket_value)) { return static_cast(std::stoul(bucket_value)); } } diff --git a/zone/expedition_database.cpp b/zone/expedition_database.cpp index 9a3bfb837..1f49c917e 100644 --- a/zone/expedition_database.cpp +++ b/zone/expedition_database.cpp @@ -23,7 +23,7 @@ #include "zonedb.h" #include "../common/database.h" #include "../common/expedition_lockout_timer.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include uint32_t ExpeditionDatabase::InsertExpedition(uint32_t dz_id) @@ -100,7 +100,7 @@ std::vector ExpeditionDatabase::LoadCharacterLockouts( character_id = {} AND expire_time > NOW() AND expedition_name = '{}'; - ), character_id, EscapeString(expedition_name)); + ), character_id, Strings::Escape(expedition_name)); auto results = database.QueryDatabase(query); if (results.Success()) @@ -145,7 +145,7 @@ void ExpeditionDatabase::DeleteAllCharacterLockouts( std::string query = fmt::format(SQL( DELETE FROM character_expedition_lockouts WHERE character_id = {} AND expedition_name = '{}'; - ), character_id, EscapeString(expedition_name)); + ), character_id, Strings::Escape(expedition_name)); database.QueryDatabase(query); } @@ -164,7 +164,7 @@ void ExpeditionDatabase::DeleteCharacterLockout( character_id = {} AND expedition_name = '{}' AND event_name = '{}'; - ), character_id, EscapeString(expedition_name), EscapeString(event_name)); + ), character_id, Strings::Escape(expedition_name), Strings::Escape(event_name)); database.QueryDatabase(query); } @@ -191,7 +191,7 @@ void ExpeditionDatabase::DeleteMembersLockout( IN ({}) AND expedition_name = '{}' AND event_name = '{}'; - ), query_character_ids, EscapeString(expedition_name), EscapeString(event_name)); + ), query_character_ids, Strings::Escape(expedition_name), Strings::Escape(event_name)); database.QueryDatabase(query); } @@ -204,7 +204,7 @@ void ExpeditionDatabase::DeleteLockout(uint32_t expedition_id, const std::string auto query = fmt::format(SQL( DELETE FROM expedition_lockouts WHERE expedition_id = {} AND event_name = '{}'; - ), expedition_id, EscapeString(event_name)); + ), expedition_id, Strings::Escape(event_name)); database.QueryDatabase(query); } @@ -223,8 +223,8 @@ void ExpeditionDatabase::InsertCharacterLockouts(uint32_t character_id, lockout.GetExpireTime(), lockout.GetDuration(), lockout.GetExpeditionUUID(), - EscapeString(lockout.GetExpeditionName()), - EscapeString(lockout.GetEventName()) + Strings::Escape(lockout.GetExpeditionName()), + Strings::Escape(lockout.GetEventName()) ); } @@ -263,8 +263,8 @@ void ExpeditionDatabase::InsertMembersLockout( lockout.GetExpireTime(), lockout.GetDuration(), lockout.GetExpeditionUUID(), - EscapeString(lockout.GetExpeditionName()), - EscapeString(lockout.GetEventName()) + Strings::Escape(lockout.GetExpeditionName()), + Strings::Escape(lockout.GetEventName()) ); } @@ -306,7 +306,7 @@ void ExpeditionDatabase::InsertLockout( ), expedition_id, lockout.GetExpeditionUUID(), - EscapeString(lockout.GetEventName()), + Strings::Escape(lockout.GetEventName()), lockout.GetExpireTime(), lockout.GetDuration() ); @@ -326,7 +326,7 @@ void ExpeditionDatabase::InsertLockouts( "({}, '{}', '{}', FROM_UNIXTIME({}), {}),", expedition_id, lockout.second.GetExpeditionUUID(), - EscapeString(lockout.second.GetEventName()), + Strings::Escape(lockout.second.GetEventName()), lockout.second.GetExpireTime(), lockout.second.GetDuration() ); @@ -388,8 +388,8 @@ void ExpeditionDatabase::AddLockoutDuration(const std::vector lockout.GetExpireTime(), lockout.GetDuration(), lockout.GetExpeditionUUID(), - EscapeString(lockout.GetExpeditionName()), - EscapeString(lockout.GetEventName()) + Strings::Escape(lockout.GetExpeditionName()), + Strings::Escape(lockout.GetEventName()) ); } diff --git a/zone/forage.cpp b/zone/forage.cpp index 375788420..5a2adc887 100644 --- a/zone/forage.cpp +++ b/zone/forage.cpp @@ -20,7 +20,7 @@ #include "../common/eqemu_logsys.h" #include "../common/misc_functions.h" #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "entity.h" #include "forage.h" diff --git a/zone/gm_commands/advnpcspawn.cpp b/zone/gm_commands/advnpcspawn.cpp index f042f844a..0ec3cbd63 100755 --- a/zone/gm_commands/advnpcspawn.cpp +++ b/zone/gm_commands/advnpcspawn.cpp @@ -33,7 +33,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep) return; } - std::string spawn_command = str_tolower(sep->arg[1]); + std::string spawn_command = Strings::ToLower(sep->arg[1]); bool is_add_entry = spawn_command.find("addentry") != std::string::npos; bool is_add_spawn = spawn_command.find("addspawn") != std::string::npos; bool is_clear_box = spawn_command.find("clearbox") != std::string::npos; diff --git a/zone/gm_commands/ai.cpp b/zone/gm_commands/ai.cpp index 88c3e2a02..9ae6351e1 100755 --- a/zone/gm_commands/ai.cpp +++ b/zone/gm_commands/ai.cpp @@ -17,7 +17,7 @@ void command_ai(Client *c, const Seperator *sep) c->Message(Chat::White, "You must target an NPC to use this command."); return; } - + auto target = c->GetTarget()->CastToNPC(); bool is_consider = !strcasecmp(sep->arg[1], "consider"); @@ -42,7 +42,7 @@ void command_ai(Client *c, const Seperator *sep) return; } - if (is_consider) { + if (is_consider) { if (arguments == 2) { auto mob_name = sep->arg[2]; auto mob_to_consider = entity_list.GetMob(mob_name); @@ -153,7 +153,7 @@ void command_ai(Client *c, const Seperator *sep) delay ? fmt::format( "a delay of {} ({})", - ConvertMillisecondsToTime(delay), + Strings::MillisecondsToTime(delay), delay ): "no delay" @@ -162,7 +162,7 @@ void command_ai(Client *c, const Seperator *sep) minimum_delay ? fmt::format( "a minimum delay of {} ({})", - ConvertMillisecondsToTime(minimum_delay), + Strings::MillisecondsToTime(minimum_delay), minimum_delay ): "no minimum delay" @@ -209,7 +209,7 @@ void command_ai(Client *c, const Seperator *sep) fmt::format( "a delay of {} ({})", delay, - ConvertMillisecondsToTime(delay) + Strings::MillisecondsToTime(delay) ): "no delay" ), @@ -218,7 +218,7 @@ void command_ai(Client *c, const Seperator *sep) fmt::format( "a minimum delay of {} ({})", minimum_delay, - ConvertMillisecondsToTime(delay) + Strings::MillisecondsToTime(delay) ): "no minimum delay" ) diff --git a/zone/gm_commands/ban.cpp b/zone/gm_commands/ban.cpp index bbe38d77c..3d2530ab9 100755 --- a/zone/gm_commands/ban.cpp +++ b/zone/gm_commands/ban.cpp @@ -37,7 +37,7 @@ void command_ban(Client *c, const Seperator *sep) auto query = fmt::format( "UPDATE account SET status = -2, ban_reason = '{}' WHERE id = {}", - EscapeString(reason), + Strings::Escape(reason), account_id ); auto results = database.QueryDatabase(query); diff --git a/zone/gm_commands/camerashake.cpp b/zone/gm_commands/camerashake.cpp index cb781a99a..9c2e8a5f0 100755 --- a/zone/gm_commands/camerashake.cpp +++ b/zone/gm_commands/camerashake.cpp @@ -23,7 +23,7 @@ void command_camerashake(Client *c, const Seperator *sep) Chat::White, fmt::format( "Sending camera shake to world with a duration of {} ({}) and an intensity of {}.", - ConvertMillisecondsToTime(duration), + Strings::MillisecondsToTime(duration), duration, intensity ).c_str() diff --git a/zone/gm_commands/databuckets.cpp b/zone/gm_commands/databuckets.cpp index 82df39342..34b1a3ea7 100755 --- a/zone/gm_commands/databuckets.cpp +++ b/zone/gm_commands/databuckets.cpp @@ -21,7 +21,7 @@ void command_databuckets(Client *c, const Seperator *sep) } } if (sep->arg[2]) { - key_filter = str_tolower(sep->arg[2]); + key_filter = Strings::ToLower(sep->arg[2]); } std::string query = "SELECT `id`, `key`, `value`, `expires` FROM data_buckets"; if (!key_filter.empty()) { query += StringFormat(" WHERE `key` LIKE '%%%s%%'", key_filter.c_str()); } @@ -68,7 +68,7 @@ void command_databuckets(Client *c, const Seperator *sep) c->Message( Chat::White, "%s : %s", - EQ::SayLinkEngine::GenerateQuestSaylink(del_saylink, false, "Delete").c_str(), + Saylink::Create(del_saylink, false, "Delete").c_str(), key.c_str(), " Value: ", value.c_str()); diff --git a/zone/gm_commands/door_manipulation.cpp b/zone/gm_commands/door_manipulation.cpp index a724fb61f..17475dc79 100644 --- a/zone/gm_commands/door_manipulation.cpp +++ b/zone/gm_commands/door_manipulation.cpp @@ -48,8 +48,8 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) Chat::White, fmt::format( "#door model | Changes door model for selected door or select from [{}] or [{}]", - EQ::SayLinkEngine::GenerateQuestSaylink("#door showmodelszone", false, "local zone"), - EQ::SayLinkEngine::GenerateQuestSaylink("#door showmodelsglobal", false, "global") + Saylink::Create("#door showmodelszone", false, "local zone"), + Saylink::Create("#door showmodelsglobal", false, "global") ).c_str() ); c->Message( @@ -61,7 +61,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) Chat::White, fmt::format( "{} | Shows available models in the current zone that you are in", - EQ::SayLinkEngine::GenerateQuestSaylink("#door showmodelszone", false, "#door showmodelszone") + Saylink::Create("#door showmodelszone", false, "#door showmodelszone") ).c_str() ); @@ -69,7 +69,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) Chat::White, fmt::format( "{} | Shows available models globally by first listing all global model files", - EQ::SayLinkEngine::GenerateQuestSaylink("#door showmodelsglobal", false, "#door showmodelsglobal") + Saylink::Create("#door showmodelsglobal", false, "#door showmodelsglobal") ).c_str() ); @@ -78,14 +78,14 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) Chat::White, fmt::format( "{} - Brings up editing interface for selected door", - EQ::SayLinkEngine::GenerateQuestSaylink("#door edit", false, "#door edit") + Saylink::Create("#door edit", false, "#door edit") ).c_str() ); c->Message( Chat::White, fmt::format( "{} - lists doors in zone", - EQ::SayLinkEngine::GenerateQuestSaylink("#list doors", false, "#list doors") + Saylink::Create("#list doors", false, "#list doors") ).c_str() ); @@ -104,8 +104,8 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) door->GetDoorName(), door->GetOpenType(), door->GetInvertState(), - EQ::SayLinkEngine::GenerateQuestSaylink("#door setinvertstate 0", false, "0"), - EQ::SayLinkEngine::GenerateQuestSaylink("#door setinvertstate 1", false, "1") + Saylink::Create("#door setinvertstate 0", false, "0"), + Saylink::Create("#door setinvertstate 1", false, "1") ).c_str() ); @@ -135,7 +135,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) for (const auto &move_option : move_options) { if (move_option == move_x_action) { move_x_options_positive.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} .25", move_option), false, ".25" @@ -145,7 +145,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) for (int move_index = 0; move_index <= 15; move_index += 5) { int value = (move_index == 0 ? 1 : move_index); move_x_options_positive.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} {}", move_option, value), false, fmt::format("{}", std::abs(value)) @@ -156,7 +156,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) for (int move_index = -15; move_index <= 0; move_index += 5) { int value = (move_index == 0 ? 1 : move_index); move_x_options_negative.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} {}", move_option, value), false, fmt::format("{}", std::abs(value)) @@ -165,7 +165,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) } move_x_options_negative.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} -.25", move_option), false, ".25" @@ -174,7 +174,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) } else if (move_option == move_y_action) { move_y_options_positive.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} .25", move_option), false, ".25" @@ -184,7 +184,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) for (int move_index = 0; move_index <= 15; move_index += 5) { int value = (move_index == 0 ? 1 : move_index); move_y_options_positive.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} {}", move_option, value), false, fmt::format("{}", std::abs(value)) @@ -195,7 +195,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) for (int move_index = -15; move_index <= 0; move_index += 5) { int value = (move_index == 0 ? -1 : move_index); move_y_options_negative.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} {}", move_option, value), false, fmt::format("{}", std::abs(value)) @@ -204,7 +204,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) } move_y_options_negative.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} -.25", move_option), false, ".25" @@ -213,7 +213,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) } else if (move_option == move_z_action) { move_z_options_positive.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} .25", move_option), false, ".25" @@ -223,7 +223,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) for (int move_index = 0; move_index <= 15; move_index += 5) { int value = (move_index == 0 ? 1 : move_index); move_z_options_positive.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} {}", move_option, value), false, fmt::format("{}", std::abs(value)) @@ -234,7 +234,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) for (int move_index = -15; move_index <= 0; move_index += 5) { int value = (move_index == 0 ? -1 : move_index); move_z_options_negative.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} {}", move_option, value), false, fmt::format("{}", std::abs(value)) @@ -243,7 +243,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) } move_z_options_negative.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} -.25", move_option), false, ".25" @@ -254,7 +254,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) for (int move_index = 0; move_index <= 50; move_index += 5) { int value = (move_index == 0 ? 1 : move_index); move_h_options_positive.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} {}", move_option, value), false, fmt::format("{}", std::abs(value)) @@ -265,7 +265,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) for (int move_index = -50; move_index <= 0; move_index += 5) { int value = (move_index == 0 ? -1 : move_index); move_h_options_negative.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} {}", move_option, value), false, fmt::format("{}", std::abs(value)) @@ -277,7 +277,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) for (int move_index = 0; move_index <= 100; move_index += 10) { int value = (move_index == 0 ? 1 : move_index); set_size_options_positive.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} {}", move_option, value), false, fmt::format("{}", std::abs(value)) @@ -288,7 +288,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) for (int move_index = -100; move_index <= 0; move_index += 10) { int value = (move_index == 0 ? -1 : move_index); set_size_options_negative.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door edit {} {}", move_option, value), false, fmt::format("{}", std::abs(value)) @@ -299,7 +299,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) } // we're passing a move action here - if (!arg3.empty() && StringIsNumber(arg3)) { + if (!arg3.empty() && Strings::IsNumber(arg3)) { float x_move = 0.0f; float y_move = 0.0f; float z_move = 0.0f; @@ -410,17 +410,17 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) fmt::format( "Name [{}] [{}] [{}] [{}]", door->GetDoorName(), - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( "#door save", false, "Save" ), - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( "#door changemodelqueue", false, "Change Model" ), - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( "#door setinclineinc", false, "Incline" @@ -431,40 +431,40 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) Chat::White, fmt::format( "[{}] - [X] + [{}]", - implode(" | ", move_x_options_negative), - implode(" | ", move_x_options_positive) + Strings::Implode(" | ", move_x_options_negative), + Strings::Implode(" | ", move_x_options_positive) ).c_str() ); c->Message( Chat::White, fmt::format( "[{}] - [Y] + [{}]", - implode(" | ", move_y_options_negative), - implode(" | ", move_y_options_positive) + Strings::Implode(" | ", move_y_options_negative), + Strings::Implode(" | ", move_y_options_positive) ).c_str() ); c->Message( Chat::White, fmt::format( "[{}] - [Z] + [{}]", - implode(" | ", move_z_options_negative), - implode(" | ", move_z_options_positive) + Strings::Implode(" | ", move_z_options_negative), + Strings::Implode(" | ", move_z_options_positive) ).c_str() ); c->Message( Chat::White, fmt::format( "[{}] - [H] + [{}]", - implode(" | ", move_h_options_negative), - implode(" | ", move_h_options_positive) + Strings::Implode(" | ", move_h_options_negative), + Strings::Implode(" | ", move_h_options_positive) ).c_str() ); c->Message( Chat::White, fmt::format( "[{}] - [Size] + [{}]", - implode(" | ", set_size_options_negative), - implode(" | ", set_size_options_positive) + Strings::Implode(" | ", set_size_options_negative), + Strings::Implode(" | ", set_size_options_positive) ).c_str() ); @@ -476,7 +476,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) // create if (arg1 == "create") { - std::string model = str_toupper(arg2); + std::string model = Strings::ToUpper(arg2); uint16 entity_id = entity_list.CreateDoor( model.c_str(), c->GetPosition(), @@ -493,7 +493,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) // set model if (arg1 == "model") { Doors *door = entity_list.GetDoorsByID(c->GetDoorToolEntityId()); - std::string model = str_toupper(arg2); + std::string model = Strings::ToUpper(arg2); if (door) { door->SetDoorName(model.c_str()); } @@ -505,14 +505,14 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) Chat::White, fmt::format( "#door model | Changes door model for selected door or select from [{}] or [{}]", - EQ::SayLinkEngine::GenerateQuestSaylink("#door showmodelszone", false, "local zone"), - EQ::SayLinkEngine::GenerateQuestSaylink("#door showmodelsglobal", false, "global") + Saylink::Create("#door showmodelszone", false, "local zone"), + Saylink::Create("#door showmodelsglobal", false, "global") ).c_str() ); } // open type - if (arg1 == "opentype" && !arg2.empty() && StringIsNumber(arg2)) { + if (arg1 == "opentype" && !arg2.empty() && Strings::IsNumber(arg2)) { Doors *door = entity_list.GetDoorsByID(c->GetDoorToolEntityId()); if (door) { door->SetOpenType(std::atoi(arg2.c_str())); @@ -520,7 +520,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) } // incline - if (arg1 == "setincline" && !arg2.empty() && StringIsNumber(arg2)) { + if (arg1 == "setincline" && !arg2.empty() && Strings::IsNumber(arg2)) { Doors *door = entity_list.GetDoorsByID(c->GetDoorToolEntityId()); if (door) { door->SetIncline(std::atoi(arg2.c_str())); @@ -528,7 +528,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) } // incline - if (arg1 == "setinvertstate" && !arg2.empty() && StringIsNumber(arg2)) { + if (arg1 == "setinvertstate" && !arg2.empty() && Strings::IsNumber(arg2)) { Doors *door = entity_list.GetDoorsByID(c->GetDoorToolEntityId()); if (door) { door->SetInvertState(std::atoi(arg2.c_str())); @@ -545,7 +545,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) } // incline incremental - if (arg1 == "setinclineinc" && !arg2.empty() && StringIsNumber(arg2)) { + if (arg1 == "setinclineinc" && !arg2.empty() && Strings::IsNumber(arg2)) { Doors *door = entity_list.GetDoorsByID(c->GetDoorToolEntityId()); if (door) { door->SetIncline(door->GetIncline() + std::atoi(arg2.c_str())); @@ -569,7 +569,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) std::vector incline_negative_options; for (auto incline_value : incline_values) { incline_normal_options.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format( "#door setincline {}", incline_value.first @@ -583,7 +583,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) for (int incline_index = 0; incline_index <= 100; incline_index += 10) { int incline_value = (incline_index == 0 ? 1 : incline_index); incline_positive_options.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format( "#door setinclineinc {}", incline_value @@ -597,7 +597,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) for (int incline_index = -100; incline_index <= 1; incline_index += 10) { int incline_value = (incline_index == 0 ? -1 : incline_index); incline_negative_options.emplace_back( - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format( "#door setinclineinc {}", incline_value @@ -612,7 +612,7 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) Chat::White, fmt::format( "[Incline] [{}]", - implode(" | ", incline_normal_options) + Strings::Implode(" | ", incline_normal_options) ).c_str() ); @@ -620,8 +620,8 @@ void DoorManipulation::CommandHandler(Client *c, const Seperator *sep) Chat::White, fmt::format( "[Incline Increments] [{}] - | + [{}]", - implode(" | ", incline_negative_options), - implode(" | ", incline_positive_options) + Strings::Implode(" | ", incline_negative_options), + Strings::Implode(" | ", incline_positive_options) ).c_str() ); } @@ -700,7 +700,7 @@ void DoorManipulation::DisplayObjectResultToClient( say_links.emplace_back( fmt::format( "[{}] ", - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door model {}", g.object_name), false, g.object_name @@ -733,7 +733,7 @@ void DoorManipulation::DisplayObjectResultToClient( } if (!buffered_links.empty()) { - c->Message(Chat::White, implode(" ", buffered_links).c_str()); + c->Message(Chat::White, Strings::Implode(" ", buffered_links).c_str()); } } @@ -748,7 +748,7 @@ void DoorManipulation::DisplayModelsFromFileResults( say_links.emplace_back( fmt::format( "[{}] ", - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( fmt::format("#door showmodelsfromfile {}", g.file_from), false, g.file_from @@ -781,6 +781,6 @@ void DoorManipulation::DisplayModelsFromFileResults( } if (!buffered_links.empty()) { - c->Message(Chat::White, implode(" ", buffered_links).c_str()); + c->Message(Chat::White, Strings::Implode(" ", buffered_links).c_str()); } } diff --git a/zone/gm_commands/dye.cpp b/zone/gm_commands/dye.cpp index ecc04f7ca..195792f16 100755 --- a/zone/gm_commands/dye.cpp +++ b/zone/gm_commands/dye.cpp @@ -41,7 +41,7 @@ void command_dye(Client *c, const Seperator *sep) fmt::format( "{} {}", "Slots are as follows:", - implode(", ", slot_messages) + Strings::Implode(", ", slot_messages) ).c_str() ); return; diff --git a/zone/gm_commands/dz.cpp b/zone/gm_commands/dz.cpp index 506a203fb..cec054f18 100755 --- a/zone/gm_commands/dz.cpp +++ b/zone/gm_commands/dz.cpp @@ -42,10 +42,10 @@ void command_dz(Client *c, const Seperator *sep) continue; } - auto leader_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( + auto leader_saylink = Saylink::Create( fmt::format( "#goto {}", expedition->GetLeaderName()), false, expedition->GetLeaderName()); - auto zone_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( + auto zone_saylink = Saylink::Create( fmt::format( "#zoneinstance {}", dz->GetInstanceID()), false, "zone" ); @@ -123,7 +123,7 @@ void command_dz(Client *c, const Seperator *sep) for (const auto &dz : dynamic_zones) { auto seconds = dz->GetSecondsRemaining(); - auto zone_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( + auto zone_saylink = Saylink::Create( fmt::format("#zoneinstance {}", dz->GetInstanceID()), false, "zone" ); @@ -159,7 +159,7 @@ void command_dz(Client *c, const Seperator *sep) bool is_expired = now > expire_time; if (!is_expired || strcasecmp(sep->arg[2], "all") == 0) { - auto zone_saylink = is_expired ? "zone" : EQ::SayLinkEngine::GenerateQuestSaylink( + auto zone_saylink = is_expired ? "zone" : Saylink::Create( fmt::format("#zoneinstance {}", dz.instance), false, "zone" ); diff --git a/zone/gm_commands/editmassrespawn.cpp b/zone/gm_commands/editmassrespawn.cpp index 41fcc6613..288fee2fe 100755 --- a/zone/gm_commands/editmassrespawn.cpp +++ b/zone/gm_commands/editmassrespawn.cpp @@ -126,7 +126,7 @@ void command_editmassrespawn(Client *c, const Seperator *sep) c->Message( Chat::Yellow, "To apply these changes, click <%s> or type [%s]", - EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(), + Saylink::Create(saylink, false, "Apply").c_str(), saylink.c_str() ); } diff --git a/zone/gm_commands/faction.cpp b/zone/gm_commands/faction.cpp index 43aec7904..29e4bb14a 100755 --- a/zone/gm_commands/faction.cpp +++ b/zone/gm_commands/faction.cpp @@ -18,7 +18,7 @@ void command_faction(Client *c, const Seperator *sep) std::string faction_filter; if (sep->arg[2]) { - faction_filter = str_tolower(sep->arg[2]); + faction_filter = Strings::ToLower(sep->arg[2]); } if (!strcasecmp(sep->arg[1], "review")) { @@ -56,7 +56,7 @@ void command_faction(Client *c, const Seperator *sep) auto faction_id = std::stoul(row[0]); std::string faction_name = row[1]; std::string faction_value = row[2]; - std::string reset_link = EQ::SayLinkEngine::GenerateQuestSaylink( + std::string reset_link = Saylink::Create( fmt::format("#faction reset {}", faction_id), false, "Reset" diff --git a/zone/gm_commands/feature.cpp b/zone/gm_commands/feature.cpp index 83d0adb1c..bf6daf4ae 100644 --- a/zone/gm_commands/feature.cpp +++ b/zone/gm_commands/feature.cpp @@ -4,7 +4,7 @@ void command_feature(Client *c, const Seperator *sep) { int arguments = sep->argnum; if (arguments < 2 || !sep->IsNumber(2)) { - auto feature_save_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto feature_save_link = Saylink::Create( "#npcedit featuresave", false, "#npcedit featuresave" @@ -67,7 +67,7 @@ void command_feature(Client *c, const Seperator *sep) !is_tattoo && !is_texture ) { - auto feature_save_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto feature_save_link = Saylink::Create( "#npcedit featuresave", false, "#npcedit featuresave" diff --git a/zone/gm_commands/findclass.cpp b/zone/gm_commands/findclass.cpp index 591c1780f..62e484e81 100755 --- a/zone/gm_commands/findclass.cpp +++ b/zone/gm_commands/findclass.cpp @@ -39,11 +39,11 @@ void command_findclass(Client *c, const Seperator *sep) ); } } else { - auto search_criteria = str_tolower(sep->argplus[1]); + auto search_criteria = Strings::ToLower(sep->argplus[1]); int found_count = 0; for (uint16 class_id = WARRIOR; class_id <= MERCENARY_MASTER; class_id++) { std::string class_name = GetClassIDName(class_id); - auto class_name_lower = str_tolower(class_name); + auto class_name_lower = Strings::ToLower(class_name); if ( search_criteria.length() && class_name_lower.find(search_criteria) == std::string::npos diff --git a/zone/gm_commands/findfaction.cpp b/zone/gm_commands/findfaction.cpp index 29b72f441..8038a2e00 100755 --- a/zone/gm_commands/findfaction.cpp +++ b/zone/gm_commands/findfaction.cpp @@ -33,12 +33,12 @@ void command_findfaction(Client *c, const Seperator *sep) } } else { - std::string search_criteria = str_tolower(sep->argplus[1]); + std::string search_criteria = Strings::ToLower(sep->argplus[1]); int found_count = 0; int max_faction_id = content_db.GetMaxFaction(); for (int faction_id = 0; faction_id < max_faction_id; faction_id++) { std::string faction_name = content_db.GetFactionName(faction_id); - std::string faction_name_lower = str_tolower(faction_name); + std::string faction_name_lower = Strings::ToLower(faction_name); if (faction_name.empty()) { continue; } diff --git a/zone/gm_commands/findrace.cpp b/zone/gm_commands/findrace.cpp index 06b5ccc56..6e02a7041 100755 --- a/zone/gm_commands/findrace.cpp +++ b/zone/gm_commands/findrace.cpp @@ -41,13 +41,13 @@ void command_findrace(Client *c, const Seperator *sep) ); } } else { - auto search_criteria = str_tolower(sep->argplus[1]); + auto search_criteria = Strings::ToLower(sep->argplus[1]); int found_count = 0; for (uint16 race_id = RACE_HUMAN_1; race_id <= RACE_PEGASUS_732; race_id++) { std::string race_name = GetRaceIDName(race_id); - auto race_name_lower = str_tolower(race_name); + auto race_name_lower = Strings::ToLower(race_name); if ( - search_criteria.length() && + search_criteria.length() && race_name_lower.find(search_criteria) == std::string::npos ) { continue; diff --git a/zone/gm_commands/findskill.cpp b/zone/gm_commands/findskill.cpp index b26ad3ab1..5c9a3b50e 100755 --- a/zone/gm_commands/findskill.cpp +++ b/zone/gm_commands/findskill.cpp @@ -38,11 +38,11 @@ void command_findskill(Client *c, const Seperator *sep) } } else { - std::string search_criteria = str_tolower(sep->argplus[1]); + std::string search_criteria = Strings::ToLower(sep->argplus[1]); if (!search_criteria.empty()) { int found_count = 0; for (auto skill : skills) { - std::string skill_name_lower = str_tolower(skill.second); + std::string skill_name_lower = Strings::ToLower(skill.second); if (skill_name_lower.find(search_criteria) == std::string::npos) { continue; } diff --git a/zone/gm_commands/findspell.cpp b/zone/gm_commands/findspell.cpp index 78374a224..0585bda1c 100755 --- a/zone/gm_commands/findspell.cpp +++ b/zone/gm_commands/findspell.cpp @@ -37,13 +37,13 @@ void command_findspell(Client *c, const Seperator *sep) } } else { - std::string search_criteria = str_tolower(sep->argplus[1]); + std::string search_criteria = Strings::ToLower(sep->argplus[1]); int found_count = 0; for (int spell_id = 0; spell_id < SPDAT_RECORDS; spell_id++) { auto current_spell = spells[spell_id]; if (current_spell.name[0] != 0) { std::string spell_name = current_spell.name; - std::string spell_name_lower = str_tolower(spell_name); + std::string spell_name_lower = Strings::ToLower(spell_name); if (search_criteria.length() > 0 && spell_name_lower.find(search_criteria) == std::string::npos) { continue; } diff --git a/zone/gm_commands/findtask.cpp b/zone/gm_commands/findtask.cpp index 5edf0dcde..95421b1a2 100755 --- a/zone/gm_commands/findtask.cpp +++ b/zone/gm_commands/findtask.cpp @@ -32,12 +32,12 @@ void command_findtask(Client *c, const Seperator *sep) ); } else { - std::string search_criteria = str_tolower(sep->argplus[1]); + std::string search_criteria = Strings::ToLower(sep->argplus[1]); if (!search_criteria.empty()) { int found_count = 0; for (uint32 task_id = 1; task_id <= MAXTASKS; task_id++) { auto task_name = task_manager->GetTaskName(task_id); - std::string task_name_lower = str_tolower(task_name); + std::string task_name_lower = Strings::ToLower(task_name); if (task_name_lower.find(search_criteria) == std::string::npos) { continue; } diff --git a/zone/gm_commands/findzone.cpp b/zone/gm_commands/findzone.cpp index 53dacc52d..06297b20e 100755 --- a/zone/gm_commands/findzone.cpp +++ b/zone/gm_commands/findzone.cpp @@ -27,8 +27,8 @@ void command_findzone(Client *c, const Seperator *sep) if (id == 0) { query = fmt::format( "SELECT zoneidnumber, short_name, long_name, version FROM zone WHERE long_name LIKE '%{}%' OR `short_name` LIKE '%{}%'", - EscapeString(sep->arg[1]), - EscapeString(sep->arg[1]) + Strings::Escape(sep->arg[1]), + Strings::Escape(sep->arg[1]) ); } else { @@ -60,8 +60,8 @@ void command_findzone(Client *c, const Seperator *sep) break; } - std::string command_zone = EQ::SayLinkEngine::GenerateQuestSaylink("#zone " + short_name, false, "zone"); - std::string command_gmzone = EQ::SayLinkEngine::GenerateQuestSaylink( + std::string command_zone = Saylink::Create("#zone " + short_name, false, "zone"); + std::string command_gmzone = Saylink::Create( fmt::format("#gmzone {} {}", short_name, version), false, "gmzone" diff --git a/zone/gm_commands/flagedit.cpp b/zone/gm_commands/flagedit.cpp index af87b7df6..334991185 100755 --- a/zone/gm_commands/flagedit.cpp +++ b/zone/gm_commands/flagedit.cpp @@ -4,7 +4,7 @@ void command_flagedit(Client *c, const Seperator *sep) { int arguments = sep->argnum; if (!arguments) { - auto flags_link = EQ::SayLinkEngine::GenerateQuestSaylink("#flags", false, "#flags"); + auto flags_link = Saylink::Create("#flags", false, "#flags"); c->Message( Chat::White, "Usage: #flagedit lock [Zone ID|Zone Short Name] [Flag Name] - Set the specified flag name on the zone, locking the zone" @@ -48,7 +48,7 @@ void command_flagedit(Client *c, const Seperator *sep) !is_take && !is_unlock ) { - auto flags_link = EQ::SayLinkEngine::GenerateQuestSaylink("#flags", false, "#flags"); + auto flags_link = Saylink::Create("#flags", false, "#flags"); c->Message( Chat::White, "Usage: #flagedit lock [Zone ID|Zone Short Name] [Flag Name] - Set the specified flag name on the zone, locking the zone" @@ -85,7 +85,7 @@ void command_flagedit(Client *c, const Seperator *sep) std::stoul(sep->arg[2]) : ZoneID(sep->arg[2]) ); - std::string zone_short_name = str_tolower(ZoneName(zone_id, true)); + std::string zone_short_name = Strings::ToLower(ZoneName(zone_id, true)); bool is_unknown_zone = zone_short_name.find("unknown") != std::string::npos; if (zone_id && !is_unknown_zone) { std::string zone_long_name = ZoneLongName(zone_id); @@ -120,7 +120,7 @@ void command_flagedit(Client *c, const Seperator *sep) } std::string popup_text = ""; - + popup_text += ""; for (auto row : results) { @@ -154,7 +154,7 @@ void command_flagedit(Client *c, const Seperator *sep) std::stoul(sep->arg[2]) : ZoneID(sep->arg[2]) ); - std::string zone_short_name = str_tolower(ZoneName(zone_id, true)); + std::string zone_short_name = Strings::ToLower(ZoneName(zone_id, true)); bool is_unknown_zone = zone_short_name.find("unknown") != std::string::npos; if (zone_id && !is_unknown_zone) { if (arguments < 3) { @@ -164,8 +164,8 @@ void command_flagedit(Client *c, const Seperator *sep) ); return; } - - std::string flag_name = EscapeString(sep->argplus[3]); + + std::string flag_name = Strings::Escape(sep->argplus[3]); std::string zone_long_name = ZoneLongName(zone_id); auto query = fmt::format( @@ -209,7 +209,7 @@ void command_flagedit(Client *c, const Seperator *sep) std::stoul(sep->arg[2]) : ZoneID(sep->arg[2]) ); - std::string zone_short_name = str_tolower(ZoneName(zone_id, true)); + std::string zone_short_name = Strings::ToLower(ZoneName(zone_id, true)); bool is_unknown_zone = zone_short_name.find("unknown") != std::string::npos; if (zone_id && !is_unknown_zone) { std::string zone_long_name = ZoneLongName(zone_id); @@ -237,7 +237,7 @@ void command_flagedit(Client *c, const Seperator *sep) std::stoul(sep->arg[2]) : ZoneID(sep->arg[2]) ); - std::string zone_short_name = str_tolower(ZoneName(zone_id, true)); + std::string zone_short_name = Strings::ToLower(ZoneName(zone_id, true)); bool is_unknown_zone = zone_short_name.find("unknown") != std::string::npos; if (zone_id && !is_unknown_zone) { std::string zone_long_name = ZoneLongName(zone_id); diff --git a/zone/gm_commands/gearup.cpp b/zone/gm_commands/gearup.cpp index e02ba600d..da1a9b489 100755 --- a/zone/gm_commands/gearup.cpp +++ b/zone/gm_commands/gearup.cpp @@ -25,8 +25,8 @@ void command_gearup(Client *c, const Seperator *sep) if (auto res = cli.Get(url.c_str())) { if (res->status == 200) { - for (auto &s: SplitString(res->body, ';')) { - if (!trim(s).empty()) { + for (auto &s: Strings::Split(res->body, ';')) { + if (!Strings::Trim(s).empty()) { auto results = database.QueryDatabase(s); if (!results.ErrorMessage().empty()) { c->Message( @@ -161,7 +161,7 @@ void command_gearup(Client *c, const Seperator *sep) std::string message; for (auto row = results.begin(); row != results.end(); ++row) { int expansion = atoi(row[0]); - message += "[" + EQ::SayLinkEngine::GenerateQuestSaylink( + message += "[" + Saylink::Create( fmt::format("#gearup {}", expansion), false, Expansion::ExpansionName[expansion] diff --git a/zone/gm_commands/givemoney.cpp b/zone/gm_commands/givemoney.cpp index 6be807778..9aa17e76d 100755 --- a/zone/gm_commands/givemoney.cpp +++ b/zone/gm_commands/givemoney.cpp @@ -8,7 +8,7 @@ void command_givemoney(Client *c, const Seperator *sep) return; } - + Client *target = c; if (c->GetTarget() && c->GetTarget()->IsClient()) { target = c->GetTarget()->CastToClient(); @@ -30,12 +30,12 @@ void command_givemoney(Client *c, const Seperator *sep) platinum, true ); - + c->Message( Chat::White, fmt::format( "Added {} to {}.", - ConvertMoneyToString( + Strings::Money( platinum, gold, silver, diff --git a/zone/gm_commands/gmzone.cpp b/zone/gm_commands/gmzone.cpp index 223f04fb3..d0914ab5a 100755 --- a/zone/gm_commands/gmzone.cpp +++ b/zone/gm_commands/gmzone.cpp @@ -9,7 +9,7 @@ void command_gmzone(Client *c, const Seperator *sep) return; } - std::string zone_short_name = str_tolower( + std::string zone_short_name = Strings::ToLower( sep->IsNumber(1) ? ZoneName(std::stoul(sep->arg[1]), true) : sep->arg[1] @@ -44,13 +44,13 @@ void command_gmzone(Client *c, const Seperator *sep) std::stoul(sep->arg[2]) : 0 ); - + std::string instance_identifier = ( sep->arg[3] ? sep->arg[3] : "gmzone" ); - + auto bucket_key = fmt::format( "{}-{}-{}-instance", zone_short_name, diff --git a/zone/gm_commands/instance.cpp b/zone/gm_commands/instance.cpp index 1777ef652..229315939 100755 --- a/zone/gm_commands/instance.cpp +++ b/zone/gm_commands/instance.cpp @@ -100,7 +100,7 @@ void command_instance(Client *c, const Seperator *sep) uint32 zone_id = database.ZoneIDFromInstanceID(instance_id); uint32 version = database.VersionFromInstanceID(instance_id); uint32 current_id = database.GetInstanceID(zone_id, character_id, version); - if (!current_id) { + if (!current_id) { c->Message( Chat::White, ( @@ -109,7 +109,7 @@ void command_instance(Client *c, const Seperator *sep) "Added {} to Instance ID {}.", c->GetTargetDescription(target), instance_id - ) : + ) : fmt::format( "Failed to add {} to Instance ID {}.", c->GetTargetDescription(target), @@ -182,7 +182,7 @@ void command_instance(Client *c, const Seperator *sep) ZoneLongName(zone_id), zone_id, ( - version ? + version ? fmt::format( " Version: {}", version @@ -197,7 +197,7 @@ void command_instance(Client *c, const Seperator *sep) fmt::format( "Instance {} Created | Duration: {} ({})", instance_id, - ConvertSecondsToTime(duration), + Strings::SecondsToTime(duration), duration ).c_str() ); @@ -295,7 +295,7 @@ void command_instance(Client *c, const Seperator *sep) "Removed {} from Instance ID {}.", c->GetTargetDescription(target), instance_id - ) : + ) : fmt::format( "Failed to remove {} from Instance ID {}.", c->GetTargetDescription(target), diff --git a/zone/gm_commands/itemsearch.cpp b/zone/gm_commands/itemsearch.cpp index 4617e2397..1f4c9a25a 100755 --- a/zone/gm_commands/itemsearch.cpp +++ b/zone/gm_commands/itemsearch.cpp @@ -19,7 +19,7 @@ void command_itemsearch(Client *c, const Seperator *sep) std::string item_id = std::to_string(item->ID); std::string saylink_commands = "[" + - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( "#si " + item_id, false, "X" @@ -30,7 +30,7 @@ void command_itemsearch(Client *c, const Seperator *sep) std::string stack_size = std::to_string(item->StackSize); saylink_commands += "[" + - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( "#si " + item_id + " " + stack_size, false, stack_size @@ -77,7 +77,7 @@ void command_itemsearch(Client *c, const Seperator *sep) std::string item_id = std::to_string(item->ID); std::string saylink_commands = "[" + - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( "#si " + item_id, false, "X" @@ -87,7 +87,7 @@ void command_itemsearch(Client *c, const Seperator *sep) std::string stack_size = std::to_string(item->StackSize); saylink_commands += "[" + - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( "#si " + item_id + " " + stack_size, false, stack_size diff --git a/zone/gm_commands/killallnpcs.cpp b/zone/gm_commands/killallnpcs.cpp index c01bd67f3..146ee1e2d 100755 --- a/zone/gm_commands/killallnpcs.cpp +++ b/zone/gm_commands/killallnpcs.cpp @@ -4,7 +4,7 @@ void command_killallnpcs(Client *c, const Seperator *sep) { std::string search_string; if (sep->arg[1]) { - search_string = str_tolower(sep->arg[1]); + search_string = Strings::ToLower(sep->arg[1]); } int killed_count = 0; @@ -15,7 +15,7 @@ void command_killallnpcs(Client *c, const Seperator *sep) continue; } - std::string entity_name = str_tolower(entity->GetName()); + std::string entity_name = Strings::ToLower(entity->GetName()); if ((!search_string.empty() && entity_name.find(search_string) == std::string::npos) || !entity->IsAttackAllowed(c)) { continue; diff --git a/zone/gm_commands/list.cpp b/zone/gm_commands/list.cpp index a38b3ddc3..420510ffb 100755 --- a/zone/gm_commands/list.cpp +++ b/zone/gm_commands/list.cpp @@ -69,7 +69,7 @@ void command_list(Client *c, const Seperator *sep) c->Message( 0, "| %s | ID %5d | %s | x %.0f | y %0.f | z %.0f", - EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), + Saylink::Create(saylink, false, "Goto").c_str(), entity->GetID(), entity->GetName(), entity->GetX(), @@ -110,7 +110,7 @@ void command_list(Client *c, const Seperator *sep) c->Message( 0, "| %s | ID %5d | %s | x %.0f | y %0.f | z %.0f", - EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), + Saylink::Create(saylink, false, "Goto").c_str(), entity->GetID(), entity->GetName(), entity->GetX(), @@ -151,7 +151,7 @@ void command_list(Client *c, const Seperator *sep) c->Message( 0, "| %s | ID %5d | %s | x %.0f | y %0.f | z %.0f", - EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), + Saylink::Create(saylink, false, "Goto").c_str(), entity->GetID(), entity->GetName(), entity->GetX(), @@ -192,7 +192,7 @@ void command_list(Client *c, const Seperator *sep) c->Message( 0, "| %s | Entity ID %5d | Door ID %i | %s | x %.0f | y %0.f | z %.0f", - EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), + Saylink::Create(saylink, false, "Goto").c_str(), entity->GetID(), entity->GetDoorID(), entity->GetDoorName(), @@ -234,7 +234,7 @@ void command_list(Client *c, const Seperator *sep) c->Message( 0, "| %s | Entity ID %5d | Object DBID %i | %s | x %.0f | y %0.f | z %.0f", - EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Goto").c_str(), + Saylink::Create(saylink, false, "Goto").c_str(), entity->GetID(), entity->GetDBID(), entity->GetModelName(), diff --git a/zone/gm_commands/logs.cpp b/zone/gm_commands/logs.cpp index a7a53f203..37e807d93 100755 --- a/zone/gm_commands/logs.cpp +++ b/zone/gm_commands/logs.cpp @@ -115,7 +115,7 @@ void command_logs(Client *c, const Seperator *sep) next_category_id ); - auto next_list_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto next_list_link = Saylink::Create( next_list_string, false, next_list_string diff --git a/zone/gm_commands/movechar.cpp b/zone/gm_commands/movechar.cpp index cec371b83..83e72cc37 100755 --- a/zone/gm_commands/movechar.cpp +++ b/zone/gm_commands/movechar.cpp @@ -7,7 +7,7 @@ void command_movechar(Client *c, const Seperator *sep) c->Message(Chat::White, "Usage: #movechar [Character ID|Character Name] [Zone ID|Zone Short Name]"); return; } - + std::string character_name = ( sep->IsNumber(1) ? database.GetCharNameByID(std::stoul(sep->arg[1])) : @@ -27,7 +27,7 @@ void command_movechar(Client *c, const Seperator *sep) auto account_id = database.GetAccountIDByChar(character_name.c_str()); - std::string zone_short_name = str_tolower( + std::string zone_short_name = Strings::ToLower( sep->IsNumber(2) ? ZoneName(std::stoul(sep->arg[2]), true) : sep->arg[2] diff --git a/zone/gm_commands/mysql.cpp b/zone/gm_commands/mysql.cpp index 3c2bb8724..38cb60430 100755 --- a/zone/gm_commands/mysql.cpp +++ b/zone/gm_commands/mysql.cpp @@ -17,7 +17,7 @@ void command_mysql(Client *c, const Seperator *sep) c->Message(Chat::White, "Usage: #mysql [Help|Query] [SQL Query]"); return; } - + if (is_help) { c->Message(Chat::White, "Usage: #mysql query \"Query goes here quoted\""); c->Message(Chat::White, "Note: To use 'LIKE \"%%something%%\" replace the %% with a #"); @@ -32,14 +32,14 @@ void command_mysql(Client *c, const Seperator *sep) } std::string query = sep->arg[2]; - find_replace(query, "#", "%"); + Strings::FindReplace(query, "#", "%"); auto results = database.QueryDatabase(query); if (!results.Success()) { return; } - query = sep->arg[2]; - find_replace(query, "#", "%%"); + query = sep->arg[2]; + Strings::FindReplace(query, "#", "%%"); c->Message( Chat::White, diff --git a/zone/gm_commands/npcedit.cpp b/zone/gm_commands/npcedit.cpp index b49cd11de..a980b3844 100755 --- a/zone/gm_commands/npcedit.cpp +++ b/zone/gm_commands/npcedit.cpp @@ -178,7 +178,7 @@ void command_npcedit(Client *c, const Seperator *sep) uint32 npc_id = c->GetTarget()->CastToNPC()->GetNPCTypeID(); auto npc_id_string = fmt::format( "NPC ID {}", - commify(std::to_string(npc_id)) + Strings::Commify(std::to_string(npc_id)) ); if (!strcasecmp(sep->arg[1], "name")) { @@ -318,7 +318,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Health.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -339,7 +339,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Mana.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -466,7 +466,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now regenerates {} Health per Tick.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -487,7 +487,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now regenerates {} HP per Second.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -508,7 +508,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now regenerates {} Mana per Tick.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -529,7 +529,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} is now using Loottable ID {}.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -550,7 +550,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} is now using Merchant ID {}.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -601,7 +601,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} is now using Spell List ID {}.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -622,7 +622,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} is now using Spells Effects ID {}.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -651,7 +651,7 @@ void command_npcedit(Client *c, const Seperator *sep) faction_name, faction_id ) : - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ) ).c_str() ); @@ -673,7 +673,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} is now using Adventure Template ID {}.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -694,7 +694,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} is now using Trap Template ID {}.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -716,8 +716,8 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now hits from {} to {} damage.", npc_id_string, - commify(sep->arg[2]), - commify(sep->arg[3]) + Strings::Commify(sep->arg[2]), + Strings::Commify(sep->arg[3]) ).c_str() ); auto query = fmt::format( @@ -794,7 +794,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has an Aggro Radius of {}.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -815,7 +815,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has an Assist Radius of {}", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -873,7 +873,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} is now using Armor Tint ID {}.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -921,7 +921,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} is now using Ammo ID File {}.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -943,8 +943,8 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} will have Model {} set to their Primary and Model {} set to their Secondary on repop.", npc_id_string, - commify(sep->arg[2]), - sep->IsNumber(3) ? commify(sep->arg[3]) : 0 + Strings::Commify(sep->arg[2]), + sep->IsNumber(3) ? Strings::Commify(sep->arg[3]) : 0 ).c_str() ); auto query = fmt::format( @@ -1414,7 +1414,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Strength.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -1435,7 +1435,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Stamina.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -1456,7 +1456,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Agility.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -1477,7 +1477,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Dexterity.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -1498,7 +1498,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Intelligence.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -1519,7 +1519,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Wisdom.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -1540,7 +1540,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Charisma.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -1630,7 +1630,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Attack.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -1651,7 +1651,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Accuracy.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -1672,7 +1672,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Avoidance.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -1693,7 +1693,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Slow Mitigation.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -1756,7 +1756,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has a Scaling Rate of {}%%.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -1777,7 +1777,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has a Spell Scaling Rate of {}%%.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -1801,7 +1801,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has a Heal Scaling Rate of {}%%.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -2044,7 +2044,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Armor Class while Charmed.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -2065,7 +2065,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now does {} Minimum Damage while Charmed.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -2086,7 +2086,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now does {} Maximum Damage while Charmed.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -2126,7 +2126,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Accuracy Rating while Charmed.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -2147,7 +2147,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Avoidance Rating while Charmed.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -2168,7 +2168,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has {} Attack while Charmed.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -2226,7 +2226,7 @@ void command_npcedit(Client *c, const Seperator *sep) c->Message( Chat::White, "Usage: #npcedit rarespawn [Flag] - Sets an NPC's Rare Spawn Flag [0 = Not a Rare Spawn, 1 = Rare Spawn]" - ); + ); } return; } else if (!strcasecmp(sep->arg[1], "stuck_behavior")) { @@ -2335,7 +2335,7 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has an Experience Modifier of {}%%.", npc_id_string, - commify(sep->arg[2]) + Strings::Commify(sep->arg[2]) ).c_str() ); auto query = fmt::format( @@ -2373,7 +2373,7 @@ void command_npcedit(Client *c, const Seperator *sep) ) : std::to_string(animation_id) ), - commify(std::to_string(c->GetTarget()->CastToNPC()->GetSpawnGroupId())) + Strings::Commify(std::to_string(c->GetTarget()->CastToNPC()->GetSpawnGroupId())) ).c_str() ); auto query = fmt::format( @@ -2397,9 +2397,9 @@ void command_npcedit(Client *c, const Seperator *sep) fmt::format( "{} now has a Respawn Timer of {} ({}) on Spawn Group ID {}.", npc_id_string, - ConvertSecondsToTime(respawn_time), + Strings::SecondsToTime(respawn_time), respawn_time, - commify(std::to_string(c->GetTarget()->CastToNPC()->GetSpawnGroupId())) + Strings::Commify(std::to_string(c->GetTarget()->CastToNPC()->GetSpawnGroupId())) ).c_str() ); auto query = fmt::format( diff --git a/zone/gm_commands/npceditmass.cpp b/zone/gm_commands/npceditmass.cpp index c76f209e0..e932c41ec 100755 --- a/zone/gm_commands/npceditmass.cpp +++ b/zone/gm_commands/npceditmass.cpp @@ -72,7 +72,7 @@ void command_npceditmass(Client *c, const Seperator *sep) Chat::Yellow, fmt::format( "Possible columns [{}]", - implode(options_glue, possible_column_options) + Strings::Implode(options_glue, possible_column_options) ).c_str() ); return; @@ -91,7 +91,7 @@ void command_npceditmass(Client *c, const Seperator *sep) Chat::Yellow, fmt::format( "Possible columns [{}]", - implode(options_glue, possible_column_options) + Strings::Implode(options_glue, possible_column_options) ).c_str() ); return; @@ -139,7 +139,7 @@ void command_npceditmass(Client *c, const Seperator *sep) for (auto row : results) { std::string npc_id = row[0]; std::string npc_name = row[1]; - std::string search_column_value = str_tolower(row[2]); + std::string search_column_value = Strings::ToLower(row[2]); std::string change_column_current_value = row[3]; if (exact_match) { @@ -183,7 +183,7 @@ void command_npceditmass(Client *c, const Seperator *sep) ); if (strcasecmp(sep->arg[5], "apply") == 0) { - std::string npc_ids_string = implode(",", npc_ids); + std::string npc_ids_string = Strings::Implode(",", npc_ids); if (npc_ids_string.empty()) { c->Message(Chat::Red, "Error: Ran into an unknown error compiling NPC IDs"); return; @@ -223,7 +223,7 @@ void command_npceditmass(Client *c, const Seperator *sep) Chat::Yellow, fmt::format( "Would you like to {} these changes?", - EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "apply") + Saylink::Create(saylink, false, "apply") ).c_str() ); diff --git a/zone/gm_commands/npcloot.cpp b/zone/gm_commands/npcloot.cpp index 30ff7da4a..a3c50854f 100755 --- a/zone/gm_commands/npcloot.cpp +++ b/zone/gm_commands/npcloot.cpp @@ -8,7 +8,7 @@ void command_npcloot(Client *c, const Seperator *sep) c->Message(Chat::White, "You must target an NPC or a Corpse to use this command."); return; } - + int arguments = sep->argnum; if (!arguments) { c->Message(Chat::White, "Usage: #npcloot add [Item ID] [Charges] [Equip] [Augment 1 ID] [Augment 2 ID] [Augment 3 ID] [Augment 4 ID] [Augment 5 ID] [Augment 6 ID] - Adds the specified item to an NPC's loot"); @@ -132,12 +132,12 @@ void command_npcloot(Client *c, const Seperator *sep) gold || platinum ) ? - ConvertMoneyToString( - platinum, - gold, - silver, - copper - ) : + Strings::Money( + platinum, + gold, + silver, + copper + ) : "no money" ); diff --git a/zone/gm_commands/nudge.cpp b/zone/gm_commands/nudge.cpp index f396a4802..920a7cc07 100755 --- a/zone/gm_commands/nudge.cpp +++ b/zone/gm_commands/nudge.cpp @@ -9,7 +9,7 @@ void command_nudge(Client *c, const Seperator *sep) Chat::White, fmt::format( "Note: Partial or mixed arguments allowed, example {}.", - EQ::SayLinkEngine::GenerateQuestSaylink( + Saylink::Create( "#nudge x=5.0", false, "#nudge x=5.0" diff --git a/zone/gm_commands/nukebuffs.cpp b/zone/gm_commands/nukebuffs.cpp index c28504755..27db600fb 100755 --- a/zone/gm_commands/nukebuffs.cpp +++ b/zone/gm_commands/nukebuffs.cpp @@ -1,13 +1,13 @@ #include "../client.h" void command_nukebuffs(Client *c, const Seperator *sep) -{ +{ Mob* target = c; if (c->GetTarget()) { target = c->GetTarget(); } - std::string buff_identifier = str_tolower(sep->arg[1]); + std::string buff_identifier = Strings::ToLower(sep->arg[1]); std::string buff_type; bool is_beneficial = buff_identifier.find("beneficial") != std::string::npos; bool is_detrimental = buff_identifier.find("detrimental") != std::string::npos; diff --git a/zone/gm_commands/peqzone.cpp b/zone/gm_commands/peqzone.cpp index 9dfb31651..cf4d66c4f 100755 --- a/zone/gm_commands/peqzone.cpp +++ b/zone/gm_commands/peqzone.cpp @@ -16,7 +16,7 @@ void command_peqzone(Client *c, const Seperator *sep) Chat::White, fmt::format( "You must wait {} before using this command again.", - ConvertSecondsToTime(time_left) + Strings::SecondsToTime(time_left) ).c_str() ); return; diff --git a/zone/gm_commands/qglobal.cpp b/zone/gm_commands/qglobal.cpp index 301ef4a84..0f38edd78 100755 --- a/zone/gm_commands/qglobal.cpp +++ b/zone/gm_commands/qglobal.cpp @@ -29,7 +29,7 @@ void command_qglobal(Client *c, const Seperator *sep) c->Message(Chat::White, "Usage: #qglobal on - Enables target NPC's ability to view quest globals"); c->Message(Chat::White, "Usage: #qglobal off - Disables target NPC's ability to view quest globals"); c->Message(Chat::White, "Usage: #qglobal view - View target NPC's ability to view quest globals"); - return; + return; } if (is_off) { @@ -50,7 +50,7 @@ void command_qglobal(Client *c, const Seperator *sep) return; } - auto repop_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto repop_link = Saylink::Create( "#repop", false, "repop" @@ -83,7 +83,7 @@ void command_qglobal(Client *c, const Seperator *sep) return; } - auto repop_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto repop_link = Saylink::Create( "#repop", false, "repop" diff --git a/zone/gm_commands/raidloot.cpp b/zone/gm_commands/raidloot.cpp index 9dfb1c21c..b75eb43c2 100755 --- a/zone/gm_commands/raidloot.cpp +++ b/zone/gm_commands/raidloot.cpp @@ -22,7 +22,7 @@ void command_raidloot(Client *c, const Seperator *sep) return; } - std::string raid_loot_type = str_tolower(sep->arg[1]); + std::string raid_loot_type = Strings::ToLower(sep->arg[1]); bool is_all = raid_loot_type.find("all") != std::string::npos; bool is_group_leader = raid_loot_type.find("groupleader") != std::string::npos; bool is_raid_leader = raid_loot_type.find("raidleader") != std::string::npos; diff --git a/zone/gm_commands/roambox.cpp b/zone/gm_commands/roambox.cpp index e3056c223..1955fb09c 100755 --- a/zone/gm_commands/roambox.cpp +++ b/zone/gm_commands/roambox.cpp @@ -91,7 +91,7 @@ void command_roambox(Client *c, const Seperator *sep) box_size, c->GetTargetDescription(target), spawn_group_id, - ConvertMillisecondsToTime(delay), + Strings::MillisecondsToTime(delay), delay ).c_str() ); diff --git a/zone/gm_commands/scale.cpp b/zone/gm_commands/scale.cpp index d260a25e4..4e4c0cc70 100755 --- a/zone/gm_commands/scale.cpp +++ b/zone/gm_commands/scale.cpp @@ -127,7 +127,7 @@ void command_scale(Client *c, const Seperator *sep) c->Message(Chat::Yellow, "Found (%i) NPC's that match this search...", found_count); c->Message( Chat::Yellow, "To apply these changes, click <%s> or type %s", - EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(), + Saylink::Create(saylink, false, "Apply").c_str(), saylink.c_str() ); } diff --git a/zone/gm_commands/serverinfo.cpp b/zone/gm_commands/serverinfo.cpp index 7ca20e26b..ff78c677e 100755 --- a/zone/gm_commands/serverinfo.cpp +++ b/zone/gm_commands/serverinfo.cpp @@ -46,7 +46,7 @@ void command_serverinfo(Client *c, const Seperator *sep) popup_text.append( fmt::format( "", - ConvertSecondsToTime(uptime) + Strings::SecondsToTime(uptime) ) ); diff --git a/zone/gm_commands/setaapts.cpp b/zone/gm_commands/setaapts.cpp index f47745a4a..c1c730a5f 100755 --- a/zone/gm_commands/setaapts.cpp +++ b/zone/gm_commands/setaapts.cpp @@ -16,7 +16,7 @@ void command_setaapts(Client *c, const Seperator *sep) target = c->GetTarget()->CastToClient(); } - std::string aa_type = str_tolower(sep->arg[1]); + std::string aa_type = Strings::ToLower(sep->arg[1]); std::string group_raid_string; uint32 aa_points = static_cast(std::min(std::stoull(sep->arg[2]), (unsigned long long) 2000000000)); bool is_aa = aa_type.find("aa") != std::string::npos; diff --git a/zone/gm_commands/setaaxp.cpp b/zone/gm_commands/setaaxp.cpp index 57b57cf76..12339c3ed 100755 --- a/zone/gm_commands/setaaxp.cpp +++ b/zone/gm_commands/setaaxp.cpp @@ -16,7 +16,7 @@ void command_setaaxp(Client *c, const Seperator *sep) target = c->GetTarget()->CastToClient(); } - std::string aa_type = str_tolower(sep->arg[1]); + std::string aa_type = Strings::ToLower(sep->arg[1]); std::string group_raid_string; uint32 aa_experience = static_cast(std::min( std::stoull(sep->arg[2]), diff --git a/zone/gm_commands/setcrystals.cpp b/zone/gm_commands/setcrystals.cpp index fd3306acd..95a537e9a 100755 --- a/zone/gm_commands/setcrystals.cpp +++ b/zone/gm_commands/setcrystals.cpp @@ -13,7 +13,7 @@ void command_setcrystals(Client *c, const Seperator *sep) target = c->GetTarget()->CastToClient(); } - std::string crystal_type = str_tolower(sep->arg[1]); + std::string crystal_type = Strings::ToLower(sep->arg[1]); uint32 crystal_amount = static_cast(std::min( std::stoull(sep->arg[2]), (unsigned long long) 2000000000 diff --git a/zone/gm_commands/showskills.cpp b/zone/gm_commands/showskills.cpp index 68c1c92e3..6e957fde1 100755 --- a/zone/gm_commands/showskills.cpp +++ b/zone/gm_commands/showskills.cpp @@ -55,7 +55,7 @@ void command_showskills(Client *c, const Seperator *sep) popup_title.c_str(), popup_text.c_str() ); - + c->Message( Chat::White, @@ -76,7 +76,7 @@ void command_showskills(Client *c, const Seperator *sep) next_skill_id ); - auto next_list_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto next_list_link = Saylink::Create( next_list_string, false, next_list_string @@ -87,7 +87,7 @@ void command_showskills(Client *c, const Seperator *sep) next_skill_id ); - auto next_list_all_link = EQ::SayLinkEngine::GenerateQuestSaylink( + auto next_list_all_link = Saylink::Create( next_list_all_string, false, next_list_all_string diff --git a/zone/gm_commands/spawneditmass.cpp b/zone/gm_commands/spawneditmass.cpp index b8ac208af..f9b15764d 100644 --- a/zone/gm_commands/spawneditmass.cpp +++ b/zone/gm_commands/spawneditmass.cpp @@ -63,11 +63,11 @@ void command_spawneditmass(Client *c, const Seperator *sep) Chat::Yellow, fmt::format( "Spawn2 ID: {} NPC ID: {} Name: {} Respawn Time: {} ({})", - commify(spawn2_id), - commify(npc_id), + Strings::Commify(spawn2_id), + Strings::Commify(npc_id), npc_name, - ConvertSecondsToTime(std::stoi(respawn_time)), - commify(respawn_time) + Strings::SecondsToTime(std::stoi(respawn_time)), + Strings::Commify(respawn_time) ).c_str() ); @@ -94,7 +94,7 @@ void command_spawneditmass(Client *c, const Seperator *sep) search_criteria ).c_str() ); - + if (!is_apply) { auto edit_link = fmt::format( "#spawneditmass {} {} {} apply", @@ -107,14 +107,14 @@ void command_spawneditmass(Client *c, const Seperator *sep) Chat::Yellow, fmt::format( "To apply these changes, click {} or type \"{}\".", - EQ::SayLinkEngine::GenerateQuestSaylink(edit_link, false, "apply"), + Saylink::Create(edit_link, false, "apply"), edit_link ).c_str() ); } if (edit_option == "respawn_time" && is_apply) { - auto spawn2_ids_string = implode(", ", spawn2_ids); + auto spawn2_ids_string = Strings::Implode(", ", spawn2_ids); if (spawn2_ids_string.empty()) { c->Message( Chat::Yellow, @@ -144,5 +144,5 @@ void command_spawneditmass(Client *c, const Seperator *sep) spawn2_ids.size() != 1 ? "s" : "" ).c_str() ); - } + } } diff --git a/zone/gm_commands/spawnstatus.cpp b/zone/gm_commands/spawnstatus.cpp index 6c90fb353..ed465899c 100755 --- a/zone/gm_commands/spawnstatus.cpp +++ b/zone/gm_commands/spawnstatus.cpp @@ -36,7 +36,7 @@ void command_spawnstatus(Client *c, const Seperator *sep) filter_type = "Enabled"; } - uint32 spawn_id = 0; + uint32 spawn_id = 0; if (is_search) { spawn_id = std::stoul(sep->arg[1]); } @@ -84,7 +84,7 @@ void command_spawnstatus(Client *c, const Seperator *sep) fmt::format( "Spawn {} | Respawn: {} ({} Second{})", spawn_number, - ConvertSecondsToTime(seconds_remaining), + Strings::SecondsToTime(seconds_remaining), seconds_remaining, seconds_remaining != 1 ? "s" : "" ).c_str() @@ -112,7 +112,7 @@ void command_spawnstatus(Client *c, const Seperator *sep) ); return; } - + if (is_all) { c->Message( Chat::White, diff --git a/zone/gm_commands/stun.cpp b/zone/gm_commands/stun.cpp index cf8cd8a97..8468aad60 100755 --- a/zone/gm_commands/stun.cpp +++ b/zone/gm_commands/stun.cpp @@ -31,7 +31,7 @@ void command_stun(Client *c, const Seperator *sep) fmt::format( "You stunned {} for {}.", c->GetTargetDescription(target), - ConvertMillisecondsToTime(duration) + Strings::MillisecondsToTime(duration) ) : fmt::format( "You unstunned {}.", diff --git a/zone/gm_commands/suspend.cpp b/zone/gm_commands/suspend.cpp index 49721507e..0e24da971 100755 --- a/zone/gm_commands/suspend.cpp +++ b/zone/gm_commands/suspend.cpp @@ -58,7 +58,7 @@ void command_suspend(Client *c, const Seperator *sep) std::string query = StringFormat( "UPDATE `account` SET `suspendeduntil` = DATE_ADD(NOW(), INTERVAL %i DAY), " "suspend_reason = '%s' WHERE `id` = %i", - duration, EscapeString(message).c_str(), accountID + duration, Strings::Escape(message).c_str(), accountID ); auto results = database.QueryDatabase(query); diff --git a/zone/gm_commands/task.cpp b/zone/gm_commands/task.cpp index 9f6077fca..54573548e 100755 --- a/zone/gm_commands/task.cpp +++ b/zone/gm_commands/task.cpp @@ -18,7 +18,7 @@ void command_task(Client *c, const Seperator *sep) Chat::White, fmt::format( "--- [{}] List active tasks for a client", - EQ::SayLinkEngine::GenerateQuestSaylink("#task show", false, "show") + Saylink::Create("#task show", false, "show") ).c_str() ); c->Message(Chat::White, "--- update [count] | Updates task"); @@ -28,42 +28,42 @@ void command_task(Client *c, const Seperator *sep) Chat::White, fmt::format( "--- [{}] Reload all Task information from the database", - EQ::SayLinkEngine::GenerateQuestSaylink("#task reloadall", false, "reloadall") + Saylink::Create("#task reloadall", false, "reloadall") ).c_str() ); c->Message( Chat::White, fmt::format( "--- [{}] Reload Task and Activity information for a single task", - EQ::SayLinkEngine::GenerateQuestSaylink("#task reload task", false, "reload task") + Saylink::Create("#task reload task", false, "reload task") ).c_str() ); c->Message( Chat::White, fmt::format( "--- [{}] Reload goal/reward list information", - EQ::SayLinkEngine::GenerateQuestSaylink("#task reload lists", false, "reload lists") + Saylink::Create("#task reload lists", false, "reload lists") ).c_str() ); c->Message( Chat::White, fmt::format( "--- [{}] Reload proximity information", - EQ::SayLinkEngine::GenerateQuestSaylink("#task reload prox", false, "reload prox") + Saylink::Create("#task reload prox", false, "reload prox") ).c_str() ); c->Message( Chat::White, fmt::format( "--- [{}] Reload task set information", - EQ::SayLinkEngine::GenerateQuestSaylink("#task reload sets", false, "reload sets") + Saylink::Create("#task reload sets", false, "reload sets") ).c_str() ); c->Message( Chat::White, fmt::format( "--- [{}] Purges targeted characters task timers", - EQ::SayLinkEngine::GenerateQuestSaylink("#task purgetimers", false, "purgetimers") + Saylink::Create("#task purgetimers", false, "purgetimers") ).c_str() ); @@ -74,7 +74,7 @@ void command_task(Client *c, const Seperator *sep) Chat::White, fmt::format( "--- [{}] Purges all active Shared Tasks in memory and database ", - EQ::SayLinkEngine::GenerateQuestSaylink("#task sharedpurge", false, "sharedpurge") + Saylink::Create("#task sharedpurge", false, "sharedpurge") ).c_str() ); return; @@ -112,7 +112,7 @@ void command_task(Client *c, const Seperator *sep) Chat::White, fmt::format( "--- [{}] List active tasks for a client", - EQ::SayLinkEngine::GenerateQuestSaylink("#task show", false, "show") + Saylink::Create("#task show", false, "show") ).c_str() ); c->Message(Chat::White, "--- update [count] | Updates task"); @@ -122,42 +122,42 @@ void command_task(Client *c, const Seperator *sep) Chat::White, fmt::format( "--- [{}] Reload all Task information from the database", - EQ::SayLinkEngine::GenerateQuestSaylink("#task reloadall", false, "reloadall") + Saylink::Create("#task reloadall", false, "reloadall") ).c_str() ); c->Message( Chat::White, fmt::format( "--- [{}] Reload Task and Activity information for a single task", - EQ::SayLinkEngine::GenerateQuestSaylink("#task reload task", false, "reload task") + Saylink::Create("#task reload task", false, "reload task") ).c_str() ); c->Message( Chat::White, fmt::format( "--- [{}] Reload goal/reward list information", - EQ::SayLinkEngine::GenerateQuestSaylink("#task reload lists", false, "reload lists") + Saylink::Create("#task reload lists", false, "reload lists") ).c_str() ); c->Message( Chat::White, fmt::format( "--- [{}] Reload proximity information", - EQ::SayLinkEngine::GenerateQuestSaylink("#task reload prox", false, "reload prox") + Saylink::Create("#task reload prox", false, "reload prox") ).c_str() ); c->Message( Chat::White, fmt::format( "--- [{}] Reload task set information", - EQ::SayLinkEngine::GenerateQuestSaylink("#task reload sets", false, "reload sets") + Saylink::Create("#task reload sets", false, "reload sets") ).c_str() ); c->Message( Chat::White, fmt::format( "--- [{}] Purges targeted characters task timers", - EQ::SayLinkEngine::GenerateQuestSaylink("#task purgetimers", false, "purgetimers") + Saylink::Create("#task purgetimers", false, "purgetimers") ).c_str() ); @@ -168,7 +168,7 @@ void command_task(Client *c, const Seperator *sep) Chat::White, fmt::format( "--- [{}] Purges all active Shared Tasks in memory and database ", - EQ::SayLinkEngine::GenerateQuestSaylink("#task sharedpurge", false, "sharedpurge") + Saylink::Create("#task sharedpurge", false, "sharedpurge") ).c_str() ); return; @@ -260,7 +260,7 @@ void command_task(Client *c, const Seperator *sep) Chat::White, fmt::format( "[WARNING] This will purge all active Shared Tasks [{}]?", - EQ::SayLinkEngine::GenerateQuestSaylink("#task sharedpurge confirm", false, "confirm") + Saylink::Create("#task sharedpurge confirm", false, "confirm") ).c_str() ); @@ -278,7 +278,7 @@ void command_task(Client *c, const Seperator *sep) if ( CompletedTasksRepository::DeleteWhere( - database, + database, fmt::format( "charid = {} AND taskid = {}", target->CharacterID(), diff --git a/zone/gm_commands/timers.cpp b/zone/gm_commands/timers.cpp index 6f66feeae..daeef1d20 100755 --- a/zone/gm_commands/timers.cpp +++ b/zone/gm_commands/timers.cpp @@ -25,7 +25,7 @@ void command_timers(Client *c, const Seperator *sep) popup_text += fmt::format( "", timer.first, - ConvertSecondsToTime(remaining_time) + Strings::SecondsToTime(remaining_time) ); } } diff --git a/zone/gm_commands/title.cpp b/zone/gm_commands/title.cpp index 669cf28b9..653355608 100755 --- a/zone/gm_commands/title.cpp +++ b/zone/gm_commands/title.cpp @@ -8,10 +8,10 @@ void command_title(Client *c, const Seperator *sep) c->Message(Chat::White, "Usage: #title [Title] (use \"-1\" to remove title)"); return; } - + bool is_remove = !strcasecmp(sep->argplus[1], "-1"); std::string title = is_remove ? "" : sep->argplus[1]; - + auto target = c; if (c->GetTarget() && c->GetTarget()->IsClient()) { target = c->GetTarget()->CastToClient(); @@ -23,7 +23,7 @@ void command_title(Client *c, const Seperator *sep) } if (!title.empty()) { - find_replace(title, "_", " "); + Strings::FindReplace(title, "_", " "); } if (is_remove) { diff --git a/zone/gm_commands/titlesuffix.cpp b/zone/gm_commands/titlesuffix.cpp index eefa6614f..cc5581d96 100755 --- a/zone/gm_commands/titlesuffix.cpp +++ b/zone/gm_commands/titlesuffix.cpp @@ -11,10 +11,10 @@ void command_titlesuffix(Client *c, const Seperator *sep) ); return; } - + bool is_remove = !strcasecmp(sep->argplus[1], "-1"); std::string suffix = is_remove ? "" : sep->argplus[1]; - + auto target = c; if (c->GetTarget() && c->GetTarget()->IsClient()) { target = c->GetTarget()->CastToClient(); @@ -26,7 +26,7 @@ void command_titlesuffix(Client *c, const Seperator *sep) } if (!suffix.empty()) { - find_replace(suffix, "_", " "); + Strings::FindReplace(suffix, "_", " "); } if (is_remove) { diff --git a/zone/gm_commands/viewcurrencies.cpp b/zone/gm_commands/viewcurrencies.cpp index b665a5d14..a19c72ffe 100644 --- a/zone/gm_commands/viewcurrencies.cpp +++ b/zone/gm_commands/viewcurrencies.cpp @@ -1,7 +1,7 @@ #include "../client.h" void command_viewcurrencies(Client *c, const Seperator *sep) -{ +{ Client *target = c; if (c->GetTarget() && c->GetTarget()->IsClient()) { target = c->GetTarget()->CastToClient(); @@ -13,19 +13,19 @@ void command_viewcurrencies(Client *c, const Seperator *sep) target->GetMoney(3, 2) + target->GetMoney(3, 3) ); - + auto gold = ( target->GetMoney(2, 0) + target->GetMoney(2, 1) + target->GetMoney(2, 2) ); - + auto silver = ( target->GetMoney(1, 0) + target->GetMoney(1, 1) + target->GetMoney(1, 2) ); - + auto copper = ( target->GetMoney(0, 0) + target->GetMoney(0, 1) + @@ -43,7 +43,7 @@ void command_viewcurrencies(Client *c, const Seperator *sep) fmt::format( "Money for {} | {}", c->GetTargetDescription(target, TargetDescriptionType::UCSelf), - ConvertMoneyToString( + Strings::Money( platinum, gold, silver, diff --git a/zone/gm_commands/viewzoneloot.cpp b/zone/gm_commands/viewzoneloot.cpp index 89518750a..3589f7765 100755 --- a/zone/gm_commands/viewzoneloot.cpp +++ b/zone/gm_commands/viewzoneloot.cpp @@ -30,7 +30,7 @@ void command_viewzoneloot(Client *c, const Seperator *sep) std::string npc_name = current_npc->GetCleanName(); uint32 instance_id = zone->GetInstanceID(); uint32 zone_id = zone->GetZoneID(); - std::string command_link = EQ::SayLinkEngine::GenerateQuestSaylink( + std::string command_link = Saylink::Create( fmt::format( "#{} {} {} {} {}", (instance_id != 0 ? "zoneinstance" : "zone"), diff --git a/zone/gm_commands/who.cpp b/zone/gm_commands/who.cpp index 43077573e..581d47caf 100755 --- a/zone/gm_commands/who.cpp +++ b/zone/gm_commands/who.cpp @@ -55,7 +55,7 @@ void command_who(Client *c, const Seperator *sep) std::string search_string; if (sep->arg[1]) { - search_string = str_tolower(sep->arg[1]); + search_string = Strings::ToLower(sep->arg[1]); } int found_count = 0; @@ -82,13 +82,13 @@ void command_who(Client *c, const Seperator *sep) if (search_string.length()) { bool found_search_term = ( - str_tolower(player_name).find(search_string) != std::string::npos || - str_tolower(zone_short_name).find(search_string) != std::string::npos || - str_tolower(displayed_race_name).find(search_string) != std::string::npos || - str_tolower(base_class_name).find(search_string) != std::string::npos || - str_tolower(guild_name).find(search_string) != std::string::npos || - str_tolower(account_name).find(search_string) != std::string::npos || - str_tolower(account_ip).find(search_string) != std::string::npos + Strings::ToLower(player_name).find(search_string) != std::string::npos || + Strings::ToLower(zone_short_name).find(search_string) != std::string::npos || + Strings::ToLower(displayed_race_name).find(search_string) != std::string::npos || + Strings::ToLower(base_class_name).find(search_string) != std::string::npos || + Strings::ToLower(guild_name).find(search_string) != std::string::npos || + Strings::ToLower(account_name).find(search_string) != std::string::npos || + Strings::ToLower(account_ip).find(search_string) != std::string::npos ); if (!found_search_term) { @@ -98,7 +98,7 @@ void command_who(Client *c, const Seperator *sep) std::string displayed_guild_name; if (guild_name.length()) { - displayed_guild_name = EQ::SayLinkEngine::GenerateQuestSaylink( + displayed_guild_name = Saylink::Create( fmt::format( "#who \"{}\"", guild_name @@ -111,7 +111,7 @@ void command_who(Client *c, const Seperator *sep) ); } - auto goto_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( + auto goto_saylink = Saylink::Create( fmt::format( "#goto {}", player_name @@ -120,7 +120,7 @@ void command_who(Client *c, const Seperator *sep) "Goto" ); - auto summon_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( + auto summon_saylink = Saylink::Create( fmt::format( "#summon {}", player_name @@ -134,7 +134,7 @@ void command_who(Client *c, const Seperator *sep) static_cast(player_level) ); - auto class_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( + auto class_saylink = Saylink::Create( fmt::format( "#who {}", base_class_name @@ -143,7 +143,7 @@ void command_who(Client *c, const Seperator *sep) display_class_name ); - auto race_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( + auto race_saylink = Saylink::Create( fmt::format( "#who %s", displayed_race_name @@ -152,7 +152,7 @@ void command_who(Client *c, const Seperator *sep) displayed_race_name ); - auto zone_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( + auto zone_saylink = Saylink::Create( fmt::format( "#who {}", zone_short_name @@ -161,7 +161,7 @@ void command_who(Client *c, const Seperator *sep) zone_long_name ); - auto account_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( + auto account_saylink = Saylink::Create( fmt::format( "#who {}", account_name @@ -170,7 +170,7 @@ void command_who(Client *c, const Seperator *sep) account_name ); - auto account_ip_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( + auto account_ip_saylink = Saylink::Create( fmt::format( "#who {}", account_ip diff --git a/zone/gm_commands/zone.cpp b/zone/gm_commands/zone.cpp index b2dea5e80..ee15e7f9a 100644 --- a/zone/gm_commands/zone.cpp +++ b/zone/gm_commands/zone.cpp @@ -10,7 +10,7 @@ void command_zone(Client *c, const Seperator *sep) std::string zone_identifier = sep->arg[1]; - if (StringIsNumber(zone_identifier) && zone_identifier == "0") { + if (Strings::IsNumber(zone_identifier) && zone_identifier == "0") { c->Message(Chat::White, "Sending you to the safe coordinates of this zone."); c->MovePC( diff --git a/zone/gm_commands/zonelock.cpp b/zone/gm_commands/zonelock.cpp index f89f1e9ad..3e86a1115 100755 --- a/zone/gm_commands/zonelock.cpp +++ b/zone/gm_commands/zonelock.cpp @@ -21,7 +21,7 @@ void command_zonelock(Client *c, const Seperator *sep) return; } - std::string lock_type = str_tolower(sep->arg[1]); + std::string lock_type = Strings::ToLower(sep->arg[1]); bool is_list = lock_type.find("list") != std::string::npos; bool is_lock = lock_type.find("lock") != std::string::npos; bool is_unlock = lock_type.find("unlock") != std::string::npos; @@ -54,7 +54,7 @@ void command_zonelock(Client *c, const Seperator *sep) static_cast(std::stoul(sep->arg[2])) : static_cast(ZoneID(sep->arg[2])) ); - std::string zone_short_name = str_tolower(ZoneName(zone_id, true)); + std::string zone_short_name = Strings::ToLower(ZoneName(zone_id, true)); bool is_unknown_zone = zone_short_name.find("unknown") != std::string::npos; if (zone_id && !is_unknown_zone) { lock_zone->op = is_lock ? ServerLockType::Lock : ServerLockType::Unlock; diff --git a/zone/groups.cpp b/zone/groups.cpp index a93977aa3..47b440160 100644 --- a/zone/groups.cpp +++ b/zone/groups.cpp @@ -23,7 +23,7 @@ #include "npc_ai.h" #include "../common/packet_functions.h" #include "../common/packet_dump.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "worldserver.h" #include "string_ids.h" @@ -180,7 +180,7 @@ void Group::SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinu members[i]->CastToClient()->MessageString( Chat::MoneySplit, YOU_RECEIVE_AS_SPLIT, - ConvertMoneyToString( + Strings::Money( platinum_split, gold_split, silver_split, diff --git a/zone/guild.cpp b/zone/guild.cpp index 4de3b00ad..82790811e 100644 --- a/zone/guild.cpp +++ b/zone/guild.cpp @@ -18,7 +18,7 @@ #include "../common/database.h" #include "../common/guilds.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "guild_mgr.h" #include "worldserver.h" diff --git a/zone/guild_mgr.cpp b/zone/guild_mgr.cpp index f17bf499b..146651acf 100644 --- a/zone/guild_mgr.cpp +++ b/zone/guild_mgr.cpp @@ -17,7 +17,7 @@ */ #include "../common/servertalk.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "client.h" #include "entity.h" diff --git a/zone/horse.cpp b/zone/horse.cpp index ba1a4f283..43c04202f 100644 --- a/zone/horse.cpp +++ b/zone/horse.cpp @@ -19,7 +19,7 @@ #include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/linked_list.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "client.h" #include "entity.h" diff --git a/zone/inventory.cpp b/zone/inventory.cpp index 1eab314ec..7fe8a7789 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -19,7 +19,7 @@ #include "../common/global_define.h" #include "../common/eqemu_logsys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "quest_parser_collection.h" #include "worldserver.h" #include "zonedb.h" diff --git a/zone/loottables.cpp b/zone/loottables.cpp index e3517dfbd..957889874 100644 --- a/zone/loottables.cpp +++ b/zone/loottables.cpp @@ -652,7 +652,7 @@ void ZoneDatabase::LoadGlobalLoot() for (auto row = results.begin(); row != results.end(); ++row) { // checking zone limits if (row[10]) { - auto zones = SplitString(row[10], '|'); + auto zones = Strings::Split(row[10], '|'); auto it = std::find(zones.begin(), zones.end(), zoneid); if (it == zones.end()) { // not in here, skip @@ -683,21 +683,21 @@ void ZoneDatabase::LoadGlobalLoot() } if (row[7]) { - auto races = SplitString(row[7], '|'); + auto races = Strings::Split(row[7], '|'); for (auto &r : races) e.AddRule(GlobalLoot::RuleTypes::Race, std::stoi(r)); } if (row[8]) { - auto classes = SplitString(row[8], '|'); + auto classes = Strings::Split(row[8], '|'); for (auto &c : classes) e.AddRule(GlobalLoot::RuleTypes::Class, std::stoi(c)); } if (row[9]) { - auto bodytypes = SplitString(row[9], '|'); + auto bodytypes = Strings::Split(row[9], '|'); for (auto &b : bodytypes) e.AddRule(GlobalLoot::RuleTypes::BodyType, std::stoi(b)); diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp index 21c8306d8..c4cd8a558 100644 --- a/zone/lua_general.cpp +++ b/zone/lua_general.cpp @@ -3389,7 +3389,7 @@ std::string lua_get_environmental_damage_name(uint8 damage_type) { } std::string lua_commify(std::string number) { - return commify(number); + return Strings::Commify(number); } bool lua_check_name_filter(std::string name) { diff --git a/zone/main.cpp b/zone/main.cpp index 15be8f77a..3273db791 100644 --- a/zone/main.cpp +++ b/zone/main.cpp @@ -31,7 +31,7 @@ #include "../common/patches/patches.h" #include "../common/rulesys.h" #include "../common/profanity_manager.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/crash.h" #include "../common/memory_mapped_file.h" #include "../common/spdat.h" @@ -157,7 +157,7 @@ int main(int argc, char** argv) { if (argc == 4) { instance_id = atoi(argv[3]); worldserver.SetLauncherName(argv[2]); - auto zone_port = SplitString(argv[1], ':'); + auto zone_port = Strings::Split(argv[1], ':'); if (!zone_port.empty()) { z_name = zone_port[0]; @@ -178,7 +178,7 @@ int main(int argc, char** argv) { } else if (argc == 3) { worldserver.SetLauncherName(argv[2]); - auto zone_port = SplitString(argv[1], ':'); + auto zone_port = Strings::Split(argv[1], ':'); if (!zone_port.empty()) { z_name = zone_port[0]; @@ -199,7 +199,7 @@ int main(int argc, char** argv) { } else if (argc == 2) { worldserver.SetLauncherName("NONE"); - auto zone_port = SplitString(argv[1], ':'); + auto zone_port = Strings::Split(argv[1], ':'); if (!zone_port.empty()) { z_name = zone_port[0]; diff --git a/zone/merc.cpp b/zone/merc.cpp index ef1084aaa..5bf265cb6 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -15,7 +15,7 @@ #include "zone.h" #include "string_ids.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/rulesys.h" extern volatile bool is_zone_loaded; diff --git a/zone/mob.cpp b/zone/mob.cpp index 63bb1f29a..8d2a6f689 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -17,7 +17,7 @@ */ #include "../common/spdat.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/misc_functions.h" #include "data_bucket.h" @@ -512,7 +512,7 @@ Mob::Mob( mob_close_scan_timer.Trigger(); SetCanOpenDoors(true); - + is_boat = IsBoat(); } @@ -6231,9 +6231,9 @@ void Mob::ClearSpecialAbilities() { void Mob::ProcessSpecialAbilities(const std::string &str) { ClearSpecialAbilities(); - std::vector sp = SplitString(str, '^'); + std::vector sp = Strings::Split(str, '^'); for(auto iter = sp.begin(); iter != sp.end(); ++iter) { - std::vector sub_sp = SplitString((*iter), ','); + std::vector sub_sp = Strings::Split((*iter), ','); if(sub_sp.size() >= 2) { int ability = std::stoi(sub_sp[0]); int value = std::stoi(sub_sp[1]); diff --git a/zone/mob_ai.cpp b/zone/mob_ai.cpp index 588c1debf..b42fd0341 100644 --- a/zone/mob_ai.cpp +++ b/zone/mob_ai.cpp @@ -19,7 +19,7 @@ #include "../common/global_define.h" #include "../common/features.h" #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "client.h" #include "entity.h" diff --git a/zone/mob_appearance.cpp b/zone/mob_appearance.cpp index 1af45e727..19a81dd9c 100644 --- a/zone/mob_appearance.cpp +++ b/zone/mob_appearance.cpp @@ -22,7 +22,7 @@ #include "../common/misc_functions.h" #include "../common/spdat.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "mob.h" #include "quest_parser_collection.h" diff --git a/zone/mob_info.cpp b/zone/mob_info.cpp index 45dfe2719..8deaaeefb 100644 --- a/zone/mob_info.cpp +++ b/zone/mob_info.cpp @@ -22,7 +22,7 @@ #include "mob.h" #include "../common/races.h" #include "../common/say_link.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "npc_scale_manager.h" inline std::string GetMobAttributeByString(Mob *mob, const std::string &attribute) @@ -38,7 +38,7 @@ inline std::string GetMobAttributeByString(Mob *mob, const std::string &attribut scaling_modified = " *"; } - return commify(std::to_string(mob->GetAC())) + scaling_modified; + return Strings::Commify(std::to_string(mob->GetAC())) + scaling_modified; } if (attribute == "atk") { @@ -51,11 +51,11 @@ inline std::string GetMobAttributeByString(Mob *mob, const std::string &attribut endurance = mob->CastToClient()->GetEndurance(); } - return commify(std::to_string(endurance)); + return Strings::Commify(std::to_string(endurance)); } if (attribute == "hp") { - return commify(std::to_string(mob->GetHP())); + return Strings::Commify(std::to_string(mob->GetHP())); } if (attribute == "hp_min_max") { @@ -63,115 +63,117 @@ inline std::string GetMobAttributeByString(Mob *mob, const std::string &attribut scaling_modified = " *"; } - return commify(std::to_string(mob->GetHP())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxHP())) + " (" + + return Strings::Commify(std::to_string(mob->GetHP())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxHP())) + " (" + std::to_string((int) mob->GetHPRatio()) + "%)"; } if (attribute == "mana") { - return commify(std::to_string(mob->GetMana())); + return Strings::Commify(std::to_string(mob->GetMana())); } if (attribute == "mp_min_max") { - return commify(std::to_string(mob->GetMana())) + " / " + commify(std::to_string(mob->GetMaxMana())) + " (" + + return Strings::Commify(std::to_string(mob->GetMana())) + " / " + + Strings::Commify(std::to_string(mob->GetMaxMana())) + " (" + std::to_string((int) mob->GetManaPercent()) + "%)"; } if (attribute == "end_min_max") { - return commify(std::to_string(mob->GetEndurance())) + " / " + commify(std::to_string(mob->GetMaxEndurance())) + " (" + + return Strings::Commify(std::to_string(mob->GetEndurance())) + " / " + + Strings::Commify(std::to_string(mob->GetMaxEndurance())) + " (" + std::to_string((int)mob->GetEndurancePercent()) + "%)"; } if (attribute == "str") { - return commify(std::to_string(mob->GetSTR())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxSTR())) + " +" + - commify(std::to_string(mob->GetHeroicSTR())); + return Strings::Commify(std::to_string(mob->GetSTR())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxSTR())) + " +" + + Strings::Commify(std::to_string(mob->GetHeroicSTR())); } if (attribute == "sta") { - return commify(std::to_string(mob->GetSTA())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxSTA())) + " +" + - commify(std::to_string(mob->GetHeroicSTA())); + return Strings::Commify(std::to_string(mob->GetSTA())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxSTA())) + " +" + + Strings::Commify(std::to_string(mob->GetHeroicSTA())); } if (attribute == "dex") { - return commify(std::to_string(mob->GetDEX())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxDEX())) + " +" + - commify(std::to_string(mob->GetHeroicDEX())); + return Strings::Commify(std::to_string(mob->GetDEX())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxDEX())) + " +" + + Strings::Commify(std::to_string(mob->GetHeroicDEX())); } if (attribute == "agi") { - return commify(std::to_string(mob->GetAGI())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxAGI())) + " +" + - commify(std::to_string(mob->GetHeroicAGI())); + return Strings::Commify(std::to_string(mob->GetAGI())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxAGI())) + " +" + + Strings::Commify(std::to_string(mob->GetHeroicAGI())); } if (attribute == "int") { - return commify(std::to_string(mob->GetINT())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxINT())) + " +" + - commify(std::to_string(mob->GetHeroicINT())); + return Strings::Commify(std::to_string(mob->GetINT())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxINT())) + " +" + + Strings::Commify(std::to_string(mob->GetHeroicINT())); } if (attribute == "wis") { - return commify(std::to_string(mob->GetWIS())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxWIS())) + " +" + - commify(std::to_string(mob->GetHeroicWIS())); + return Strings::Commify(std::to_string(mob->GetWIS())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxWIS())) + " +" + + Strings::Commify(std::to_string(mob->GetHeroicWIS())); } if (attribute == "cha") { - return commify(std::to_string(mob->GetCHA())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxCHA())) + " +" + - commify(std::to_string(mob->GetHeroicCHA())); + return Strings::Commify(std::to_string(mob->GetCHA())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxCHA())) + " +" + + Strings::Commify(std::to_string(mob->GetHeroicCHA())); } if (attribute == "mr") { - return commify(std::to_string(mob->GetMR())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxMR())) + " +" + - commify(std::to_string(mob->GetHeroicMR())); + return Strings::Commify(std::to_string(mob->GetMR())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxMR())) + " +" + + Strings::Commify(std::to_string(mob->GetHeroicMR())); } if (attribute == "cr") { - return commify(std::to_string(mob->GetCR())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxCR())) + " +" + - commify(std::to_string(mob->GetHeroicCR())); + return Strings::Commify(std::to_string(mob->GetCR())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxCR())) + " +" + + Strings::Commify(std::to_string(mob->GetHeroicCR())); } if (attribute == "fr") { - return commify(std::to_string(mob->GetFR())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxFR())) + " +" + - commify(std::to_string(mob->GetHeroicFR())); + return Strings::Commify(std::to_string(mob->GetFR())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxFR())) + " +" + + Strings::Commify(std::to_string(mob->GetHeroicFR())); } if (attribute == "pr") { - return commify(std::to_string(mob->GetPR())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxPR())) + " +" + - commify(std::to_string(mob->GetHeroicPR())); + return Strings::Commify(std::to_string(mob->GetPR())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxPR())) + " +" + + Strings::Commify(std::to_string(mob->GetHeroicPR())); } if (attribute == "dr") { - return commify(std::to_string(mob->GetDR())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxDR())) + " +" + - commify(std::to_string(mob->GetHeroicDR())); + return Strings::Commify(std::to_string(mob->GetDR())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxDR())) + " +" + + Strings::Commify(std::to_string(mob->GetHeroicDR())); } if (attribute == "cr") { - return commify(std::to_string(mob->GetCR())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxCR())) + " +" + - commify(std::to_string(mob->GetHeroicCR())); + return Strings::Commify(std::to_string(mob->GetCR())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxCR())) + " +" + + Strings::Commify(std::to_string(mob->GetHeroicCR())); } if (attribute == "pr") { - return commify(std::to_string(mob->GetPR())) + scaling_modified + " / " + - commify(std::to_string(mob->GetMaxPR())) + " +" + - commify(std::to_string(mob->GetHeroicPR())); + return Strings::Commify(std::to_string(mob->GetPR())) + scaling_modified + " / " + + Strings::Commify(std::to_string(mob->GetMaxPR())) + " +" + + Strings::Commify(std::to_string(mob->GetHeroicPR())); } if (attribute == "cor") { - return commify(std::to_string(mob->GetCorrup())) + scaling_modified; + return Strings::Commify(std::to_string(mob->GetCorrup())) + scaling_modified; } if (attribute == "phy") { - return commify(std::to_string(mob->GetPhR())) + scaling_modified; + return Strings::Commify(std::to_string(mob->GetPhR())) + scaling_modified; } if (attribute == "name") { @@ -361,45 +363,45 @@ inline std::string GetMobAttributeByString(Mob *mob, const std::string &attribut scaling_modified = " *"; } - return commify(std::to_string((int)npc->GetMinDMG())) + scaling_modified; + return Strings::Commify(std::to_string((int) npc->GetMinDMG())) + scaling_modified; } if (attribute == "max_hit") { if (mob->GetEntityVariable(std::string("modify_stat_max_hit").c_str())) { scaling_modified = " *"; } - return commify(std::to_string((int)npc->GetMaxDMG())) + scaling_modified; + return Strings::Commify(std::to_string((int) npc->GetMaxDMG())) + scaling_modified; } if (attribute == "hp_regen") { if (mob->GetEntityVariable(std::string("modify_stat_hp_regen").c_str())) { scaling_modified = " *"; } - return commify(std::to_string((int)npc->GetHPRegen())) + scaling_modified; + return Strings::Commify(std::to_string((int) npc->GetHPRegen())) + scaling_modified; } if (attribute == "attack_delay") { if (mob->GetEntityVariable(std::string("modify_stat_attack_delay").c_str())) { scaling_modified = " *"; } - return commify(std::to_string(npc->GetAttackDelay())) + scaling_modified; + return Strings::Commify(std::to_string(npc->GetAttackDelay())) + scaling_modified; } if (attribute == "spell_scale") { if (mob->GetEntityVariable(std::string("modify_stat_spell_scale").c_str())) { scaling_modified = " *"; } - return commify(std::to_string((int)npc->GetSpellScale())) + scaling_modified; + return Strings::Commify(std::to_string((int) npc->GetSpellScale())) + scaling_modified; } if (attribute == "heal_scale") { if (mob->GetEntityVariable(std::string("modify_stat_heal_scale").c_str())) { scaling_modified = " *"; } - return commify(std::to_string((int)npc->GetHealScale())) + scaling_modified; + return Strings::Commify(std::to_string((int) npc->GetHealScale())) + scaling_modified; } if (attribute == "avoidance") { - return commify(std::to_string((int)npc->GetAvoidanceRating())) + scaling_modified; + return Strings::Commify(std::to_string((int) npc->GetAvoidanceRating())) + scaling_modified; } npc->GetNPCEmote(npc->GetEmoteID(), 0); @@ -409,68 +411,68 @@ inline std::string GetMobAttributeByString(Mob *mob, const std::string &attribut Client *client = mob->CastToClient(); if (attribute == "shielding") { - return commify(std::to_string((int)client->GetShielding())) + " / " + - commify(std::to_string((int) RuleI(Character, ItemShieldingCap))); + return Strings::Commify(std::to_string((int) client->GetShielding())) + " / " + + Strings::Commify(std::to_string((int) RuleI(Character, ItemShieldingCap))); } if (attribute == "spell_shielding") { - return commify(std::to_string((int)client->GetSpellShield())) + " / " + - commify(std::to_string((int) RuleI(Character, ItemSpellShieldingCap))); + return Strings::Commify(std::to_string((int) client->GetSpellShield())) + " / " + + Strings::Commify(std::to_string((int) RuleI(Character, ItemSpellShieldingCap))); } if (attribute == "dot_shielding") { - return commify(std::to_string((int)client->GetDoTShield())) + " / " + - commify(std::to_string((int) RuleI(Character, ItemDoTShieldingCap))); + return Strings::Commify(std::to_string((int) client->GetDoTShield())) + " / " + + Strings::Commify(std::to_string((int) RuleI(Character, ItemDoTShieldingCap))); } if (attribute == "stun_resist") { - return commify(std::to_string((int)client->GetStunResist())) + " / " + - commify(std::to_string((int) RuleI(Character, ItemStunResistCap))); + return Strings::Commify(std::to_string((int) client->GetStunResist())) + " / " + + Strings::Commify(std::to_string((int) RuleI(Character, ItemStunResistCap))); } if (attribute == "damage_shield") { - return commify(std::to_string((int)client->GetDS())) + " / " + - commify(std::to_string((int) RuleI(Character, ItemDamageShieldCap))); + return Strings::Commify(std::to_string((int) client->GetDS())) + " / " + + Strings::Commify(std::to_string((int) RuleI(Character, ItemDamageShieldCap))); } if (attribute == "avoidance") { - return commify(std::to_string((int) client->GetAvoidance())) + " / " + - commify(std::to_string((int) RuleI(Character, ItemAvoidanceCap))); + return Strings::Commify(std::to_string((int) client->GetAvoidance())) + " / " + + Strings::Commify(std::to_string((int) RuleI(Character, ItemAvoidanceCap))); } if (attribute == "strikethrough") { - return commify(std::to_string((int) client->GetStrikeThrough())) + " / " + - commify(std::to_string((int) RuleI(Character, ItemStrikethroughCap))); + return Strings::Commify(std::to_string((int) client->GetStrikeThrough())) + " / " + + Strings::Commify(std::to_string((int) RuleI(Character, ItemStrikethroughCap))); } if (attribute == "accuracy") { - return commify(std::to_string((int) client->GetAccuracy())) + " / " + - commify(std::to_string((int) RuleI(Character, ItemAccuracyCap))); + return Strings::Commify(std::to_string((int) client->GetAccuracy())) + " / " + + Strings::Commify(std::to_string((int) RuleI(Character, ItemAccuracyCap))); } if (attribute == "combat_effects") { - return commify(std::to_string((int) client->GetCombatEffects())) + " / " + - commify(std::to_string((int) RuleI(Character, ItemCombatEffectsCap))); + return Strings::Commify(std::to_string((int) client->GetCombatEffects())) + " / " + + Strings::Commify(std::to_string((int) RuleI(Character, ItemCombatEffectsCap))); } if (attribute == "heal_amount") { - return commify(std::to_string((int) client->GetHealAmt())) + " / " + - commify(std::to_string((int) RuleI(Character, ItemHealAmtCap))); + return Strings::Commify(std::to_string((int) client->GetHealAmt())) + " / " + + Strings::Commify(std::to_string((int) RuleI(Character, ItemHealAmtCap))); } if (attribute == "spell_dmg") { - return commify(std::to_string((int) client->GetSpellDmg())) + " / " + - commify(std::to_string((int) RuleI(Character, ItemSpellDmgCap))); + return Strings::Commify(std::to_string((int) client->GetSpellDmg())) + " / " + + Strings::Commify(std::to_string((int) RuleI(Character, ItemSpellDmgCap))); } if (attribute == "clairvoyance") { - return commify(std::to_string((int) client->GetClair())) + " / " + - commify(std::to_string((int) RuleI(Character, ItemClairvoyanceCap))); + return Strings::Commify(std::to_string((int) client->GetClair())) + " / " + + Strings::Commify(std::to_string((int) RuleI(Character, ItemClairvoyanceCap))); } if (attribute == "ds_mitigation") { - return commify(std::to_string((int) client->GetDSMit())) + " / " + - commify(std::to_string((int) RuleI(Character, ItemDSMitigationCap))); + return Strings::Commify(std::to_string((int) client->GetDSMit())) + " / " + + Strings::Commify(std::to_string((int) RuleI(Character, ItemDSMitigationCap))); } if (attribute == "hp_regen") { - return commify(std::to_string((int64) client->GetHPRegen())) + " / " + - commify(std::to_string((int) RuleI(Character, ItemHealthRegenCap))); + return Strings::Commify(std::to_string((int64) client->GetHPRegen())) + " / " + + Strings::Commify(std::to_string((int) RuleI(Character, ItemHealthRegenCap))); } if (attribute == "mana_regen") { - return commify(std::to_string((int64) client->GetManaRegen())) + " / " + - commify(std::to_string((int64) RuleI(Character, ItemManaRegenCap))); + return Strings::Commify(std::to_string((int64) client->GetManaRegen())) + " / " + + Strings::Commify(std::to_string((int64) RuleI(Character, ItemManaRegenCap))); } if (attribute == "end_regen") { - return commify(std::to_string((int) client->CalcEnduranceRegen())) + " / " + - commify(std::to_string((int) client->CalcEnduranceRegenCap())); + return Strings::Commify(std::to_string((int) client->CalcEnduranceRegen())) + " / " + + Strings::Commify(std::to_string((int) client->CalcEnduranceRegenCap())); } } @@ -528,17 +530,17 @@ inline std::string WriteDisplayInfoSection( std::string attribute_name = attribute; - find_replace(attribute_name, "_min_max", std::string("")); + Strings::FindReplace(attribute_name, "_min_max", std::string("")); /** * Translate attribute names with underscores * "total_to_hit" = "Total To Hit" */ if (attribute_name.find('_') != std::string::npos) { - auto split_string = SplitString(attribute_name, '_'); + auto split_string = Strings::Split(attribute_name, '_'); std::string new_attribute_name; for (std::string &string_value : split_string) { - new_attribute_name += ucfirst(string_value) + " "; + new_attribute_name += Strings::UcFirst(string_value) + " "; } attribute_name = new_attribute_name; } @@ -548,7 +550,7 @@ inline std::string WriteDisplayInfoSection( * "hp" = "HP" */ if (attribute_name.length() <= 3) { - attribute_name = str_toupper(attribute_name); + attribute_name = Strings::ToUpper(attribute_name); } /** @@ -556,11 +558,11 @@ inline std::string WriteDisplayInfoSection( * "avoidance" = "Avoidance" */ if (attribute_name.length() > 3) { - attribute_name = ucfirst(attribute_name); + attribute_name = Strings::UcFirst(attribute_name); } - find_replace(attribute_name, "Proximity", std::string("")); - find_replace(attribute_name, "Roambox", std::string("")); + Strings::FindReplace(attribute_name, "Proximity", std::string("")); + Strings::FindReplace(attribute_name, "Roambox", std::string("")); std::string attribute_value = GetMobAttributeByString(mob, attribute); @@ -588,24 +590,24 @@ inline void NPCCommandsMenu(Client* client, NPC* npc) std::string menu_commands; if (npc->GetGrid() > 0) { - menu_commands += "[" + EQ::SayLinkEngine::GenerateQuestSaylink("#grid show", false, "Grid Points") + "] "; + menu_commands += "[" + Saylink::Create("#grid show", false, "Grid Points") + "] "; } if (npc->GetEmoteID() > 0) { std::string saylink = StringFormat("#emotesearch %u", npc->GetEmoteID()); - menu_commands += "[" + EQ::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Emotes") + "] "; + menu_commands += "[" + Saylink::Create(saylink, false, "Emotes") + "] "; } if (npc->GetLoottableID() > 0) { - menu_commands += "[" + EQ::SayLinkEngine::GenerateQuestSaylink("#npcloot show", false, "Loot") + "] "; + menu_commands += "[" + Saylink::Create("#npcloot show", false, "Loot") + "] "; } if (npc->IsProximitySet()) { - menu_commands += "[" + EQ::SayLinkEngine::GenerateQuestSaylink("#proximity show", false, "Proximity") + "] "; + menu_commands += "[" + Saylink::Create("#proximity show", false, "Proximity") + "] "; } if (menu_commands.length() > 0) { - std::string dev_menu = "[" + EQ::SayLinkEngine::GenerateQuestSaylink("#devtools", false, "DevTools") + "] ";; + std::string dev_menu = "[" + Saylink::Create("#devtools", false, "DevTools") + "] ";; client->Message(Chat::White, "| %s [Show Commands] %s", dev_menu.c_str(), menu_commands.c_str()); } } diff --git a/zone/npc.cpp b/zone/npc.cpp index ea8cfab71..9363d7a00 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -23,7 +23,7 @@ #include "../common/rulesys.h" #include "../common/seperator.h" #include "../common/spdat.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/emu_versions.h" #include "../common/features.h" #include "../common/item_instance.h" @@ -703,7 +703,7 @@ void NPC::QueryLoot(Client* to, bool is_pet_query) Chat::White, fmt::format( "Money | {}", - ConvertMoneyToString( + Strings::Money( platinum, gold, silver, @@ -1212,8 +1212,8 @@ void NPC::SpawnGridNodeNPC(const glm::vec4 &position, int32 grid_id, int32 grid_ auto npc_type = new NPCType; memset(npc_type, 0, sizeof(NPCType)); - std::string str_zoffset = numberToWords(zoffset); - std::string str_number = numberToWords(grid_number); + std::string str_zoffset = Strings::NumberToWords(zoffset); + std::string str_number = Strings::NumberToWords(grid_number); strcpy(npc_type->name, str_number.c_str()); if (zoffset != 0) { @@ -1551,7 +1551,7 @@ uint32 ZoneDatabase::AddNewNPCSpawnGroupCommand( std::string query = fmt::format( "INSERT INTO spawngroup (name) VALUES('{}{}{}')", zone, - EscapeString(spawn->GetName()), + Strings::Escape(spawn->GetName()), Timer::GetCurrentTime() ); @@ -2424,7 +2424,7 @@ void NPC::SetLevel(uint8 in_level, bool command) void NPC::ModifyNPCStat(const char *identifier, const char *new_value) { - std::string id = str_tolower(identifier); + std::string id = Strings::ToLower(identifier); std::string val = new_value; std::string variable_key = StringFormat("modify_stat_%s", id.c_str()); @@ -2650,7 +2650,7 @@ void NPC::ModifyNPCStat(const char *identifier, const char *new_value) float NPC::GetNPCStat(const char *identifier) { - std::string id = str_tolower(identifier); + std::string id = Strings::ToLower(identifier); if (id == "ac") { return AC; diff --git a/zone/npc_scale_manager.cpp b/zone/npc_scale_manager.cpp index 086abf75d..8b6a85c86 100644 --- a/zone/npc_scale_manager.cpp +++ b/zone/npc_scale_manager.cpp @@ -19,7 +19,7 @@ */ #include "npc_scale_manager.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/repositories/npc_scale_global_base_repository.h" #include "../common/repositories/npc_types_repository.h" diff --git a/zone/object.cpp b/zone/object.cpp index 3b0c60490..507f5d649 100644 --- a/zone/object.cpp +++ b/zone/object.cpp @@ -17,7 +17,7 @@ */ #include "../common/global_define.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "client.h" #include "entity.h" diff --git a/zone/pathfinder_waypoint.cpp b/zone/pathfinder_waypoint.cpp index 58dcd1582..19ad3b135 100644 --- a/zone/pathfinder_waypoint.cpp +++ b/zone/pathfinder_waypoint.cpp @@ -12,7 +12,7 @@ #include "zone.h" #include "client.h" #include "../common/eqemu_logsys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/rulesys.h" extern Zone *zone; @@ -123,26 +123,26 @@ IPathfinder::IPath PathfinderWaypoint::FindRoute(const glm::vec3 &start, const g if (result_start_n.size() == 0) { return IPath(); } - + std::vector result_end_n; m_impl->Tree.query(boost::geometry::index::nearest(Point(end.x, end.y, end.z), 1), std::back_inserter(result_end_n)); if (result_end_n.size() == 0) { return IPath(); } - + auto &nearest_start = *result_start_n.begin(); auto &nearest_end = *result_end_n.begin(); - + if (nearest_start.second == nearest_end.second) { IPath Route; Route.push_back(start); Route.push_back(end); return Route; } - + std::vector p(boost::num_vertices(m_impl->Graph)); try { - boost::astar_search(m_impl->Graph, nearest_start.second, + boost::astar_search(m_impl->Graph, nearest_start.second, distance_heuristic(&m_impl->Nodes[0], nearest_end.second), boost::predecessor_map(&p[0]) .visitor(astar_goal_visitor(nearest_end.second))); @@ -150,7 +150,7 @@ IPathfinder::IPath PathfinderWaypoint::FindRoute(const glm::vec3 &start, const g catch (found_goal) { IPath Route; - + Route.push_front(end); for (size_t v = nearest_end.second;; v = p[v]) { if (p[v] == v) { @@ -159,7 +159,7 @@ IPathfinder::IPath PathfinderWaypoint::FindRoute(const glm::vec3 &start, const g } else { auto &node = m_impl->Nodes[v]; - + auto iter = node.edges.find((int)p[v + 1]); if (iter != node.edges.end()) { auto &edge = iter->second; @@ -176,11 +176,11 @@ IPathfinder::IPath PathfinderWaypoint::FindRoute(const glm::vec3 &start, const g } } } - + Route.push_front(start); return Route; } - + return IPath(); } @@ -192,7 +192,7 @@ glm::vec3 PathfinderWaypoint::GetRandomLocation(const glm::vec3 &start) return node.v; } - + return glm::vec3(); } @@ -205,32 +205,32 @@ void PathfinderWaypoint::DebugCommand(Client *c, const Seperator *sep) c->Message(Chat::White, "#path info node_id: Gives information about node info (requires shownode target)."); return; } - + if(!strcasecmp(sep->arg[1], "shownodes")) { - ShowNodes(); + ShowNodes(); return; } - + if (!strcasecmp(sep->arg[1], "show")) { if (c->GetTarget() != nullptr) { auto target = c->GetTarget(); glm::vec3 start(c->GetX(), c->GetY(), c->GetZ()); glm::vec3 end(target->GetX(), target->GetY(), target->GetZ()); - + ShowPath(c, start, end); } - + return; } - + if (!strcasecmp(sep->arg[1], "reload")) { Load(m_impl->FileName); return; } - + if (!strcasecmp(sep->arg[1], "info")) { NodeInfo(c); @@ -242,25 +242,25 @@ void PathfinderWaypoint::Load(const std::string &filename) { PathFileHeader Head; Head.PathNodeCount = 0; Head.version = 2; - + FILE *f = fopen(filename.c_str(), "rb"); if (f) { char Magic[10]; - + fread(&Magic, 9, 1, f); - + if (strncmp(Magic, "EQEMUPATH", 9)) { LogError("Bad Magic String in .path file"); fclose(f); return; } - + fread(&Head, sizeof(Head), 1, f); - + LogInfo("Path File Header: Version [{}], PathNodes [{}]", (long)Head.version, (long)Head.PathNodeCount); - + if (Head.version == 2) { LoadV2(f, Head); @@ -281,13 +281,13 @@ void PathfinderWaypoint::Load(const std::string &filename) { void PathfinderWaypoint::LoadV2(FILE *f, const PathFileHeader &header) { std::unique_ptr PathNodes(new PathNode[header.PathNodeCount]); - + fread(PathNodes.get(), sizeof(PathNode), header.PathNodeCount, f); - + int MaxNodeID = header.PathNodeCount - 1; - + m_impl->PathFileValid = true; - + m_impl->Nodes.reserve(header.PathNodeCount); for (uint32 i = 0; i < header.PathNodeCount; ++i) { @@ -298,7 +298,7 @@ void PathfinderWaypoint::LoadV2(FILE *f, const PathFileHeader &header) node.bestz = n.bestz; m_impl->Nodes.push_back(node); } - + auto weightmap = boost::get(boost::edge_weight, m_impl->Graph); for (uint32 i = 0; i < header.PathNodeCount; ++i) { for (uint32 j = 0; j < 50; ++j) @@ -309,18 +309,18 @@ void PathfinderWaypoint::LoadV2(FILE *f, const PathFileHeader &header) LogError("Path Node [{}], Neighbour [{}] ([{}]) out of range", i, j, PathNodes[i].Neighbours[j].id); m_impl->PathFileValid = false; } - + if (PathNodes[i].Neighbours[j].id > 0) { Edge edge; edge.distance = PathNodes[i].Neighbours[j].distance; edge.door_id = PathNodes[i].Neighbours[j].DoorID; edge.teleport = PathNodes[i].Neighbours[j].Teleport; - + node.edges[PathNodes[i].Neighbours[j].id] = edge; } } } - + BuildGraph(); fclose(f); } @@ -339,7 +339,7 @@ void PathfinderWaypoint::LoadV3(FILE *f, const PathFileHeader &header) float y = 0.0f; float z = 0.0f; float best_z = 0.0f; - + fread(&id, sizeof(uint32), 1, f); fread(&x, sizeof(float), 1, f); fread(&y, sizeof(float), 1, f); @@ -352,7 +352,7 @@ void PathfinderWaypoint::LoadV3(FILE *f, const PathFileHeader &header) n.v.x = x; n.v.y = y; n.v.z = z; - + m_impl->Nodes.push_back(n); } @@ -377,10 +377,10 @@ void PathfinderWaypoint::LoadV3(FILE *f, const PathFileHeader &header) auto &n = m_impl->Nodes[from]; n.edges[to] = e; } - + m_impl->PathFileValid = true; - - BuildGraph(); + + BuildGraph(); fclose(f); } diff --git a/zone/perl_entity.cpp b/zone/perl_entity.cpp index 7eb5520f2..a8bbc4e19 100644 --- a/zone/perl_entity.cpp +++ b/zone/perl_entity.cpp @@ -3,7 +3,7 @@ #ifdef EMBPERL_XS_CLASSES #include "../common/global_define.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "embperl.h" #include "entity.h" #include diff --git a/zone/petitions.cpp b/zone/petitions.cpp index b55236634..29ad03ff2 100644 --- a/zone/petitions.cpp +++ b/zone/petitions.cpp @@ -33,7 +33,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) #include "../common/eq_packet_structs.h" #include "../common/servertalk.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "entity.h" #include "petitions.h" diff --git a/zone/pets.cpp b/zone/pets.cpp index 8aa726b9a..a1bdd9248 100644 --- a/zone/pets.cpp +++ b/zone/pets.cpp @@ -18,7 +18,7 @@ #include "../common/global_define.h" #include "../common/spdat.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/types.h" #include "entity.h" diff --git a/zone/position.cpp b/zone/position.cpp index cc4317e0e..c2da54be8 100644 --- a/zone/position.cpp +++ b/zone/position.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "../common/string_util.h" +#include "../common/strings.h" static const float position_eps = 0.0001f; diff --git a/zone/qglobals.cpp b/zone/qglobals.cpp index f1719def5..fee93765d 100644 --- a/zone/qglobals.cpp +++ b/zone/qglobals.cpp @@ -1,4 +1,4 @@ -#include "../common/string_util.h" +#include "../common/strings.h" #include "qglobals.h" #include "client.h" diff --git a/zone/queryserv.cpp b/zone/queryserv.cpp index e80be7944..de26c6be1 100644 --- a/zone/queryserv.cpp +++ b/zone/queryserv.cpp @@ -18,7 +18,7 @@ Copyright (C) 2001-2014 EQEMu Development Team (http://eqemulator.net) #include "../common/global_define.h" #include "../common/servertalk.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "queryserv.h" #include "worldserver.h" @@ -49,6 +49,6 @@ void QueryServ::PlayerLogEvent(int Event_Type, int Character_ID, std::string Eve "INSERT INTO `qs_player_events` (event, char_id, event_desc, time) VALUES (%i, %i, '%s', UNIX_TIMESTAMP(now()))", Event_Type, Character_ID, - EscapeString(Event_Desc).c_str()); + Strings::Escape(Event_Desc).c_str()); SendQuery(query); } diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index 7ce6aec2d..149192cff 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -21,7 +21,7 @@ #include "../common/rulesys.h" #include "../common/skills.h" #include "../common/spdat.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/say_link.h" #include "entity.h" @@ -1195,7 +1195,7 @@ void QuestManager::givecash(uint32 copper, uint32 silver, uint32 gold, uint32 pl initiator->MessageString( Chat::MoneySplit, YOU_RECEIVE, - ConvertMoneyToString( + Strings::Money( platinum, gold, silver, @@ -2992,7 +2992,7 @@ std::string QuestManager::saylink(char *saylink_text, bool silent, const char *l { QuestManagerCurrentQuestVars(); - return EQ::SayLinkEngine::GenerateQuestSaylink(saylink_text, silent, link_name); + return Saylink::Create(saylink_text, silent, link_name); } std::string QuestManager::getcharnamebyid(uint32 char_id) { @@ -3401,7 +3401,7 @@ EQ::ItemInstance *QuestManager::CreateItem(uint32 item_id, int16 charges, uint32 } std::string QuestManager::secondstotime(int duration) { - return ConvertSecondsToTime(duration); + return Strings::SecondsToTime(duration); } std::string QuestManager::gethexcolorcode(std::string color_name) { diff --git a/zone/raids.cpp b/zone/raids.cpp index 002097fd9..dd8c8ede1 100644 --- a/zone/raids.cpp +++ b/zone/raids.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/string_util.h" +#include "../common/strings.h" #include "client.h" #include "entity.h" @@ -803,7 +803,7 @@ void Raid::SplitMoney(uint32 gid, uint32 copper, uint32 silver, uint32 gold, uin members[i].member->MessageString( Chat::MoneySplit, YOU_RECEIVE_AS_SPLIT, - ConvertMoneyToString( + Strings::Money( platinum_split, gold_split, silver_split, @@ -1435,7 +1435,7 @@ void Raid::GetRaidDetails() void Raid::SaveRaidMOTD() { std::string query = StringFormat("UPDATE raid_details SET motd = '%s' WHERE raidid = %lu", - EscapeString(motd).c_str(), (unsigned long)GetID()); + Strings::Escape(motd).c_str(), (unsigned long)GetID()); auto results = database.QueryDatabase(query); } diff --git a/zone/spawn2.cpp b/zone/spawn2.cpp index d314137bd..0495a051b 100644 --- a/zone/spawn2.cpp +++ b/zone/spawn2.cpp @@ -17,7 +17,7 @@ */ #include "../common/global_define.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "client.h" #include "entity.h" diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index 42ec7658a..b7bc30607 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -17,7 +17,7 @@ */ #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "client.h" #include "entity.h" diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index 25dac7a25..6d258ca8d 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -10331,7 +10331,7 @@ int Mob::GetBuffStatValueBySpell(int32 spell_id, const char* stat_identifier) return 0; } - std::string id = str_tolower(stat_identifier); + std::string id = Strings::ToLower(stat_identifier); int buff_count = GetMaxTotalSlots(); for (int slot = 0; slot < buff_count; slot++) { @@ -10352,7 +10352,7 @@ int Mob::GetBuffStatValueBySlot(uint8 slot, const char* stat_identifier) return 0; } - std::string id = str_tolower(stat_identifier); + std::string id = Strings::ToLower(stat_identifier); if (id == "caster_level") { return buffs[slot].casterlevel; } else if (id == "spell_id") { return buffs[slot].spellid; } diff --git a/zone/spells.cpp b/zone/spells.cpp index 41f902384..f1b58f520 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -74,7 +74,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) #include "../common/rulesys.h" #include "../common/skills.h" #include "../common/spdat.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/data_verification.h" #include "../common/misc_functions.h" @@ -2200,7 +2200,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce if (!spell_target_tot) { return false; } - + //Verfied from live - Target's Target needs to be in combat range to recieve the effect if (RuleB(Spells, TargetsTargetRequiresCombatRange) && !CombatRange(spell_target)) { return false; @@ -5542,7 +5542,7 @@ bool Client::SpellGlobalCheck(uint16 spell_id, uint32 character_id) { query = fmt::format( "SELECT value FROM quest_globals WHERE charid = {} AND name = '{}'", character_id, - EscapeString(spell_global_name) + Strings::Escape(spell_global_name) ); results = database.QueryDatabase(query); @@ -5570,7 +5570,7 @@ bool Client::SpellGlobalCheck(uint16 spell_id, uint32 character_id) { row = results.begin(); std::string global_value = row[0]; - if (StringIsNumber(global_value) && StringIsNumber(spell_global_value)) { + if (Strings::IsNumber(global_value) && Strings::IsNumber(spell_global_value)) { if (std::stoi(global_value) >= std::stoi(spell_global_value)) { return true; // If value is greater than or equal to spell global value, allow scribing. } @@ -5624,11 +5624,11 @@ bool Client::SpellBucketCheck(uint16 spell_id, uint32 character_id) { auto bucket_value = DataBucket::GetData(new_bucket_name); if (!bucket_value.empty()) { - if (StringIsNumber(bucket_value) && StringIsNumber(spell_bucket_value)) { + if (Strings::IsNumber(bucket_value) && Strings::IsNumber(spell_bucket_value)) { if (std::stoi(bucket_value) >= std::stoi(spell_bucket_value)) { return true; // If value is greater than or equal to spell bucket value, allow scribing. } - } else { + } else { if (bucket_value == spell_bucket_value) { return true; // If value is equal to spell bucket value, allow scribing. } @@ -5643,11 +5643,11 @@ bool Client::SpellBucketCheck(uint16 spell_id, uint32 character_id) { bucket_value = DataBucket::GetData(old_bucket_name); if (!bucket_value.empty()) { - if (StringIsNumber(bucket_value) && StringIsNumber(spell_bucket_value)) { + if (Strings::IsNumber(bucket_value) && Strings::IsNumber(spell_bucket_value)) { if (std::stoi(bucket_value) >= std::stoi(spell_bucket_value)) { return true; // If value is greater than or equal to spell bucket value, allow scribing. } - } else { + } else { if (bucket_value == spell_bucket_value) { return true; // If value is equal to spell bucket value, allow scribing. } diff --git a/zone/task_client_state.cpp b/zone/task_client_state.cpp index fa42ead87..86cc835b6 100644 --- a/zone/task_client_state.cpp +++ b/zone/task_client_state.cpp @@ -1349,7 +1349,7 @@ void ClientTaskState::RewardTask(Client *client, TaskInformation *task_informati client->MessageString( Chat::Yellow, YOU_RECEIVE, - ConvertMoneyToString( + Strings::Money( platinum, gold, silver, @@ -1696,7 +1696,7 @@ void ClientTaskState::ShowClientTaskInfoMessage(ClientTaskInformation *task, Cli std::vector update_saylinks; for (auto &increment: update_increments) { - auto task_update_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( + auto task_update_saylink = Saylink::Create( fmt::format( "#task update {} {} {}", task->task_id, @@ -1718,7 +1718,7 @@ void ClientTaskState::ShowClientTaskInfoMessage(ClientTaskInformation *task, Cli task->activity[activity_id].done_count, task->activity[activity_id].activity_state, Tasks::GetActivityStateDescription(task->activity[activity_id].activity_state), - implode(" | ", update_saylinks) + Strings::Implode(" | ", update_saylinks) ).c_str() ); } diff --git a/zone/task_goal_list_manager.cpp b/zone/task_goal_list_manager.cpp index 927099181..24c90ac27 100644 --- a/zone/task_goal_list_manager.cpp +++ b/zone/task_goal_list_manager.cpp @@ -150,7 +150,7 @@ bool TaskGoalListManager::IsInList(int list_id, int entry) bool TaskGoalListManager::IsInMatchList(const std::string& match_list, const std::string& entry) { - for (auto &s: SplitString(match_list, '|')) { + for (auto &s: Strings::Split(match_list, '|')) { if (s == entry) { return true; } @@ -161,9 +161,9 @@ bool TaskGoalListManager::IsInMatchList(const std::string& match_list, const std bool TaskGoalListManager::IsInMatchListPartial(const std::string &match_list, const std::string &entry) { - std::string entry_match = str_tolower(entry); - for (auto &s: SplitString(match_list, '|')) { - if (entry_match.find(str_tolower(s)) != std::string::npos) { + std::string entry_match = Strings::ToLower(entry); + for (auto &s: Strings::Split(match_list, '|')) { + if (entry_match.find(Strings::ToLower(s)) != std::string::npos) { return true; } } diff --git a/zone/task_manager.cpp b/zone/task_manager.cpp index 712e0e4ad..866f5bf3e 100644 --- a/zone/task_manager.cpp +++ b/zone/task_manager.cpp @@ -227,9 +227,9 @@ bool TaskManager::LoadTasks(int single_task) activity_data->target_name = task_activity.target_name; activity_data->item_list = task_activity.item_list; activity_data->skill_list = task_activity.skill_list; - activity_data->skill_id = StringIsNumber(task_activity.skill_list) ? std::stoi(task_activity.skill_list) : 0; // for older clients + activity_data->skill_id = Strings::IsNumber(task_activity.skill_list) ? std::stoi(task_activity.skill_list) : 0; // for older clients activity_data->spell_list = task_activity.spell_list; - activity_data->spell_id = StringIsNumber(task_activity.spell_list) ? std::stoi(task_activity.spell_list) : 0; // for older clients + activity_data->spell_id = Strings::IsNumber(task_activity.spell_list) ? std::stoi(task_activity.spell_list) : 0; // for older clients activity_data->description_override = task_activity.description_override; activity_data->goal_id = task_activity.goalid; activity_data->goal_method = (TaskMethodType) task_activity.goalmethod; @@ -239,7 +239,7 @@ bool TaskManager::LoadTasks(int single_task) // zones activity_data->zones = task_activity.zones; - auto zones = SplitString( + auto zones = Strings::Split( task_activity.zones, ';' ); diff --git a/zone/tasks.cpp b/zone/tasks.cpp index a524ebd5f..9dd7be0b6 100644 --- a/zone/tasks.cpp +++ b/zone/tasks.cpp @@ -1,7 +1,7 @@ #include "../common/global_define.h" #include "../common/misc_functions.h" #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "client.h" #include "queryserv.h" #include "quest_parser_collection.h" diff --git a/zone/titles.cpp b/zone/titles.cpp index 14230c4bd..9949add17 100644 --- a/zone/titles.cpp +++ b/zone/titles.cpp @@ -17,7 +17,7 @@ */ #include "../common/eq_packet_structs.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/misc_functions.h" #include "../common/repositories/titles_repository.h" @@ -235,7 +235,7 @@ void TitleManager::CreateNewPlayerTitle(Client *client, std::string title) auto query = fmt::format( "SELECT `id` FROM titles WHERE `prefix` = '{}' AND char_id = {}", - EscapeString(title), + Strings::Escape(title), client->CharacterID() ); auto results = database.QueryDatabase(query); @@ -246,7 +246,7 @@ void TitleManager::CreateNewPlayerTitle(Client *client, std::string title) query = fmt::format( "INSERT INTO titles (`char_id`, `prefix`) VALUES ({}, '{}')", client->CharacterID(), - EscapeString(title) + Strings::Escape(title) ); results = database.QueryDatabase(query); if (!results.Success()) { @@ -268,7 +268,7 @@ void TitleManager::CreateNewPlayerSuffix(Client *client, std::string suffix) auto query = fmt::format( "SELECT `id` FROM titles WHERE `suffix` = '{}' AND char_id = {}", - EscapeString(suffix), + Strings::Escape(suffix), client->CharacterID() ); auto results = database.QueryDatabase(query); @@ -279,7 +279,7 @@ void TitleManager::CreateNewPlayerSuffix(Client *client, std::string suffix) query = fmt::format( "INSERT INTO titles (`char_id`, `suffix`) VALUES ({}, '{}')", client->CharacterID(), - EscapeString(suffix) + Strings::Escape(suffix) ); results = database.QueryDatabase(query); if (!results.Success()) { diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index 8e6e68cce..46a0e0177 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -26,7 +26,7 @@ #endif #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "queryserv.h" #include "quest_parser_collection.h" diff --git a/zone/trading.cpp b/zone/trading.cpp index c9aa15bee..656513dd3 100644 --- a/zone/trading.cpp +++ b/zone/trading.cpp @@ -19,7 +19,7 @@ #include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/misc_functions.h" #include "client.h" diff --git a/zone/trap.cpp b/zone/trap.cpp index 68189aad9..16ec4d2ba 100644 --- a/zone/trap.cpp +++ b/zone/trap.cpp @@ -17,7 +17,7 @@ */ #include "../common/spdat.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/types.h" #include "client.h" diff --git a/zone/tune.cpp b/zone/tune.cpp index 1c2d770d1..9d667be13 100644 --- a/zone/tune.cpp +++ b/zone/tune.cpp @@ -26,7 +26,7 @@ #include "../common/rulesys.h" #include "../common/skills.h" #include "../common/spdat.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/data_verification.h" #include "../common/misc_functions.h" #include "queryserv.h" diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp index a84e5a88e..dd456ba7b 100644 --- a/zone/waypoints.cpp +++ b/zone/waypoints.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "../common/features.h" #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/misc_functions.h" #include "../common/eqemu_logsys.h" @@ -116,7 +116,7 @@ void NPC::DisplayWaypointInfo(Client *client) { current_waypoint.pause ? fmt::format( "{} ({})", - ConvertSecondsToTime(current_waypoint.pause), + Strings::SecondsToTime(current_waypoint.pause), current_waypoint.pause ) : "" @@ -1156,7 +1156,7 @@ void ZoneDatabase::AddWP(Client *client, uint32 gridid, uint32 wpnum, const glm: * DeleteWaypoint - Removes a specific waypoint from the grid * grid_id: The ID number of the grid whose wp is being deleted * wp_num: The number of the waypoint being deleted -* zoneid: The ID number of the zone that contains the waypoint being deleted +* zoneid: The ID number of the zone that Contains the waypoint being deleted */ void ZoneDatabase::DeleteWaypoint(Client *client, uint32 grid_num, uint32 wp_num, uint16 zoneid) { diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index 867c3f391..538b9c153 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -635,7 +635,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) } else if (client->GetAnon() == 1 && client->Admin() > szp->adminrank) { break; } else { - std::string name = str_tolower(szp->name); + std::string name = Strings::ToLower(szp->name); name[0] = toupper(name[0]); SendEmoteMessage( @@ -823,7 +823,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) } ServerUptime_Struct* sus = (ServerUptime_Struct*)pack->pBuffer; uint32 ms = Timer::GetCurrentTime(); - std::string time_string = ConvertMillisecondsToTime(ms); + std::string time_string = Strings::MillisecondsToTime(ms); SendEmoteMessage( sus->adminname, 0, @@ -3138,12 +3138,12 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) if (request_zone_short_name == local_zone_short_name || can_reload_global_script) { zone->SetQuestHotReloadQueued(true); } else if (request_zone_short_name == "all") { - std::string reload_quest_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( + std::string reload_quest_saylink = Saylink::Create( "#reload quest", false, "Locally" ); - std::string reload_world_saylink = EQ::SayLinkEngine::GenerateQuestSaylink( + std::string reload_world_saylink = Saylink::Create( "#reload world", false, "Globally" diff --git a/zone/zone.cpp b/zone/zone.cpp index 7d1b5fb92..aafb951d0 100755 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -34,7 +34,7 @@ #include "../common/features.h" #include "../common/rulesys.h" #include "../common/seperator.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "../common/eqemu_logsys.h" #include "expedition.h" @@ -566,7 +566,7 @@ void Zone::LoadTempMerchantData() FROM merchantlist_temp WHERE npcid IN ({}) ), - implode(", ", npc_ids) + Strings::Implode(", ", npc_ids) ) ); diff --git a/zone/zone.h b/zone/zone.h index 915fa8c43..5c8efe657 100755 --- a/zone/zone.h +++ b/zone/zone.h @@ -23,7 +23,7 @@ #include "../common/rulesys.h" #include "../common/types.h" #include "../common/random.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "zonedb.h" #include "zone_store.h" #include "../common/repositories/grid_repository.h" @@ -328,10 +328,10 @@ public: /** * Replace Occurrences of % or MessageStatus will crash */ - find_replace(message, std::string("%"), std::string(".")); + Strings::FindReplace(message, std::string("%"), std::string(".")); if (message.find('\n') != std::string::npos) { - auto message_split = SplitString(message, '\n'); + auto message_split = Strings::Split(message, '\n'); entity_list.MessageStatus( 0, AccountStatus::QuestTroupe, diff --git a/zone/zone_event_scheduler.cpp b/zone/zone_event_scheduler.cpp index 2294ad50e..839dfa981 100644 --- a/zone/zone_event_scheduler.cpp +++ b/zone/zone_event_scheduler.cpp @@ -35,7 +35,7 @@ void ZoneEventScheduler::Process(Zone *zone, WorldContentService *content_servic LogSchedulerDetail("Looping active event validated [{}]", e.event_type); if (e.event_type == ServerEvents::EVENT_TYPE_HOT_ZONE_ACTIVE) { LogScheduler("Deactivating event [{}] disabling hotzone status", e.description); - if (search_deliminated_string(e.event_data, zone->GetShortName()) != std::string::npos) { + if (Strings::SearchDelim(e.event_data, zone->GetShortName()) != std::string::npos) { zone->SetIsHotzone(false); } RemoveActiveEvent(e); @@ -85,7 +85,7 @@ void ZoneEventScheduler::Process(Zone *zone, WorldContentService *content_servic // such as broadcasts, reloads if (ValidateEventReadyToActivate(e) && !IsEventActive(e)) { if (e.event_type == ServerEvents::EVENT_TYPE_HOT_ZONE_ACTIVE) { - if (search_deliminated_string(e.event_data, zone->GetShortName()) != std::string::npos) { + if (Strings::SearchDelim(e.event_data, zone->GetShortName()) != std::string::npos) { zone->SetIsHotzone(true); LogScheduler("Activating Event [{}] Enabling zone as hotzone", e.description); } @@ -93,7 +93,7 @@ void ZoneEventScheduler::Process(Zone *zone, WorldContentService *content_servic } if (e.event_type == ServerEvents::EVENT_TYPE_RULE_CHANGE) { - auto params = SplitString(e.event_data, '='); + auto params = Strings::Split(e.event_data, '='); auto rule_key = params[0]; auto rule_value = params[1]; if (!rule_key.empty() && !rule_value.empty()) { diff --git a/zone/zone_store.cpp b/zone/zone_store.cpp index 52eeace3c..1ddcc2e4f 100644 --- a/zone/zone_store.cpp +++ b/zone/zone_store.cpp @@ -40,7 +40,7 @@ uint32 ZoneStore::GetZoneID(const char *in_zone_name) return 0; } - std::string zone_name = str_tolower(in_zone_name); + std::string zone_name = Strings::ToLower(in_zone_name); return GetZoneID(zone_name); } diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index 488efa24a..74d124ae5 100755 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -3,7 +3,7 @@ #include "../common/extprofile.h" #include "../common/item_instance.h" #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "client.h" #include "corpse.h" @@ -1779,8 +1779,8 @@ bool ZoneDatabase::SaveCharacterData(uint32 character_id, uint32 account_id, Pla ")", character_id, // " id, " account_id, // " account_id, " - EscapeString(pp->name).c_str(), // " `name`, " - EscapeString(pp->last_name).c_str(), // " last_name, " + Strings::Escape(pp->name).c_str(), // " `name`, " + Strings::Escape(pp->last_name).c_str(), // " last_name, " pp->gender, // " gender, " pp->race, // " race, " pp->class_, // " class, " @@ -1804,8 +1804,8 @@ bool ZoneDatabase::SaveCharacterData(uint32 character_id, uint32 account_id, Pla pp->ability_number, // " ability_number, " pp->ability_time_minutes, // " ability_time_minutes, " pp->ability_time_hours, // " ability_time_hours, " - EscapeString(pp->title).c_str(), // " title, " - EscapeString(pp->suffix).c_str(), // " suffix, " + Strings::Escape(pp->title).c_str(), // " title, " + Strings::Escape(pp->suffix).c_str(), // " suffix, " pp->exp, // " exp, " pp->points, // " points, " pp->mana, // " mana, " @@ -3437,7 +3437,7 @@ void ZoneDatabase::ListAllInstances(Client* client, uint32 character_id) auto remaining_time = ((start_time + duration) - current_time); if (!never_expires) { if (remaining_time > 0) { - remaining_time_string = ConvertSecondsToTime(remaining_time); + remaining_time_string = Strings::SecondsToTime(remaining_time); } else { remaining_time_string = "Already Expired"; } @@ -4080,7 +4080,7 @@ bool ZoneDatabase::LoadFactionData() LogInfo("[{}] Faction(s) loaded...", faction_ids.size()); - const std::string faction_id_criteria(implode(",", faction_ids)); + const std::string faction_id_criteria(Strings::Implode(",", faction_ids)); // load faction mins/maxes query = fmt::format("SELECT `client_faction_id`, `min`, `max` FROM `faction_base_data` WHERE `client_faction_id` IN ({})", faction_id_criteria); @@ -4238,7 +4238,7 @@ uint32 ZoneDatabase::UpdateCharacterCorpse(uint32 db_id, uint32 char_id, const c "`wc_2` = %u, `wc_3` = %u, `wc_4` = %u, `wc_5` = %u, `wc_6` = %u, " "`wc_7` = %u, `wc_8` = %u, `wc_9` = %u " "WHERE `id` = %u", - EscapeString(char_name).c_str(), zone_id, instance_id, char_id, + Strings::Escape(char_name).c_str(), zone_id, instance_id, char_id, position.x, position.y, position.z, position.w, guild_id, dbpc->locked, dbpc->exp, dbpc->size, dbpc->level, dbpc->race, dbpc->gender, dbpc->class_, dbpc->deity, dbpc->texture, @@ -4315,7 +4315,7 @@ uint32 ZoneDatabase::SaveCharacterCorpse(uint32 charid, const char* charname, ui "`wc_7` = %u, " "`wc_8` = %u, " "`wc_9` = %u ", - EscapeString(charname).c_str(), + Strings::Escape(charname).c_str(), zoneid, instanceid, charid, diff --git a/zone/zoning.cpp b/zone/zoning.cpp index d2a6b439e..1b11e1140 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -19,7 +19,7 @@ #include "../common/global_define.h" #include "../common/eqemu_logsys.h" #include "../common/rulesys.h" -#include "../common/string_util.h" +#include "../common/strings.h" #include "expedition.h" #include "queryserv.h"
ZoneFlag Required
Uptime{}
{}{}