Implement user feedback parser

Author: bagusnl

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

@@ -1294,12 +1294,7 @@ private static async void SubmitFeedbackButton_Click(object sender, RoutedEventA
                 var userTemplate  = Lang._Misc.ExceptionFeedbackTemplate_User;
                 var emailTemplate = Lang._Misc.ExceptionFeedbackTemplate_Email;
 
-                string exceptionContent = $"""
-                                          {userTemplate} 
-                                          {emailTemplate} 
-                                          {Lang._Misc.ExceptionFeedbackTemplate_Message}
-                                          ------------------------------------
-                                          """;
+                string exceptionContent = UserFeedbackTemplate.FeedbackTemplate;
                 string exceptionTitle   = $"{Lang._Misc.ExceptionFeedbackTitle} {ErrorSender.ExceptionTitle}";
 
                 UserFeedbackDialog  feedbackDialog = new UserFeedbackDialog(contentDialog.XamlRoot)
@@ -1314,26 +1309,18 @@ private static async void SubmitFeedbackButton_Click(object sender, RoutedEventA
                 {
                     return;
                 }
+                
+                var parsedFeedback = UserFeedbackTemplate.ParseTemplate(feedbackResult);
 
-                // Parse username and email
-                var msg = feedbackResult.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: {feedbackResult.Rating}/5";
-
-                SentryHelper.SendExceptionFeedback(ErrorSender.SentryErrorId, email, user, feedbackContent);
-                isFeedbackSent = true;
+                if (parsedFeedback == null)
+                {
+                    Logger.LogWriteLine("Failed to parse feedback template! Not sending feedback", LogType.Error, true);
+                }
+                else
+                {
+                    SentryHelper.SendExceptionFeedback(ErrorSender.SentryErrorId, parsedFeedback.Email, parsedFeedback.User, parsedFeedback.Message);
+                    isFeedbackSent = true;
+                }
             }
             catch (Exception ex)
             {

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

@@ -419,48 +419,30 @@ static void ExitFromOverlay(object? sender, RoutedEventArgs args)
         private async void ShareYourFeedbackClick(object sender, RoutedEventArgs e)
         {
 #if ENABLEUSERFEEDBACK
-            var userTemplate  = Lang._Misc.ExceptionFeedbackTemplate_User;
-            var emailTemplate = Lang._Misc.ExceptionFeedbackTemplate_Email;
-            string exceptionContent = $"""
-                                       {userTemplate} 
-                                       {emailTemplate} 
-                                       {Lang._Misc.ExceptionFeedbackTemplate_Message}
-                                       ------------------------------------
-                                       """;
-            
+            var content = UserFeedbackTemplate.FeedbackTemplate;
 
             UserFeedbackDialog userFeedbackDialog = new UserFeedbackDialog(XamlRoot, true)
             { 
-                Message   = exceptionContent
+                Message   = content
             };
 
-            UserFeedbackResult userFeedbackResult = await userFeedbackDialog
-               .ShowAsync( result => throw new NotImplementedException());
+            UserFeedbackResult userFeedbackResult = await userFeedbackDialog.ShowAsync();
 
             if (userFeedbackResult == null)
             {
                 LogWriteLine("User feedback dialog cancelled!");
                 return;
             }
-            
-            // 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";
+            var parsedFeedback = UserFeedbackTemplate.ParseTemplate(userFeedbackResult);
+            
+            if (parsedFeedback == null)
+            {
+                LogWriteLine("Feedback result failed to be parsed! Feedback not sent.", LogType.Error, true);
+                return;
+            }
 
-            SentryHelper.SendGenericFeedback(feedbackContent, email, user);
+            SentryHelper.SendGenericFeedback(parsedFeedback.Message, parsedFeedback.Email, parsedFeedback.User);
         #endif
         }
 

CollapseLauncher/XAMLs/Theme/CustomControls/UserFeedbackDialog/UserFeedbackDialog.cs

@@ -17,10 +17,12 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Windows.Storage.Streams;
 using Windows.UI;
+using static Hi3Helper.Locale;
 
 using InnerExtension = CollapseLauncher.Extension.UIElementExtensions;
 // ReSharper disable PartialTypeWithSinglePart
@@ -401,4 +403,41 @@ private static Grid FindOverlayGrid([NotNull] XamlRoot? root, bool isAlwaysOnTop
         }
         #endregion
     }
+
+    public static partial class UserFeedbackTemplate
+    {
+        private static readonly string UserTemplate  = Lang._Misc.ExceptionFeedbackTemplate_User;
+        private static readonly string EmailTemplate = Lang._Misc.ExceptionFeedbackTemplate_Email;
+        
+        public static readonly string FeedbackTemplate = $"""
+                                                          {UserTemplate} 
+                                                          {EmailTemplate} 
+                                                          {Lang._Misc.ExceptionFeedbackTemplate_Message}
+                                                          ------------------------------------
+                                                          """;
+        public record UserFeedbackTemplateResult(string User, string Email, string Message);
+
+        public static UserFeedbackTemplateResult? ParseTemplate(UserFeedbackResult feedbackResult)
+        {
+            // Parse username and email
+            var msg = feedbackResult.Message.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+            if (msg.Length <= 4) return null; // 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 null;
+
+            var feedbackContent = $"{feedback}\n\nRating: {feedbackResult.Rating}/5";
+            
+            return new UserFeedbackTemplateResult(user, email, feedbackContent);
+        } 
+    }
 }