pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 04:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Strings] Refactor Strings Usage (#2305)

Browse Source 
* 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
This commit is contained in:
Chris Miles
2022-07-14 02:10:52 -05:00
committed by GitHub
parent 44c85a0dd7
commit dfd8f84cac
573 changed files with 5197 additions and 5137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/repositories/base/base_object_repository.h
+19 -19
View File
@@ -13,7 +13,7 @@
#define EQEMU_BASE_OBJECT_REPOSITORY_H
#include "../../database.h"
#include "../../string_util.h"
#include "../../strings.h"
#include <ctime>
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<std::string> insert_values;
@@ -442,7 +442,7 @@ public:
fmt::format(
"{} VALUES {}",
BaseInsert(),
implode(",", insert_chunks)
Strings::Implode(",", insert_chunks)
)
);