wrapper functions for accessing fields as boolean or number

Author: braindigitalis

include/ssod/database.h

@@ -22,6 +22,7 @@
 #include <map>
 #include <string>
 #include <variant>
+#include <ssod/ssod.h>
 #include <dpp/dpp.h>
 
 /**
@@ -45,6 +46,14 @@ namespace db {
 			}
 		}
 
+		[[nodiscard]] inline long number(const std::string& index) const {
+			return atol(at(index));
+		}
+
+		[[nodiscard]] inline bool boolean(const std::string& index) const {
+			return number(index);
+		}
+
 		inline void emplace(const std::string& k, const std::string& v) {
 			fields.emplace(k, v);
 		}

include/ssod/paragraph.h

@@ -294,23 +294,6 @@ struct paragraph {
 	dpp::task<void> parse(player& current_player, dpp::snowflake user_id);
 };
 
-/**
- * Extract the next string value from a key/value list, e.g.
- * if the string contains 'NAME="Big Monster"' this will return
- * Big Monster.
- * @param p_text text to extract from
- * @return extracted string
- */
-std::string extract_value(const std::string& p_text);
-
-/**
- * Extract the next numeric value from a key/value list, e.g.
- * if the string contains 'A="1"' this will return 1.
- * @param p_text text to extract from
- * @return extracted number
- */
-long extract_value_number(const std::string& p_text);
-
 /**
  * Returns true if a global flag is set
  * @param flag flag name

include/ssod/parser.h

@@ -88,3 +88,5 @@ struct parse_end_exception : public std::exception {
 };
 
 dpp::task<bool> route_tag(paragraph& p, std::string& p_text, std::stringstream& paragraph_content, std::stringstream& output, player& current_player, bool display);
+
+std::unordered_map<std::string, std::string> parse_attributes(std::stringstream& ss);

src/campfire.cpp

@@ -83,8 +83,8 @@ dpp::task<void> campfire(const dpp::interaction_create_t& event, player p) {
 			}
 		}
 		content << sprite::rawmeat.get_mention() << " ";
-		if (stack.at("qty") != "1") {
-			content << stack.at("qty") << "x ";
+		if (stack.number("qty") != 1) {
+			content << stack.number("qty") << "x ";
 		}
 		content << item << "\n";
 	}

src/combat.cpp

@@ -659,8 +659,8 @@ dpp::task<void> continue_combat(const dpp::interaction_create_t& event, player p
 	long banked{0};
 	bool critical{};
 	if (!r.empty()) {
-		long counter = atol(r[0].at("critical_counter"));
-		banked = atol(r[0].at("banked_criticals"));
+		long counter = r[0].number("critical_counter");
+		banked = r[0].number("banked_criticals");
 		if (banked > 0 && p.next_crit) {
 			co_await db::co_query("UPDATE criticals SET banked_criticals = banked_criticals - 1 WHERE user_id = ?", {event.command.usr.id});
 			critical = true;
@@ -764,10 +764,10 @@ dpp::task<void> continue_combat(const dpp::interaction_create_t& event, player p
 				long increment = std::min(std::max(1L, p.luck + 1), 12L);
 				co_await db::co_query("INSERT INTO criticals (user_id, critical_counter, banked_criticals) VALUES(?,1,0) ON DUPLICATE KEY UPDATE critical_counter = critical_counter + ?", {event.command.usr.id, increment});
 				auto r = co_await db::co_query("SELECT * FROM criticals WHERE user_id = ?", {event.command.usr.id});
-				long counter = atol(r[0].at("critical_counter"));
+				long counter = r[0].number("critical_counter");
 				if (counter > 1000 + (p.get_level() * 4)) {
 					/* User gains a new banked critical */
-					long new_banked = atol(r[0].at("banked_criticals")) + 1;
+					long new_banked = r[0].number("banked_criticals") + 1;
 					if (new_banked <= p.max_crits()) {
 						co_await db::co_query("UPDATE criticals SET critical_counter = 0, banked_criticals = ? WHERE user_id = ?", {new_banked, event.command.usr.id});
 					} else {

src/commands/profile.cpp

@@ -53,7 +53,7 @@ dpp::task<void> profile_command::route(const dpp::slashcommand_t &event)
 		event.reply(dpp::message(tr(self ? "NOPROFILE" : "NOSUCHUSER", event)).set_flags(dpp::m_ephemeral));
 		co_return;
 	}
-	p.experience = atol(rs[0].at("experience"));
+	p.experience = rs[0].number("experience");
 	auto g = co_await db::co_query("SELECT * FROM guild_members JOIN guilds ON guild_id = guilds.id WHERE user_id = ?", {rs[0].at("user_id")});
 	auto status = co_await db::co_query("SELECT passive_effect_status.*, on_end, on_after, type, requirements, duration, withdrawl FROM passive_effect_status join passive_effect_types on passive_effect_id = passive_effect_types.id where user_id = ?", {rs[0].at("user_id")});
 	std::stringstream effects;
@@ -82,7 +82,7 @@ dpp::task<void> profile_command::route(const dpp::slashcommand_t &event)
 		content += "\n\n**" + tr("GUILD", event) + ":** " + dpp::utility::markdown_escape(g[0].at("name"));
 	}
 
-	player p2(atol(rs[0].at("user_id")), false);
+	player p2(rs[0].number("user_id"), false);
 
 	std::string file = matrix_image((player_race)atoi(rs[0].at("race")), (player_profession)atoi(rs[0].at("profession")), rs[0].at("gender") == "male");
 

src/game.cpp

@@ -1491,7 +1491,7 @@ dpp::task<void> continue_game(const dpp::interaction_create_t& event, player p,
 		std::string list_others, list_dropped, text;
 		for (const auto & other : others) {
 			list_others += dpp::utility::markdown_escape(other.at("name"), true);
-			if (other.at("is_npc") == "1") {
+			if (other.boolean("is_npc")) {
 				list_others += " *" + tr("NPC", event) + "*";
 				has_npcs_here = true;
 			} else {

src/game_util.cpp

@@ -61,10 +61,10 @@ dpp::task<sale_info> get_sale_info(const std::string& name) {
 			}
 		}
 	} else {
-		value = atol(res[0].at("value"));
-		sellable = res[0].at("sellable") == "1";
+		value = res[0].number("value");
+		sellable = res[0].boolean("sellable");
 		flags = res[0].at("flags");
-		qi = res[0].at("quest_item") == "1";
+		qi = res[0].boolean("quest_item");
 	}
 	co_return sale_info{
 		.flags = flags,
@@ -222,5 +222,5 @@ spell_info get_spell_info(const std::string& name) {
 	if (rs.empty()) {
 		return {};
 	}
-	return { .name = rs[0].at("name"), .component_herb = rs[0].at("herb"), .combat_rating = atol(rs[0].at("combat_rating")), .mana_cost = atol(rs[0].at("mana_cost")) };
+	return { .name = rs[0].at("name"), .component_herb = rs[0].at("herb"), .combat_rating = rs[0].number("combat_rating"), .mana_cost = rs[0].number("mana_cost") };
 }

src/paragraph.cpp

@@ -112,30 +112,6 @@ dpp::task<bool> paragraph::valid_next(long current, long next) {
 	co_return paralist.find(next) != paralist.end();
 }
 
-// extracts a value from any NAME="Value" pair
-std::string extract_value(const std::string& p_text) {
-	if (p_text.find("\"") == std::string::npos) {
-		return extract_without_quotes(p_text);
-	}
-	std::string item_name;
-	bool copying{false};
-	for (const char c : p_text) {
-		if (c == '"') {
-			copying = !copying;
-			continue;
-		}
-		if (copying) {
-			item_name += c;
-		}
-	}
-	return item_name;
-}
-
-long extract_value_number(const std::string& p_text)
-{
-	return atol(extract_value(p_text));
-}
-
 dpp::task<bool> global_set(const std::string& flag) {
 	co_return !(co_await db::co_query("SELECT flag FROM game_global_flags WHERE flag = ?", {flag})).empty();
 }
@@ -177,10 +153,10 @@ dpp::task<void> paragraph::parse(player& current_player, dpp::snowflake user_id)
 			text = location[0].at("data");
 		}
 		secure_id = location[0].at("secure_id");
-		combat_disabled = location[0].at("combat_disabled") == "1";
-		magic_disabled = location[0].at("magic_disabled") == "1";
-		theft_disabled = location[0].at("theft_disabled") == "1";
-		chat_disabled = location[0].at("chat_disabled") == "1";
+		combat_disabled = location[0].boolean("combat_disabled");
+		magic_disabled = location[0].boolean("magic_disabled");
+		theft_disabled = location[0].boolean("theft_disabled");
+		chat_disabled = location[0].boolean("chat_disabled");
 		auto dropped = co_await db::co_query("SELECT item_desc, item_flags, count(item_desc) as stack_count FROM game_dropped_items WHERE location_id = ? GROUP BY item_desc, item_flags ORDER BY item_desc, item_flags LIMIT 50", {paragraph_id});
 		for (const auto &dropped_item: dropped) {
 			dropped_items.push_back(stacked_item{.name = dropped_item.at("item_desc"), .flags = dropped_item.at("item_flags"), .qty = atol(dropped_item.at("stack_count"))});

src/parser.cpp

@@ -49,3 +49,52 @@ dpp::task<bool> route_tag(paragraph& p, std::string& p_text, std::stringstream&
 	}
 	co_return false;
 }
+
+std::unordered_map<std::string, std::string> parse_attributes(std::stringstream& ss) {
+	std::unordered_map<std::string, std::string> attributes;
+	std::string token;
+
+	while (ss >> token) {
+		if (token == ">") {
+			break;
+		}
+
+		bool ends_with_gt = false;
+		if (!token.empty() && token.back() == '>') {
+			ends_with_gt = true;
+			token.pop_back(); // remove '>'
+		}
+
+		auto eq_pos = token.find('=');
+		if (eq_pos == std::string::npos) {
+			attributes[dpp::lowercase(token)] = "";
+		} else {
+			std::string key = token.substr(0, eq_pos);
+			std::string value = token.substr(eq_pos + 1);
+
+			if (!value.empty() && value[0] == '"') {
+				std::string quoted = value;
+				if (quoted.back() != '"') {
+					std::string fragment;
+					while (ss >> fragment) {
+						quoted += ' ' + fragment;
+						if (!fragment.empty() && fragment.back() == '"') {
+							break;
+						}
+					}
+				}
+				if (quoted.size() >= 2 && quoted.front() == '"' && quoted.back() == '"') {
+					value = quoted.substr(1, quoted.size() - 2);
+				}
+			}
+
+			attributes[dpp::lowercase(key)] = value;
+		}
+
+		if (ends_with_gt) {
+			break;
+		}
+	}
+
+	return attributes;
+}