add send_recoverable_notification()

Author: jw098

SerialPrograms/Source/CommonFramework/Exceptions/ScreenshotException.cpp

@@ -85,17 +85,20 @@ std::shared_ptr<const ImageRGB32> ScreenshotException::screenshot() const{
 }
 
 
-void ScreenshotException::send_notification(ProgramEnvironment& env, EventNotificationOption& notification) const{
+void ScreenshotException::send_notification(ProgramEnvironment& env, EventNotificationOption& notification, const std::string& title_prefix) const{
     std::vector<std::pair<std::string, std::string>> embeds;
     if (!m_message.empty()){
         embeds.emplace_back(std::pair<std::string, std::string>("Message:", m_message));
     }
 
+    std::string title = title_prefix;
+    title.append(name());
+
     if (m_send_error_report == ErrorReport::SEND_ERROR_REPORT){
         report_error(
             &env.logger(),
             env.program_info(),
-            name(),
+            title,
             embeds,
             screenshot_view(),
             m_stream ? &m_stream->history() : nullptr
@@ -111,40 +114,26 @@ void ScreenshotException::send_notification(ProgramEnvironment& env, EventNotifi
     );
 }
 
-void ScreenshotException::send_fatal_notification(ProgramEnvironment& env) const{
-    std::vector<std::pair<std::string, std::string>> embeds;
-    if (!m_message.empty()){
-        embeds.emplace_back(std::pair<std::string, std::string>("Message:", m_message));
-    }
-
-    std::string title = "Fatal Error: ";
-    title.append(name());
+void ScreenshotException::send_recoverable_notification(ProgramEnvironment& env) const{
+    EventNotificationOption recoverable_notification = EventNotificationOption(
+        "Program Error (Recoverable)",
+        true, true,
+        ImageAttachmentMode::JPG,
+        {"Notifs"}
+    );    
 
-    if (m_send_error_report == ErrorReport::SEND_ERROR_REPORT){
-        report_error(
-            &env.logger(),
-            env.program_info(),
-            title,
-            embeds,
-            screenshot_view(),
-            m_stream ? &m_stream->history() : nullptr
-        );
-    }
+    send_notification(env, recoverable_notification, "Recoverable Error: ");
+}
 
+void ScreenshotException::send_fatal_notification(ProgramEnvironment& env) const{
     EventNotificationOption fatal_notification = EventNotificationOption(
         "Program Error (Fatal)",
         true, true,
         ImageAttachmentMode::JPG,
         {"Notifs"}
     );
 
-    send_program_notification(
-        env, fatal_notification,
-        color(),
-        name(),
-        std::move(embeds), "",
-        screenshot_view()
-    );
+    send_notification(env, fatal_notification, "Recoverable Error: ");
 }
 
 

SerialPrograms/Source/CommonFramework/Exceptions/ScreenshotException.h

@@ -71,7 +71,8 @@ class ScreenshotException : public Exception{
     std::shared_ptr<const ImageRGB32> screenshot() const;
 
     virtual Color color() const{ return COLOR_RED; }
-    virtual void send_notification(ProgramEnvironment& env, EventNotificationOption& notification) const;
+    virtual void send_notification(ProgramEnvironment& env, EventNotificationOption& notification, const std::string& title_prefix = "") const;
+    void send_recoverable_notification(ProgramEnvironment& env) const;
     void send_fatal_notification(ProgramEnvironment& env) const;
 
 public:

SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp

@@ -796,7 +796,7 @@ bool EggAutonomous::handle_recoverable_error(
             env.console
         );
     }
-    e.send_notification(env, notification);
+    e.send_recoverable_notification(env);
 
     env.log("Reset game to handle recoverable error");
     reset_game(env.program_info(), env.console, context);