King_DuckZ/kamokan
1
0
Fork 0
mirror of https://github.com/KingDuckZ/kamokan.git synced 2025-08-19 13:29:49 +00:00
Code Issues Releases Wiki Activity

Add pastie_lang mustache when submitting a self-destructing pastie.

Browse source
This commit is contained in:
King_DuckZ 2017-06-18 15:12:22 +01:00
parent 9deaa8a0b8
commit 768aefb596
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/kamokan_impl/submit_paste_response.cpp
View file

@ -101,7 +101,6 @@ namespace kamokan {
using tawashi::ErrorReasons; using tawashi::ErrorReasons;
boost::string_view pastie; boost::string_view pastie;
boost::string_view lang;
boost::string_view duration; boost::string_view duration;
bool self_destruct; bool self_destruct;
@ -112,7 +111,7 @@ namespace kamokan {
try { try {
auto& post = this->cgi_post(); auto& post = this->cgi_post();
pastie = get_value_from_post(post, make_string_view(g_post_key)); pastie = get_value_from_post(post, make_string_view(g_post_key));
lang = get_value_from_post_log_failure(post, make_string_view(g_language_key)); m_pastie_lang = get_value_from_post_log_failure(post, make_string_view(g_language_key));
duration = get_value_from_post_log_failure(post, make_string_view(g_duration_key)); duration = get_value_from_post_log_failure(post, make_string_view(g_duration_key));
self_destruct = string_conv<bool>(get_value_from_post_log_failure(post, make_string_view(g_self_destruct))); self_destruct = string_conv<bool>(get_value_from_post_log_failure(post, make_string_view(g_self_destruct)));
} }
@ -144,15 +143,15 @@ namespace kamokan {
//TODO: replace boost's lexical_cast with mine when I have some checks //TODO: replace boost's lexical_cast with mine when I have some checks
//over invalid inputs //over invalid inputs
const uint32_t duration_int = std::max(std::min((duration.empty() ? 86400U : boost::lexical_cast<uint32_t>(duration)), 2628000U), 1U); const uint32_t duration_int = std::max(std::min((duration.empty() ? 86400U : boost::lexical_cast<uint32_t>(duration)), 2628000U), 1U);
StringOrHeader submit_result = submit_to_storage(pastie, duration_int, lang, self_destruct); StringOrHeader submit_result = submit_to_storage(pastie, duration_int, m_pastie_lang, self_destruct);
const boost::optional<std::string>& token = submit_result.first; const boost::optional<std::string>& token = submit_result.first;
if (token) { if (token) {
m_pastie_token = std::move(*token); m_pastie_token = std::move(*token);
std::ostringstream oss; std::ostringstream oss;
oss << m_pastie_token; oss << m_pastie_token;
if (not lang.empty()) if (not m_pastie_lang.empty())
oss << '?' << lang; oss << '?' << m_pastie_lang;
std::string redirect = oss.str(); std::string redirect = oss.str();
statuslog->info("Pastie token=\"{}\" redirect=\"{}\"", m_pastie_token, redirect); statuslog->info("Pastie token=\"{}\" redirect=\"{}\"", m_pastie_token, redirect);
@ -190,5 +189,6 @@ namespace kamokan {
void SubmitPasteResponse::on_mustache_prepare (mstch::map& parContext) { void SubmitPasteResponse::on_mustache_prepare (mstch::map& parContext) {
parContext["pastie_token"] = std::move(m_pastie_token); parContext["pastie_token"] = std::move(m_pastie_token);
parContext["pastie_lang"] = std::move(m_pastie_lang);
} }
} //namespace kamokan } //namespace kamokan

1
src/kamokan_impl/submit_paste_response.hpp
View file

@ -59,5 +59,6 @@ namespace kamokan {
); );
std::string m_pastie_token; std::string m_pastie_token;
boost::string_view m_pastie_lang;
}; };
} //namespace kamokan } //namespace kamokan