From f0a1690c920db261ed4671150525bae86efb81cb Mon Sep 17 00:00:00 2001 From: Akash Mozumdar Date: Tue, 13 Oct 2020 20:19:53 -0600 Subject: [PATCH] fix deepl --- extensions/deepltranslate.cpp | 8 ++++---- extensions/lua.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/extensions/deepltranslate.cpp b/extensions/deepltranslate.cpp index ddc0e80..79fb852 100644 --- a/extensions/deepltranslate.cpp +++ b/extensions/deepltranslate.cpp @@ -56,7 +56,8 @@ std::pair Translate(const std::wstring& text) // the following code was reverse engineered from the DeepL website; it's as close as I could make it but I'm not sure what parts of this could be removed and still have it work int64_t r = _time64(nullptr), n = std::count(text.begin(), text.end(), L'i') + 1; - int id = 10000 * std::uniform_int_distribution(0, 9999)(std::mt19937(std::random_device()())); + thread_local auto generator = std::mt19937(std::random_device()()); + int id = 10000 * std::uniform_int_distribution(0, 9999)(generator); // user_preferred_langs? what should priority be? does timestamp do anything? other translation quality options? auto body = FormatString(R"( { @@ -80,16 +81,15 @@ std::pair Translate(const std::wstring& text) }] } } - )", ++id, r + (n - r % n), translateTo.Copy(), JSON::Escape(text)); + )", id + 1, r + (n - r % n), translateTo.Copy(), JSON::Escape(text)); // missing accept-encoding header since it fucks up HttpRequest - std::wstring headers = L"Host: www2.deepl.com\r\nAccept-Language: en-US,en;q=0.5\r\nContent-type: text/plain; charset=utf-8\r\nOrigin: https://www.deepl.com\r\nTE: Trailers"; if (HttpRequest httpRequest{ L"Mozilla/5.0 Textractor", L"www2.deepl.com", L"POST", L"/jsonrpc", body, - headers.c_str(), + L"Host: www2.deepl.com\r\nAccept-Language: en-US,en;q=0.5\r\nContent-type: application/json; charset=utf-8\r\nOrigin: https://www.deepl.com\r\nTE: Trailers", L"https://www.deepl.com/translator", WINHTTP_FLAG_SECURE }) diff --git a/extensions/lua.cpp b/extensions/lua.cpp index c374527..de79306 100644 --- a/extensions/lua.cpp +++ b/extensions/lua.cpp @@ -83,9 +83,9 @@ private: bool ProcessSentence(std::wstring& sentence, SentenceInfo sentenceInfo) { - thread_local static struct { std::unique_ptr> L{ luaL_newstate() }; operator lua_State*() { return L.get(); } } L; - thread_local static auto _ = (luaL_openlibs(L), luaL_dostring(L, "function ProcessSentence() end")); - thread_local static int revCount = 0; + thread_local struct { std::unique_ptr> L{ luaL_newstate() }; operator lua_State*() { return L.get(); } } L; + thread_local auto _ = (luaL_openlibs(L), luaL_dostring(L, "function ProcessSentence() end")); + thread_local int revCount = 0; if (::revCount > revCount) {