Fixing the expression convertor for imbricked lambdas

Kyoo.Common/Utility.cs

@@ -342,26 +342,18 @@ namespace Kyoo
 			}
 
 			internal Expression<TTo> VisitAndConvert()
-			{
-				return (Expression<TTo>)RunGenericMethod(
-					this,
-					"VisitLambda",
-					_expression.GetType().GetGenericArguments().First(), 
-					_expression);
-			}
-			
-			protected override Expression VisitLambda<T>(Expression<T> node)
 			{
 				Type returnType = _expression.Type.GetGenericArguments().Last();
-				Expression body = node.ReturnType == returnType
+				Expression body = _expression.ReturnType == returnType
-					? Visit(node.Body)
+					? Visit(_expression.Body)
-					: Expression.Convert(Visit(node.Body)!, returnType);
+					: Expression.Convert(Visit(_expression.Body)!, returnType);
 				return Expression.Lambda<TTo>(body!, _newParams);
 			}
 
 			protected override Expression VisitParameter(ParameterExpression node)
 			{
-				return _newParams.First(x => x.Name == node.Name);
+				Console.WriteLine($"Rewritting parameter: {node.Name}");
+				return _newParams.FirstOrDefault(x => x.Name == node.Name) ?? node;
 			}
 		}
 	}

Kyoo.CommonAPI/ApiHelper.cs

@@ -23,6 +23,8 @@ namespace Kyoo.CommonApi
 		public static Expression<Func<T, bool>> ParseWhere<T>(Dictionary<string, string> where, 
 			Expression<Func<T, bool>> defaultWhere = null)
 		{
+			return defaultWhere;
+			
 			if (where == null || where.Count == 0)
 				return defaultWhere;