From 8defffbe1dea91d09426697f51f8a53cb51475e7 Mon Sep 17 00:00:00 2001
From: Vitalii Mikhailov <personal@aragas.org>
Date: Fri, 10 Nov 2023 22:02:48 +0200
Subject: [PATCH] Fixed search

---
 .../wwwroot/index.html                         |  2 +-
 .../CrashReportsAnalyzerController.cs          |  6 +++---
 .../DynamicExpressions/DynamicExpressions.cs   | 18 ++++++++++++------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/BUTR.Site.NexusMods.Client/wwwroot/index.html b/src/BUTR.Site.NexusMods.Client/wwwroot/index.html
index 0ee16a98..c8d8e0d8 100644
--- a/src/BUTR.Site.NexusMods.Client/wwwroot/index.html
+++ b/src/BUTR.Site.NexusMods.Client/wwwroot/index.html
@@ -95,7 +95,7 @@ <h2>Loading...</h2>
         <!-- https://metrica.yandex.com/dashboard?id=87711623 -->
         <!-- Please create an issue on our repo if you have a better alternative! -->
         <!-- https://github.com/BUTR/BUTR.Site.NexusMods -->
-        <script defer src="https://cdn.jsdelivr.net/gh/orestbida/cookieconsent@2.9.1/dist/cookieconsent.min.js" integrity="sha256-H+Z1mZeulbIwdqtQq6Vgn6y6yr33+pzXlDd13s3dLh4=" crossorigin="anonymous"></script>
+        <script defer src="https://cdn.jsdelivr.net/gh/orestbida/cookieconsent@2.9.1/dist/cookieconsent.min.js" integrity="sha384-Q979APNquWnMfwcI77qZm43RXhRv43xW3iUhlhInJ9mR1f8bsm7wUTvvBZfg85ef" crossorigin="anonymous"></script>
         <script defer src="js/cookieconsent-init.js"></script>
         <script type="text/plain" data-cookiecategory="metrics">
             (function () {
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsAnalyzerController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsAnalyzerController.cs
index fb7bdbc4..4a88c693 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsAnalyzerController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsAnalyzerController.cs
@@ -109,11 +109,11 @@ private async IAsyncEnumerable<ModuleUpdate> GetModuleUpdatesForBannerlordAsync(
         var moduleIds = crashReport.Modules.Where(x => !x.IsOfficial && string.IsNullOrEmpty(x.Url) && string.IsNullOrEmpty(x.UpdateInfo))
             .Select(x => ModuleId.From(x.Id)).ToArray();
         var nexusModsIds = crashReport.Modules.Where(x => !x.IsOfficial && !string.IsNullOrEmpty(x.Url))
-            .Select(x => NexusModsModId.From(NexusModsUtils.TryParse(x.Url, out _, out var id) ? (int) id : -1))
-            .Where(x => x != -1).ToArray();
+            .Select(x => NexusModsModId.TryParseUrl(x.Url, out var modId) ? modId : NexusModsModId.None)
+            .Where(x => x != NexusModsModId.None).ToArray();
         var nexusModsIds2 = crashReport.Modules.Where(x => !x.IsOfficial && !string.IsNullOrEmpty(x.Url))
             .Select(x => new { ModuelId = ModuleId.From(x.Id), NexusModsId = NexusModsModId.From(NexusModsUtils.TryParse(x.Url, out _, out var id) ? (int) id : -1) })
-            .Where(x => x.NexusModsId != -1).ToArray();
+            .Where(x => x.NexusModsId != NexusModsModId.None).ToArray();
         var updateInfos = crashReport.Modules.Where(x => !x.IsOfficial && !string.IsNullOrEmpty(x.UpdateInfo))
             .Select(x => new { ModuleId = ModuleId.From(x.Id), x.UpdateInfo }).ToArray();
         var moduleIdVersions = crashReport.Modules
diff --git a/src/BUTR.Site.NexusMods.Server/DynamicExpressions/DynamicExpressions.cs b/src/BUTR.Site.NexusMods.Server/DynamicExpressions/DynamicExpressions.cs
index 39050681..848e0361 100644
--- a/src/BUTR.Site.NexusMods.Server/DynamicExpressions/DynamicExpressions.cs
+++ b/src/BUTR.Site.NexusMods.Server/DynamicExpressions/DynamicExpressions.cs
@@ -88,22 +88,28 @@ private static Expression RobustEquals(MemberExpression prop, ConstantExpression
 
     private static Expression GetContainsMethodCallExpression(MemberExpression prop, ConstantExpression constant)
     {
-        if (prop.Type == typeof(string)) // Check if it's convertible to string
+        var type = Nullable.GetUnderlyingType(constant.Type) ?? constant.Type;
+        
+        if (type == typeof(string)) // Check if it's convertible to string
             return Expression.Call(prop, _stringContainsMethod, AsString(constant));
-        else if (prop.Type.GetInterfaces().Contains(typeof(IDictionary)))
+        else if (TypeDescriptor.GetConverter(type) is { } typeConverter && typeConverter.CanConvertTo(typeof(string))) 
+            return Expression.Call(AsString(prop), _stringContainsMethod, AsString(constant));
+        else if (type.GetInterfaces().Contains(typeof(IDictionary)))
             return Expression.Or(Expression.Call(prop, _dictionaryContainsKeyMethod, AsString(constant)), Expression.Call(prop, _dictionaryContainsValueMethod, AsString(constant)));
-        else if (prop.Type.GetInterfaces().Contains(typeof(IEnumerable)))
+        else if (type.GetInterfaces().Contains(typeof(IEnumerable)))
             return Expression.Call(_enumerableContainsMethod, prop, AsString(constant));
 
-        throw new NotImplementedException($"{prop.Type} contains is not implemented.");
+        throw new NotImplementedException($"{type} contains is not implemented.");
     }
     
     private static Expression AsString(Expression constant)
     {
-        if (constant.Type == typeof(string))
+        var type = Nullable.GetUnderlyingType(constant.Type) ?? constant.Type;
+        
+        if (type == typeof(string))
             return constant;
         
-        if (TypeDescriptor.GetConverter(constant.Type) is { } typeConverter && typeConverter.CanConvertTo(typeof(string))) 
+        if (TypeDescriptor.GetConverter(type) is { } typeConverter && typeConverter.CanConvertTo(typeof(string))) 
             return Expression.Convert(constant, typeof(string));
         
         var convertedExpr = Expression.Convert(constant, typeof(object));