jessica
/
Jupiter-Bot
mirror of https://github.com/JAJames/Jupiter-Bot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update Jupiter submodule; replace HTMLFormResponse usage with deserialize_html_form

master
Jessica James 3 years ago
parent
9171385d70
commit
4c8b5a50a1
4 changed files with 94 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/Jupiter
  2. 107
      src/Plugins/RenX/RenX.Ladder.Web/RenX_Ladder_Web.cpp
  3. 8
      src/Plugins/RenX/RenX.Ladder.Web/RenX_Ladder_Web.h
  4. 27
      src/Plugins/RenX/RenX.ServerList/RenX_ServerList.cpp

2
src/Jupiter

@ -1 +1 @@
Subproject commit 4d39ab456d060ee51bce107a4ab804ac5dacdbe4
Subproject commit f2757f777fdfda434ed5c263244d4cc380cca6a2

107
src/Plugins/RenX/RenX.Ladder.Web/RenX_Ladder_Web.cpp
View File

@ -17,9 +17,9 @@
*/
#include "jessilib/unicode.hpp"
#include "jessilib/http_query.hpp"
#include "Jupiter/IRC_Client.h"
#include "Jupiter/HTTP.h"
#include "Jupiter/HTTP_QueryString.h"
#include "HTTPServer.h"
#include "RenX_Tags.h"
#include "RenX_Ladder_Web.h"
@ -168,7 +168,7 @@ std::string generate_search(RenX::LadderDatabase *db) {
}
/** Database selector */
std::string generate_database_selector(RenX::LadderDatabase *db, const Jupiter::HTTP::HTMLFormResponse& query_params) {
std::string generate_database_selector(RenX::LadderDatabase *db, const query_table_type& query_params) {
std::string result;
result = R"database-select(<form method="get" class="database-select-form"><select name="database" class="database-select">)database-select"sv;
@ -193,8 +193,8 @@ std::string generate_database_selector(RenX::LadderDatabase *db, const Jupiter::
}
}
auto value = query_params.tableFind("id"sv);
if (value != query_params.table.end()) {
auto value = query_params.find("id"sv);
if (value != query_params.end()) {
result += R"html(<input type="hidden" name="id" value=")html"sv;
result += value->second;
result += R"html("/>)html"sv;
@ -287,7 +287,7 @@ std::string RenX_Ladder_WebPlugin::generate_entry_table(RenX::LadderDatabase *db
return result;
}
std::string* RenX_Ladder_WebPlugin::generate_ladder_page(RenX::LadderDatabase *db, uint8_t format, size_t index, size_t count, const Jupiter::HTTP::HTMLFormResponse& query_params) {
std::string* RenX_Ladder_WebPlugin::generate_ladder_page(RenX::LadderDatabase *db, uint8_t format, size_t index, size_t count, const query_table_type& query_params) {
std::string* result = new std::string();
result->reserve(2048);
@ -312,7 +312,7 @@ std::string* RenX_Ladder_WebPlugin::generate_ladder_page(RenX::LadderDatabase *d
// include_header | include_footer | include_any_headers | include_any_footers
/** Search page */
std::string* RenX_Ladder_WebPlugin::generate_search_page(RenX::LadderDatabase *db, uint8_t format, size_t start_index, size_t count, std::string_view name, const Jupiter::HTTP::HTMLFormResponse& query_params) {
std::string* RenX_Ladder_WebPlugin::generate_search_page(RenX::LadderDatabase *db, uint8_t format, size_t start_index, size_t count, std::string_view name, const query_table_type& query_params) {
std::string* result = new std::string();
result->reserve(2048);
@ -361,7 +361,7 @@ std::string* RenX_Ladder_WebPlugin::generate_search_page(RenX::LadderDatabase *d
}
/** Profile page */
std::string* RenX_Ladder_WebPlugin::generate_profile_page(RenX::LadderDatabase *db, uint8_t format, uint64_t steam_id, const Jupiter::HTTP::HTMLFormResponse& query_params) {
std::string* RenX_Ladder_WebPlugin::generate_profile_page(RenX::LadderDatabase *db, uint8_t format, uint64_t steam_id, const query_table_type& query_params) {
std::string* result = new std::string();
result->reserve(2048);
@ -426,7 +426,7 @@ std::string* RenX_Ladder_WebPlugin::generate_profile_page(RenX::LadderDatabase *
/** Content functions */
std::string* generate_no_db_page(const Jupiter::HTTP::HTMLFormResponse& query_params) {
std::string* generate_no_db_page(const query_table_type& query_params) {
std::string* result = new std::string(pluginInstance.header);
if (RenX::ladder_databases.size() != 0) {
result->append(generate_search(nullptr));
@ -440,18 +440,43 @@ std::string* generate_no_db_page(const Jupiter::HTTP::HTMLFormResponse& query_pa
return result;
}
std::pair<std::string, query_table_type> parse_query_string(std::string_view in_query_string) {
std::pair<std::string, query_table_type> result;
result.first = in_query_string;
jessilib::deserialize_html_form(result.second, result.first);
return result;
}
std::string_view get_table_value(const query_table_type& in_table, std::string_view key, std::string_view in_default_result = {}) {
auto value = in_table.find(key);
if (value != in_table.end()) {
return value->second;
}
return in_default_result;
}
template<typename OutT>
OutT from_table_value(const query_table_type& in_table, std::string_view key, OutT in_default_result) {
auto value = get_table_value(in_table, key, {});
if (!value.empty()) {
return Jupiter::from_string<OutT>(value);
}
return in_default_result;
}
std::string* handle_ladder_page(std::string_view query_string) {
Jupiter::HTTP::HTMLFormResponse html_form_response(query_string);
auto parsed_query = parse_query_string(query_string);
auto& table = parsed_query.second;
RenX::LadderDatabase *db = RenX::default_ladder_database;
size_t start_index = 0, count = pluginInstance.getEntriesPerPage();
uint8_t format = 0xFF;
if (html_form_response.table.size() != 0) {
format = html_form_response.tableGetCast<uint8_t>("format"sv, format);
start_index = html_form_response.tableGetCast<size_t>("start"sv, start_index);
count = html_form_response.tableGetCast<size_t>("count"sv, count);
if (table.size() != 0) {
format = from_table_value<uint8_t>(table, "format"sv, format);
start_index = from_table_value<size_t>(table, "start"sv, start_index);
count = from_table_value<size_t>(table, "count"sv, count);
std::string_view db_name = html_form_response.tableGet("database"sv, {});
std::string_view db_name = get_table_value(table, "database"sv, {});
if (!db_name.empty()) {
db = nullptr;
for (const auto& database : RenX::ladder_databases) {
@ -463,26 +488,28 @@ std::string* handle_ladder_page(std::string_view query_string) {
}
}
if (db == nullptr)
return generate_no_db_page(html_form_response);
if (db == nullptr) {
return generate_no_db_page(table);
}
return pluginInstance.generate_ladder_page(db, format, start_index, count, html_form_response);
return pluginInstance.generate_ladder_page(db, format, start_index, count, table);
}
std::string* handle_search_page(std::string_view query_string) {
Jupiter::HTTP::HTMLFormResponse html_form_response(query_string);
auto parsed_query = parse_query_string(query_string);
auto& table = parsed_query.second;
RenX::LadderDatabase *db = RenX::default_ladder_database;
uint8_t format = 0xFF;
size_t start_index = 0, count = pluginInstance.getEntriesPerPage();
std::string_view name;
if (html_form_response.table.size() != 0) {
format = html_form_response.tableGetCast<uint8_t>("format"sv, format);
start_index = html_form_response.tableGetCast<size_t>("start"sv, start_index);
count = html_form_response.tableGetCast<size_t>("count"sv, count);
name = html_form_response.tableGet("name"sv, name);
if (!table.empty()) {
format = from_table_value<uint8_t>(table, "format"sv, format);
start_index = from_table_value<size_t>(table, "start"sv, start_index);
count = from_table_value<size_t>(table, "count"sv, count);
name = get_table_value(table, "name"sv, name);
std::string_view db_name = html_form_response.tableGet("database"sv, {});
std::string_view db_name = get_table_value(table, "database"sv, {});
if (!db_name.empty()) {
db = nullptr;
for (const auto& database : RenX::ladder_databases) {
@ -494,27 +521,29 @@ std::string* handle_search_page(std::string_view query_string) {
}
}
if (db == nullptr)
return generate_no_db_page(html_form_response);
if (db == nullptr) {
return generate_no_db_page(table);
}
if (name.size() < pluginInstance.getMinSearchNameLength()) // Generate ladder page when no name specified
if (name.size() < pluginInstance.getMinSearchNameLength()) { // Generate ladder page when no name specified
return handle_ladder_page(query_string);
}
return pluginInstance.generate_search_page(db, format, start_index, count, name, html_form_response);
return pluginInstance.generate_search_page(db, format, start_index, count, name, table);
}
std::string* handle_profile_page(std::string_view query_string) {
Jupiter::HTTP::HTMLFormResponse html_form_response(query_string);
auto parsed_query = parse_query_string(query_string);
auto& table = parsed_query.second;
RenX::LadderDatabase *db = RenX::default_ladder_database;
uint64_t steam_id = 0;
uint8_t format = 0xFF;
if (html_form_response.table.size() != 0)
{
format = html_form_response.tableGetCast<uint8_t>("format"sv, format);
steam_id = html_form_response.tableGetCast<uint64_t>("id"sv, steam_id);
if (!table.empty()) {
format = from_table_value<uint8_t>(table, "format"sv, format);
steam_id = from_table_value<uint64_t>(table, "id"sv, steam_id);
std::string_view db_name = html_form_response.tableGet("database"sv, {});
std::string_view db_name = get_table_value(table, "database"sv, {});
if (!db_name.empty()) {
db = nullptr;
for (const auto& database : RenX::ladder_databases) {
@ -526,13 +555,13 @@ std::string* handle_profile_page(std::string_view query_string) {
}
}
if (db == nullptr)
return generate_no_db_page(html_form_response);
if (db == nullptr) {
return generate_no_db_page(table);
}
return pluginInstance.generate_profile_page(db, format, steam_id, html_form_response);
return pluginInstance.generate_profile_page(db, format, steam_id, table);
}
extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin()
{
extern "C" JUPITER_EXPORT Jupiter::Plugin *getPlugin() {
return &pluginInstance;
}

8
src/Plugins/RenX/RenX.Ladder.Web/RenX_Ladder_Web.h
View File

@ -22,6 +22,8 @@
#include "Jupiter/Plugin.h"
#include "RenX_Plugin.h"
using query_table_type = std::unordered_map<std::string_view, std::string_view, jessilib::text_hash, jessilib::text_equal>;
class RenX_Ladder_WebPlugin : public RenX::Plugin
{
protected:
@ -37,9 +39,9 @@ public:
std::string header;
std::string footer;
std::string* generate_ladder_page(RenX::LadderDatabase *db, uint8_t format, size_t start_index, size_t count, const Jupiter::HTTP::HTMLFormResponse& query_params);
std::string* generate_search_page(RenX::LadderDatabase *db, uint8_t format, size_t start_index, size_t count, std::string_view name, const Jupiter::HTTP::HTMLFormResponse& query_params);
std::string* generate_profile_page(RenX::LadderDatabase *db, uint8_t format, uint64_t steam_id, const Jupiter::HTTP::HTMLFormResponse& query_params);
std::string* generate_ladder_page(RenX::LadderDatabase *db, uint8_t format, size_t start_index, size_t count, const query_table_type& query_params);
std::string* generate_search_page(RenX::LadderDatabase *db, uint8_t format, size_t start_index, size_t count, std::string_view name, const query_table_type& query_params);
std::string* generate_profile_page(RenX::LadderDatabase *db, uint8_t format, uint64_t steam_id, const query_table_type& query_params);
inline size_t getEntriesPerPage() const { return this->entries_per_page; }
inline size_t getMinSearchNameLength() const { return this->min_search_name_length; };

27
src/Plugins/RenX/RenX.ServerList/RenX_ServerList.cpp
View File

@ -16,11 +16,12 @@
* Written by Jessica James <jessica.aj@outlook.com>
*/
#include <charconv>
#include "jessilib/split.hpp"
#include "jessilib/unicode.hpp"
#include "jessilib/http_query.hpp"
#include "Jupiter/IRC_Client.h"
#include "Jupiter/HTTP.h"
#include "Jupiter/HTTP_QueryString.h"
#include "HTTPServer.h"
#include "RenX_Core.h"
#include "RenX_Server.h"
@ -666,20 +667,32 @@ std::string* handle_server_list_long_page(std::string_view) {
return server_list_long_json;
}
using query_table_type = std::unordered_map<std::string_view, std::string_view, jessilib::text_hash, jessilib::text_equal>;
std::pair<std::string, query_table_type> parse_query_string(std::string_view in_query_string) {
std::pair<std::string, query_table_type> result;
result.first = in_query_string;
jessilib::deserialize_html_form(result.second, result.first);
return result;
}
std::string* handle_server_page(std::string_view query_string) {
Jupiter::HTTP::HTMLFormResponse html_form_response(query_string);
std::string parsed_query_string{ query_string };
std::unordered_map<std::string_view, std::string_view, jessilib::text_hash, jessilib::text_equal> table;
jessilib::deserialize_html_form(table, parsed_query_string);
std::string_view address;
int port = 0;
unsigned short port = 0;
RenX::Server *server;
// parse form data
if (html_form_response.table.size() < 2)
if (table.size() < 2) {
return new std::string();
}
if (html_form_response.table.size() != 0) {
address = html_form_response.tableGet("ip"sv, address);
port = html_form_response.tableGetCast<int>("port"sv, port);
if (table.size() != 0) {
address = table["ip"sv];
std::string_view port_str = table["port"sv];
std::from_chars(port_str.data(), port_str.data() + port_str.size(), port, 10);
}
// search for server

Write Preview
Loading…
Cancel
Save