diff --git a/back/src/Kyoo.Authentication/Controllers/PermissionValidator.cs b/back/src/Kyoo.Authentication/Controllers/PermissionValidator.cs index dd198d93..45f63a3a 100644 --- a/back/src/Kyoo.Authentication/Controllers/PermissionValidator.cs +++ b/back/src/Kyoo.Authentication/Controllers/PermissionValidator.cs @@ -161,7 +161,8 @@ namespace Kyoo.Authentication { if ( context.HttpContext.Items["PermissionGroup"] - is Group group and not Group.None + is Group group + and not Group.None ) _group = group; else if (_group == Group.None) diff --git a/back/src/Kyoo.Core/Controllers/ThumbnailsManager.cs b/back/src/Kyoo.Core/Controllers/ThumbnailsManager.cs index e0bd5a95..c8624dd9 100644 --- a/back/src/Kyoo.Core/Controllers/ThumbnailsManager.cs +++ b/back/src/Kyoo.Core/Controllers/ThumbnailsManager.cs @@ -218,22 +218,24 @@ namespace Kyoo.Core.Controllers { try { - return File.Open( - $"/metadata/user/{userId}.webp", - FileMode.Open - ); + return File.Open($"/metadata/user/{userId}.webp", FileMode.Open); } catch (FileNotFoundException) { } catch (DirectoryNotFoundException) { } User user = await users.Value.Get(userId); - if (user.Email == null) throw new ItemNotFoundException(); + if (user.Email == null) + throw new ItemNotFoundException(); using MD5 md5 = MD5.Create(); - string hash = Convert.ToHexString(md5.ComputeHash(Encoding.ASCII.GetBytes(user.Email))).ToLower(); + string hash = Convert + .ToHexString(md5.ComputeHash(Encoding.ASCII.GetBytes(user.Email))) + .ToLower(); try { HttpClient client = clientFactory.CreateClient(); - HttpResponseMessage response = await client.GetAsync($"https://www.gravatar.com/avatar/{hash}.jpg?d=404&s=250"); + HttpResponseMessage response = await client.GetAsync( + $"https://www.gravatar.com/avatar/{hash}.jpg?d=404&s=250" + ); response.EnsureSuccessStatusCode(); return await response.Content.ReadAsStreamAsync(); } @@ -250,7 +252,8 @@ namespace Kyoo.Core.Controllers try { File.Delete($"/metadata/user/{userId}.webp"); - } catch { } + } + catch { } return; } using SKCodec codec = SKCodec.Create(image); diff --git a/back/src/Kyoo.Core/Views/Resources/UserApi.cs b/back/src/Kyoo.Core/Views/Resources/UserApi.cs index f9cfa41e..a3fdb9ef 100644 --- a/back/src/Kyoo.Core/Views/Resources/UserApi.cs +++ b/back/src/Kyoo.Core/Views/Resources/UserApi.cs @@ -114,4 +114,3 @@ public class UserApi(ILibraryManager libraryManager, IThumbnailsManager thumbs) return NoContent(); } } - diff --git a/back/src/Kyoo.Postgresql/Migrations/20240204193443_RemoveUserLogo.cs b/back/src/Kyoo.Postgresql/Migrations/20240204193443_RemoveUserLogo.cs index 9936c4a1..bef7be5a 100644 --- a/back/src/Kyoo.Postgresql/Migrations/20240204193443_RemoveUserLogo.cs +++ b/back/src/Kyoo.Postgresql/Migrations/20240204193443_RemoveUserLogo.cs @@ -8,13 +8,9 @@ namespace Kyoo.Postgresql.Migrations /// protected override void Up(MigrationBuilder migrationBuilder) { - migrationBuilder.DropColumn( - name: "logo_blurhash", - table: "users"); + migrationBuilder.DropColumn(name: "logo_blurhash", table: "users"); - migrationBuilder.DropColumn( - name: "logo_source", - table: "users"); + migrationBuilder.DropColumn(name: "logo_source", table: "users"); } /// @@ -25,13 +21,15 @@ namespace Kyoo.Postgresql.Migrations table: "users", type: "character varying(32)", maxLength: 32, - nullable: true); + nullable: true + ); migrationBuilder.AddColumn( name: "logo_source", table: "users", type: "text", - nullable: true); + nullable: true + ); } } } diff --git a/front/packages/models/src/account-internal.ts b/front/packages/models/src/account-internal.ts index 392cd48c..71b278e8 100644 --- a/front/packages/models/src/account-internal.ts +++ b/front/packages/models/src/account-internal.ts @@ -18,7 +18,7 @@ * along with Kyoo. If not, see . */ -import { ZodObject, ZodRawShape, z } from "zod"; +import { ZodTypeAny, z } from "zod"; import { Account, AccountP } from "./accounts"; import { MMKV } from "react-native-mmkv"; @@ -46,10 +46,10 @@ export const setCookie = (key: string, val?: unknown) => { return null; }; -export const readCookie = ( +export const readCookie = ( cookies: string | undefined, key: string, - parser?: ZodObject, + parser?: T, ) => { if (!cookies) return null; const name = `${key}=`; diff --git a/front/packages/primitives/src/avatar.tsx b/front/packages/primitives/src/avatar.tsx index 16a17d6b..da72377d 100644 --- a/front/packages/primitives/src/avatar.tsx +++ b/front/packages/primitives/src/avatar.tsx @@ -102,7 +102,7 @@ export const Avatar = forwardRef< alt={alt} width={size} height={size} - {...css({ position: "absolute" }) as ImageProps} + {...(css({ position: "absolute" }) as ImageProps)} /> );