Enable generic user feedback + adjust feedback API

Author: bagusnl

CollapseLauncher/XAMLs/MainApp/Pages/Dialogs/SimpleDialogs.cs

@@ -1309,10 +1309,6 @@ private static async void SubmitFeedbackButton_Click(object sender, RoutedEventA
                     Message = exceptionContent
                 };
                 UserFeedbackResult? feedbackResult = await feedbackDialog.ShowAsync();
-                // TODO: (Optional) Implement generic user feedback pathway (preferably when SentryErrorId is null
-                // Using https://paste.mozilla.org/ 
-                // API Documentation: https://docs.dpaste.org/api/
-                // Though im not sure since user will still need to paste the link to us 🤷
 
                 if (feedbackResult is null)
                 {

CollapseLauncher/XAMLs/MainApp/Pages/SettingsPage.xaml

@@ -2393,7 +2393,7 @@
                         HorizontalContentAlignment="Stretch"
                         Click="ShareYourFeedbackClick"
                         CornerRadius="{x:Bind ext:UIElementExtensions.AttachRoundedKindCornerRadius(ShareYourFeedbackButton)}"
-                        IsEnabled="False"
+                        IsEnabled="True"
                         Style="{ThemeResource AccentButtonStyle}">
                     <Grid Margin="0,-2,0,0"
                           HorizontalAlignment="Stretch">

CollapseLauncher/XAMLs/MainApp/Pages/SettingsPage.xaml.cs

@@ -439,9 +439,29 @@ private async void ShareYourFeedbackClick(object sender, RoutedEventArgs e)
 
             if (userFeedbackResult == null)
             {
-                LogWriteLine("User feedback dialog cancelled!", LogType.Debug);
+                LogWriteLine("User feedback dialog cancelled!");
+                return;
             }
-#endif
+            
+            // Parse username and email
+            var msg = userFeedbackResult.Message.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+            if (msg.Length <= 4) return; // Do not send feedback if format is not correct
+            var user     = msg[0].Replace(userTemplate, "", StringComparison.InvariantCulture).Trim();
+            var email    = msg[1].Replace(userTemplate, "", StringComparison.InvariantCulture).Trim();
+            var feedback = msg.Length > 4 ? string.Join("\n", msg.Skip(4)).Trim() : null;
+
+            if (string.IsNullOrEmpty(user)) user = "none";
+
+            // Validate email
+            var addr = System.Net.Mail.MailAddress.TryCreate(email, out var address);
+            email = addr ? address!.Address : "[email protected]";
+
+            if (string.IsNullOrEmpty(feedback)) return;
+
+            var feedbackContent = $"{feedback}\n\nRating: {userFeedbackResult.Rating}/5";
+
+            SentryHelper.SendGenericFeedback(feedbackContent, email, user);
+        #endif
         }
 
         private void ClickTextLinkFromTag(object sender, PointerRoutedEventArgs e)

Hi3Helper.Core/Classes/SentryHelper/SentryHelper.cs

@@ -548,10 +548,13 @@ public static void SendExceptionFeedback(Guid sentryId, string userEmail, string
                                     true);
             }
 
-            var sId          = new SentryId(sentryId);
-            var userFeedback = new UserFeedback(sId, user, userEmail, feedback);
-            
-            SentrySdk.CaptureUserFeedback(userFeedback);
+            var sId       = new SentryId(sentryId);
+            SentrySdk.CaptureFeedback(feedback, userEmail, user, null, null, sId);
+        }
+        
+        public static void SendGenericFeedback(string feedback, string userEmail, string user)
+        {
+            SentrySdk.CaptureFeedback(feedback, userEmail, user);
         }
 
         [GeneratedRegex(@"(?<=\bat\s)(CollapseLauncher|Hi3Helper)\.[^\s(]+", RegexOptions.Compiled)]