Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change slashcommand json serialization #19

Merged
merged 1 commit into from
May 17, 2021
Merged

Change slashcommand json serialization #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 48 additions & 18 deletions include/dpp/slashcommand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* D++, A Lightweight C++ library for Discord
*
* Copyright 2021 Craig Edwards and D++ contributors
* Copyright 2021 Craig Edwards and D++ contributors
* (https://github.com/brainboxdotcc/DPP/graphs/contributors)
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -74,13 +74,23 @@ struct command_option_choice {

/**
* @brief Construct a new command option choice object
*
*
* @param n name to initialise with
* @param v value to initialise with
*/
command_option_choice(const std::string &n, command_value v);
};

/**
* @brief helper function to serialize a command_option_choice to json
*
* @see https://github.com/nlohmann/json#arbitrary-types-conversions
*
* @param j output json object
* @param choice command_option_choice to be serialized
*/
void to_json(nlohmann::json& j, const command_option_choice& choice);

/**
* @brief Each command option is a command line parameter.
* It can have a type (see dpp::command_option_type), a name,
Expand All @@ -104,7 +114,7 @@ struct command_option {

/**
* @brief Construct a new command option object
*
*
* @param t Option type
* @param name Option name
* @param description Option description
Expand All @@ -114,21 +124,31 @@ struct command_option {

/**
* @brief Add a multiple choice option
*
*
* @param o choice to add
* @return command_option& returns a reference to self for chaining of calls
*/
command_option& add_choice(const command_option_choice &o);

/**
* @brief Add a sub-command option
*
*
* @param o Sub-command option to add
* @return command_option& return a reference to self for chaining of calls
*/
command_option& add_option(const command_option &o);
};

/**
* @brief helper function to serialize a command_option to json
*
* @see https://github.com/nlohmann/json#arbitrary-types-conversions
*
* @param j output json object
* @param opt command_option to be serialized
*/
void to_json(nlohmann::json& j, const command_option& opt);

/**
* @brief Response types when responding to an interaction within on_interaction_create.
* Do not use ir_acknowledge or ir::channel_message, as these are deprecated in the
Expand All @@ -145,11 +165,11 @@ enum interaction_response_type {
/**
* @brief A response to an interaction, used to reply to a command and initiate
* a message, which can be hidden from others (ephemeral) or visible to all.
*
*
* The dpp::interaction_response object wraps a dpp::message object. To set the
* message as 'ephemeral' (e.g. only the command issuer can see it) you should
* add the dpp::m_ephemeral flag to the dpp::message::flags field. e.g.:
*
*
* `mymessage.flags |= dpp::m_ephemeral;`
*/
struct interaction_response {
Expand All @@ -174,23 +194,23 @@ struct interaction_response {

/**
* @brief Construct a new interaction response object
*
*
* @param t Type of reply
* @param m Message to reply with
*/
interaction_response(interaction_response_type t, const struct message& m);

/**
* @brief Fill object properties from JSON
*
*
* @param j JSON to fill from
* @return interaction_response& Reference to self
*/
interaction_response& fill_from_json(nlohmann::json* j);

/**
* @brief Build a json string for this object
*
*
* @return std::string JSON string
*/
std::string build_json() const;
Expand Down Expand Up @@ -268,15 +288,15 @@ class interaction : public managed {

/**
* @brief Fill object properties from JSON
*
*
* @param j JSON to fill from
* @return interaction& Reference to self
*/
interaction& fill_from_json(nlohmann::json* j);

/**
* @brief Build a json string for this object
*
*
* @param with_id True if to include the ID in the JSON
* @return std::string JSON string
*/
Expand Down Expand Up @@ -322,53 +342,63 @@ class slashcommand : public managed {

/**
* @brief Add an option (parameter)
*
*
* @param o option (parameter) to add
* @return slashcommand& reference to self for chaining of calls
*/
slashcommand& add_option(const command_option &o);

/**
* @brief Set the name of the command
*
*
* @param n name of command
* @return slashcommand& reference to self for chaining of calls
*/
slashcommand& set_name(const std::string &n);

/**
* @brief Set the description of the command
*
*
* @param d description
* @return slashcommand& reference to self for chaining of calls
*/
slashcommand& set_description(const std::string &d);

/**
* @brief Set the application id of the command
*
*
* @param i application id
* @return slashcommand& reference to self for chaining of calls
*/
slashcommand& set_application_id(snowflake i);

/**
* @brief Fill object properties from JSON
*
*
* @param j JSON to fill from
* @return slashcommand& Reference to self
*/
slashcommand& fill_from_json(nlohmann::json* j);

/**
* @brief Build a json string for this object
*
*
* @param with_id True if to include the ID in the JSON
* @return std::string JSON string
*/
std::string build_json(bool with_id = false) const;
};

/**
* @brief helper function to serialize a slashcommand to json
*
* @see https://github.com/nlohmann/json#arbitrary-types-conversions
*
* @param j output json object
* @param cmd slashcommand to be serialized
*/
void to_json(nlohmann::json& j, const slashcommand& cmd);

/**
* @brief A group of application slash commands
*/
Expand Down
121 changes: 56 additions & 65 deletions src/dpp/slashcommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* D++, A Lightweight C++ library for Discord
*
* Copyright 2021 Craig Edwards and D++ contributors
* Copyright 2021 Craig Edwards and D++ contributors
* (https://github.com/brainboxdotcc/DPP/graphs/contributors)
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -28,84 +28,77 @@ namespace dpp {

using json = nlohmann::json;

slashcommand::slashcommand() : managed()
slashcommand::slashcommand() : managed()
{
}

slashcommand::~slashcommand() {
}



slashcommand& slashcommand::fill_from_json(nlohmann::json* j) {
id = SnowflakeNotNull(j, "id");
return *this;
}

std::string slashcommand::build_json(bool with_id) const {
json j;
if (with_id) {
j["id"] = std::to_string(id);
void to_json(json& j, const command_option_choice& choice) {
j["name"] = choice.name;
if (std::holds_alternative<uint32_t>(choice.value)) {
j["value"] = std::get<uint32_t>(choice.value);
} else if (std::holds_alternative<bool>(choice.value)) {
j["value"] = std::get<bool>(choice.value);
} else if (std::holds_alternative<snowflake>(choice.value)) {
j["value"] = std::to_string(std::get<uint64_t>(choice.value));
} else {
j["value"] = std::get<std::string>(choice.value);
}
j["name"] = name;
j["description"] = description;
if (options.size()) {
}

void to_json(json& j, const command_option& opt) {
j["name"] = opt.name;
j["description"] = opt.description;
j["type"] = opt.type;
j["required"] = opt.required;

if (opt.options.size()) {
j["options"] = json();
json& o = j["options"];
for (auto & opt : options) {
json n;
n["name"] = opt.name;
n["description"] = opt.description;
n["type"] = opt.type;
n["required"] = opt.required;

if (opt.choices.size()) {
n["choices"] = json();
json &c = n["choices"];
for (auto & choice : opt.choices) {
json t;
t["name"] = choice.name;
if (std::holds_alternative<uint32_t>(choice.value)) {
t["value"] = std::get<uint32_t>(choice.value);
} else {
t["value"] = std::get<std::string>(choice.value);
}
c.push_back(t);
}
}

if (opt.options.size()) {
n["options"] = json();
json &c = n["options"];
for (auto & subcommand : opt.options) {
json o;
o["name"] = opt.name;
o["description"] = opt.description;
o["type"] = opt.type;
o["required"] = opt.required;
if (opt.choices.size()) {
o["choices"] = json();
json &v = o["choices"];
for (auto & choice : opt.choices) {
v["name"] = choice.name;
if (std::holds_alternative<uint32_t>(choice.value)) {
v["value"] = std::get<uint32_t>(choice.value);
} else if (std::holds_alternative<bool>(choice.value)) {
v["value"] = std::get<bool>(choice.value);
} else if (std::holds_alternative<snowflake>(choice.value)) {
v["value"] = std::to_string(std::get<uint64_t>(choice.value));
} else {
v["value"] = std::get<std::string>(choice.value);
}
}
v.push_back(o);
}
c.push_back(n);
}
}
o.push_back(n);
for (const auto& opt : opt.options) {
json jopt = opt;
j["options"].push_back(jopt);
}
}

if (opt.choices.size()) {
j["choices"] = json();

for (const auto& choice : opt.choices) {
json jchoice = choice;
j["choices"].push_back(jchoice);
}
}
}

void to_json(json& j, const slashcommand& p) {
j["name"] = p.name;
j["description"] = p.description;

if (p.options.size()) {
j["options"] = json();

for (const auto& opt : p.options) {
json jopt = opt;
j["options"].push_back(jopt);
}
}
}

std::string slashcommand::build_json(bool with_id) const {
json j = *this;

if (with_id) {
j["id"] = std::to_string(id);
}

return j.dump();
}

Expand Down Expand Up @@ -249,6 +242,4 @@ std::string interaction_response::build_json() const {
return j.dump();
}


};