Impove the datetime extension

Author: Suiram1701

API.Test/MessagesTests.cs

@@ -67,9 +67,9 @@ public void GetReceptionPeople()
     {
         Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
 
-        Task<KeyValuePair<string, MessagePerson[]>[]> people = Client.GetMessagePeopleAsync();
+        Task<Dictionary<string, MessagePerson[]>> people = Client.GetMessagePeopleAsync();
         people.Wait();
-        if (people.Result.Length > 0)
+        if (people.Result.Count > 0)
             Assert.Pass();
         else
             Assert.Fail();

WebUntisAPI.Client/Extensions/DateTimeExtensions.cs

@@ -39,32 +39,25 @@ public static void ToWebUntisTimeFormat(this DateTime dateTime, out string dateS
         ///     The time format is HHMM (Hour Minute).
         ///     </para>
         /// </remarks>
-        /// <param name="dateTime">Instance</param>
+        /// <param name="_">Instance</param>
         /// <param name="dateString">Date string</param>
         /// <param name="timeString">Time string</param>
         /// <returns>The new instance that contains the given time. When not to throw on exception and an exception happened is the return value <see langword="null"/></returns>
         /// <exception cref="FormatException">Thrown when one of the given strings isn't in the right format</exception>
-        public static DateTime FromWebUntisTimeFormat(this DateTime dateTime, string dateString, string timeString)
+        public static DateTime FromWebUntisTimeFormat(this DateTime _, string dateString, string timeString)
         {
-            Regex dateRegex = new Regex(@"^\d{4}(?:0\d|1[0-2])(?:0[1-9]|[1-2]\d|3[0-1])$");     // Regex for the WebUntis date format
-            Regex timeRegex = new Regex(@"^(?:\d|1\d|2[0-3])[0-5]\d$");     // Regex for the WebUntis time format
-
-            // Check if the date- and time strings are valid
-            bool isDateValid = dateRegex.IsMatch(dateString);
-            bool isTimeValid = timeRegex.IsMatch(timeString);
-
-            if (!isDateValid || !isTimeValid)
-                throw new FormatException($"The string {(isDateValid ? timeString : dateString)} isn't in the valid format!");
+            Match dateMatch = Regex.Match(dateString, @"^(\d{4})(0\d|1[0-2])(0[1-9]|[1-2]\d|3[0-1])$");
+            Match timeMatch = Regex.Match(timeString, @"^(\d|1\d|2[0-3])([0-5]\d)$");
 
+            if (!dateMatch.Success || !timeMatch.Success)
+                throw new FormatException("A valid format was expected");
 
-            // Parse the numbers in the string to value
-            int year = int.Parse(dateString.Substring(0, 4));
-            int month = int.Parse(dateString.Substring(4, 2));
-            int day = int.Parse(dateString.Substring(6, 2));
+            int year = int.Parse(dateMatch.Groups[1].Value);
+            int month = int.Parse(dateMatch.Groups[2].Value);
+            int day = int.Parse(dateMatch.Groups[3].Value);
 
-            bool is4Letters = timeString.Length == 4;
-            int hour = int.Parse(is4Letters ? timeString.Substring(0, 2) : timeString[0].ToString());
-            int minute = int.Parse(is4Letters ? timeString.Substring(2, 2) : timeString.Substring(1, 2));
+            int hour = int.Parse(timeMatch.Groups[1].Value);
+            int minute = int.Parse(timeMatch.Groups[2].Value);
 
             // date and time string to DateTime instance
             return new DateTime(year, month, day, hour, minute, 0);

WebUntisAPI.Client/WebUntisClient.Messages.cs

@@ -52,16 +52,16 @@ public async Task<MessagePermissions> GetMessagePermissionsAsync(CancellationTok
         /// <exception cref="ObjectDisposedException">Thrown when the instance was disposed</exception>
         /// <exception cref="UnauthorizedAccessException">Thrown when you're logged in</exception>
         /// <exception cref="HttpRequestException">Thrown when an error happened while the http request</exception>
-        public async Task<KeyValuePair<string, MessagePerson[]>[]> GetMessagePeopleAsync(CancellationToken ct = default)
+        public async Task<Dictionary<string, MessagePerson[]>> GetMessagePeopleAsync(CancellationToken ct = default)
         {
             string responseString = await MakeAPIGetRequestAsync("/WebUntis/api/rest/view/v1/messages/recipients/static/persons", ct);
 
-            List<KeyValuePair<string, MessagePerson[]>> personTypes = new List<KeyValuePair<string, MessagePerson[]>>();
+            Dictionary<string, MessagePerson[]> personTypes = new Dictionary<string, MessagePerson[]>();
             JArray types = JArray.Parse(responseString);
             foreach (JObject personType in types.Cast<JObject>())
-                personTypes.Add(new KeyValuePair<string, MessagePerson[]>(personType.Value<string>("type"),
-                    new JsonSerializer().Deserialize<List<MessagePerson>>(personType.Value<JArray>("persons").CreateReader()).ToArray()));
-            return personTypes.ToArray();
+                personTypes.Add(personType.Value<string>("type"),
+                    new JsonSerializer().Deserialize<List<MessagePerson>>(personType.Value<JArray>("persons").CreateReader()).ToArray());
+            return personTypes;
         }
 
         /// <summary>