From dfefeae35372bcd3989af40a84ab0aee043b2abd Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Sat, 4 Jan 2025 14:03:03 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=B8=8A=E6=8A=A5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=20User-Agent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp | 12 ++++++++++++ .../Fight/StageQueueMissionCompletedTaskPlugin.cpp | 12 ++++++++++++ src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp b/src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp index ef2f9546b4..19d917f590 100644 --- a/src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp +++ b/src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp @@ -370,6 +370,18 @@ bool asst::StageDropsTaskPlugin::upload_to_server(const std::string& subtask, Re extra_headers.insert({ "authorization", "PenguinID " + m_penguin_id }); } + std::string version = Version; + if (version.find("DEBUG VERSION") != std::string::npos) { + version = "dev"; + } + else if (!version.empty() && version[0] == 'v') { + version.erase(0, 1); + } + + version.erase(ranges::remove(version, ' ').begin(), version.end()); + + extra_headers.insert({ "User-Agent", std::string("MaaAssistantArknights/") + version + " cpr/" + CPR_VERSION }); + std::shared_ptr report_task_ptr; if (report_type == ReportType::PenguinStats) { if (!m_report_penguin_task_ptr) { diff --git a/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp b/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp index efefdad775..20864a2bc3 100644 --- a/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp +++ b/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp @@ -211,6 +211,18 @@ void asst::StageQueueMissionCompletedTaskPlugin::upload_to_penguin(std::string s extra_headers.insert({ "authorization", "PenguinID " + m_penguin_id }); } + std::string version = Version; + if (version.find("DEBUG VERSION") != std::string::npos) { + version = "dev"; + } + else if (!version.empty() && version[0] == 'v') { + version.erase(0, 1); + } + + version.erase(ranges::remove(version, ' ').begin(), version.end()); + + extra_headers.insert({ "User-Agent", std::string("MaaAssistantArknights/") + version + " cpr/" + CPR_VERSION }); + if (!m_report_penguin_task_ptr) { m_report_penguin_task_ptr = std::make_shared(report_penguin_callback, this); } diff --git a/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp b/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp index 7ec46a25ae..cec6e827ca 100644 --- a/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp @@ -933,6 +933,18 @@ void asst::AutoRecruitTask::upload_to_penguin(Rng&& tags) extra_headers = { { "authorization", "PenguinID " + m_penguin_id } }; } + std::string version = Version; + if (version.find("DEBUG VERSION") != std::string::npos) { + version = "dev"; + } + else if (!version.empty() && version[0] == 'v') { + version.erase(0, 1); + } + + version.erase(ranges::remove(version, ' ').begin(), version.end()); + + extra_headers.insert({ "User-Agent", std::string("MaaAssistantArknights/") + version + " cpr/" + CPR_VERSION }); + if (!m_report_penguin_task_ptr) { m_report_penguin_task_ptr = std::make_shared(report_penguin_callback, this); }