diff --git a/src/client/spark/Modules/Support/SupportShellModule.cs b/src/client/spark/Modules/Support/SupportShellModule.cs index e4b5246de..86b551e12 100644 --- a/src/client/spark/Modules/Support/SupportShellModule.cs +++ b/src/client/spark/Modules/Support/SupportShellModule.cs @@ -39,7 +39,7 @@ namespace bts.shell { //SparkCommands.ShowManual, //SparkCommands.ShowAuditLogs, //SparkCommands.ShowDiagnostics, - SparkCommands.ShowReportIssue.complete("Create Support Ticket"), + SparkCommands.ShowReportIssue.complete("Created from launcher"), SparkCommands.ShowAboutSpark, SparkCommands.ShowActivityLog }; diff --git a/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs b/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs index f91441b78..b0c62e386 100644 --- a/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs +++ b/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs @@ -60,6 +60,7 @@ namespace bts.view.controls { } var reply = await _service.send_report_async(_base.with( user_description: _text.Value, + contact: user_contact, log: include_logs ? Logger.read_logs() : "", image: screenshot )); diff --git a/src/lib/api/services/ErrorReportService.proto b/src/lib/api/services/ErrorReportService.proto index 1b6652971..d85ec4e4c 100644 --- a/src/lib/api/services/ErrorReportService.proto +++ b/src/lib/api/services/ErrorReportService.proto @@ -12,6 +12,7 @@ message ErrorReport { string error_message = 5; string log = 6; bytes image = 7; + string contact = 8; } message ErrorResponse { } diff --git a/src/server/sparkd/Support/ErrorReportService.cpp b/src/server/sparkd/Support/ErrorReportService.cpp index a0d1d2f9c..34547101c 100644 --- a/src/server/sparkd/Support/ErrorReportService.cpp +++ b/src/server/sparkd/Support/ErrorReportService.cpp @@ -15,7 +15,7 @@ namespace bts { namespace support { std::string get_report_dir() { - return config::get().data_path() + "error_reports"; + return config::get().data_path() + "error_reports/"; } ErrorReportServer::ErrorReportServer(bts::api::ServiceContext& context) : @@ -37,6 +37,7 @@ void ErrorReportServer::send_report( auto dt = datetime::local_now(); auto dir_name = request.user() + "-" + datetime::FIX_timestamp(dt); dir_name = os::sanitize_file_name(dir_name); + dir_name = get_report_dir() + dir_name; // create directory with that name boost::filesystem::create_directories(dir_name); @@ -47,11 +48,11 @@ void ErrorReportServer::send_report( std::ofstream file; file.open(dir_name + "/user_text.txt"); if (file.is_open()) { - file << request.user() << std::endl; - file << request.user_description() << std::endl; + file << request.user() << " - " << request.contact() << std::endl; file << "================" << std::endl; - file << request.error_title() << std::endl; - file << request.error_message() << std::endl; + file << "Error Description: " << request.error_message() << std::endl; + file << "================" << std::endl; + file << "User Description: " << request.user_description() << std::endl; file.close(); } // logs.txt @@ -72,7 +73,7 @@ void ErrorReportServer::send_report( } // log error for visibility - LOG(Gen, Error, "Support request from {} - {}\n {}", request.user(), request.error_title(), request.error_message()); + LOG(Gen, Error, "Support request from {} - {} \n{}", request.user(), request.contact(), request.user_description()); ErrorResponse r; reply(r);