From 78247acba7b29309cee662595d5571d52984bccb Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Tue, 26 Mar 2024 23:13:25 +0100 Subject: [PATCH 1/2] Fix unlogged account error not showing --- front/packages/models/src/accounts.tsx | 2 +- front/packages/ui/src/errors/connection.tsx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/front/packages/models/src/accounts.tsx b/front/packages/models/src/accounts.tsx index 64c58ed8..d6a6a808 100644 --- a/front/packages/models/src/accounts.tsx +++ b/front/packages/models/src/accounts.tsx @@ -164,7 +164,7 @@ export const AccountProvider = ({ { queryClient.invalidateQueries({ queryKey: ["auth", "me"] }); diff --git a/front/packages/ui/src/errors/connection.tsx b/front/packages/ui/src/errors/connection.tsx index ac085672..4a66afd2 100644 --- a/front/packages/ui/src/errors/connection.tsx +++ b/front/packages/ui/src/errors/connection.tsx @@ -26,7 +26,6 @@ import { useTranslation } from "react-i18next"; import { View } from "react-native"; import { useYoshiki } from "yoshiki/native"; import { DefaultLayout } from "../layout"; -import { ErrorView } from "./error"; import Register from "@material-symbols/svg-400/rounded/app_registration.svg"; export const ConnectionError = () => { From bb3e57ff2a65a8055ee930fd1f77ba0475df4081 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Tue, 26 Mar 2024 23:40:07 +0100 Subject: [PATCH 2/2] Fix filters with string containing quotes --- back/src/Kyoo.Abstractions/Models/Utils/Filter.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/back/src/Kyoo.Abstractions/Models/Utils/Filter.cs b/back/src/Kyoo.Abstractions/Models/Utils/Filter.cs index 2c937334..6c03dc08 100644 --- a/back/src/Kyoo.Abstractions/Models/Utils/Filter.cs +++ b/back/src/Kyoo.Abstractions/Models/Utils/Filter.cs @@ -196,8 +196,8 @@ public abstract record Filter : Filter { return ( from lq in Parse.Char('"').Or(Parse.Char('\'')) - from str in Parse.AnyChar.Where(x => x is not '"' and not '\'').Many().Text() - from rq in Parse.Char('"').Or(Parse.Char('\'')) + from str in Parse.AnyChar.Where(x => x != lq).Many().Text() + from rq in Parse.Char(lq) select str ).Or(Parse.LetterOrDigit.Many().Text()); }