Reduce code duplication for expiration times

ButterscotchV · Jan 29, 2024 · 04df123 · 04df123
1 parent 5ae2ab2
commit 04df123
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/ButterSTT/MessageSystem/MessageQueue.cs b/ButterSTT/MessageSystem/MessageQueue.cs
@@ -119,6 +119,9 @@ public void QueueParagraphToFit(int padding = 0)
             }
         }
 
+        private static DateTime ComputeExpiration(TimeSpan span) =>
+            span >= TimeSpan.MaxValue ? DateTime.MaxValue : DateTime.UtcNow + span;
+
         private void ProgressWordQueue()
         {
             // Make sure there is enough room to fit a new word in the message,
@@ -136,12 +139,8 @@ private void ProgressWordQueue()
                 MessageWordQueue.Enqueue(
                     new MessageWord(
                         word,
-                        WordTime >= TimeSpan.MaxValue
-                            ? DateTime.MaxValue
-                            : DateTime.UtcNow + WordTime,
-                        HardWordTime >= TimeSpan.MaxValue
-                            ? DateTime.MaxValue
-                            : DateTime.UtcNow + HardWordTime
+                        ComputeExpiration(WordTime),
+                        ComputeExpiration(HardWordTime)
                     )
                 );
                 CurMessageLength += word.Length;