Use null-conditional operator

WernerMairl · Apr 29, 2019 · 50d4256 · 50d4256
1 parent a1e96d7
commit 50d4256
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs b/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs
@@ -190,15 +190,15 @@ private static string YouTube(Uri uri)
             }
             var queryParams = SplitQuery(uri);
             return BuildYouTubeIframeUrl(
-                queryParams.Where(p => p.StartsWith("v=")).Select(p => p.Substring(2)).FirstOrDefault(),
-                queryParams.Where(p => p.StartsWith("t=")).Select(p => p.Substring(2)).FirstOrDefault()
+                queryParams.FirstOrDefault(p => p.StartsWith("v="))?.Substring(2),
+                queryParams.FirstOrDefault(p => p.StartsWith("t="))?.Substring(2)
             );
         }
 
         private static string YouTubeShortened(Uri uri) {
             return BuildYouTubeIframeUrl(
                 uri.AbsolutePath.Substring(1),
-                SplitQuery(uri).Where(p => p.StartsWith("t=")).Select(p => p.Substring(2)).FirstOrDefault()
+                SplitQuery(uri).FirstOrDefault(p => p.StartsWith("t="))?.Substring(2)
             );
         }