diff --git a/apps/server/AliasVault.Client/Main/Components/Items/ItemIcon.razor b/apps/server/AliasVault.Client/Main/Components/Items/ItemIcon.razor index d8470e920..bfb530248 100644 --- a/apps/server/AliasVault.Client/Main/Components/Items/ItemIcon.razor +++ b/apps/server/AliasVault.Client/Main/Components/Items/ItemIcon.razor @@ -106,6 +106,11 @@ else { return "image/png"; } + + if (bytes[0] == 0xFF && bytes[1] == 0xD8 && bytes[2] == 0xFF) + { + return "image/jpeg"; + } } return "image/x-icon"; diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceCard.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceCard.razor index 12f4f7b0f..e881220d7 100644 --- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceCard.razor +++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/Components/ImportServiceCard.razor @@ -923,7 +923,6 @@ var nowUtc = DateTime.UtcNow; existingLogo.IsDeleted = false; existingLogo.FileData = importedCredential.FaviconBytes; - existingLogo.MimeType = "image/png"; existingLogo.FetchedAt = nowUtc; existingLogo.UpdatedAt = nowUtc; item.LogoId = existingLogo.Id; @@ -936,7 +935,6 @@ Id = Guid.NewGuid(), Source = domain, FileData = importedCredential.FaviconBytes, - MimeType = "image/png", FetchedAt = DateTime.UtcNow, CreatedAt = DateTime.UtcNow, UpdatedAt = DateTime.UtcNow, @@ -984,7 +982,6 @@ { existingLogo.IsDeleted = false; existingLogo.FileData = favicon; - existingLogo.MimeType = "image/png"; existingLogo.FetchedAt = nowUtc; existingLogo.UpdatedAt = nowUtc; item.LogoId = existingLogo.Id; @@ -997,7 +994,6 @@ Id = Guid.NewGuid(), Source = domain, FileData = favicon, - MimeType = "image/png", FetchedAt = nowUtc, CreatedAt = nowUtc, UpdatedAt = nowUtc, diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/StorageInsights.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/StorageInsights.razor index fdd2ca09a..b3516971d 100644 --- a/apps/server/AliasVault.Client/Main/Pages/Settings/StorageInsights.razor +++ b/apps/server/AliasVault.Client/Main/Pages/Settings/StorageInsights.razor @@ -129,7 +129,6 @@ else @logo.Source @FormatSize(logo.SizeBytes) - @(string.IsNullOrWhiteSpace(logo.MimeType) ? "-" : logo.MimeType) @logo.ItemCount @Localizer["ItemsUsingLogoSuffix"] } @@ -191,7 +190,6 @@ else [ new TableColumn { Title = "Source", Sortable = false }, new TableColumn { Title = "Size", Sortable = false }, - new TableColumn { Title = "Type", Sortable = false }, new TableColumn { Title = "Used by", Sortable = false }, ]; @@ -228,8 +226,7 @@ else _attachmentColumns[3].Title = Localizer["ColumnCreated"]; _logoColumns[0].Title = Localizer["ColumnWebsiteURL"]; _logoColumns[1].Title = Localizer["ColumnSize"]; - _logoColumns[2].Title = Localizer["ColumnMimeType"]; - _logoColumns[3].Title = Localizer["ColumnItemCount"]; + _logoColumns[2].Title = Localizer["ColumnItemCount"]; await LoadStatisticsAsync(); } @@ -288,7 +285,6 @@ else { l.Id, l.Source, - l.MimeType, SizeBytes = l.FileData!.Length, ItemIds = l.Items .Where(i => !i.IsDeleted && i.DeletedAt == null) @@ -302,7 +298,6 @@ else { Id = l.Id, Source = l.Source, - MimeType = l.MimeType, SizeBytes = l.SizeBytes, ItemCount = l.ItemIds.Count, FirstItemId = l.ItemIds.Count > 0 ? l.ItemIds[0] : null, @@ -523,7 +518,6 @@ else { existingLogo.IsDeleted = false; existingLogo.FileData = image; - existingLogo.MimeType = "image/png"; existingLogo.FetchedAt = now; existingLogo.UpdatedAt = now; logoId = existingLogo.Id; @@ -535,7 +529,6 @@ else Id = Guid.NewGuid(), Source = domain, FileData = image, - MimeType = "image/png", FetchedAt = now, CreatedAt = now, UpdatedAt = now, @@ -602,8 +595,6 @@ else public string Source { get; init; } = string.Empty; - public string? MimeType { get; init; } - public int SizeBytes { get; init; } public int ItemCount { get; init; } diff --git a/apps/server/AliasVault.Client/Resources/Pages/Main/Settings/StorageInsights.en.resx b/apps/server/AliasVault.Client/Resources/Pages/Main/Settings/StorageInsights.en.resx index 782621752..2b07e7b46 100644 --- a/apps/server/AliasVault.Client/Resources/Pages/Main/Settings/StorageInsights.en.resx +++ b/apps/server/AliasVault.Client/Resources/Pages/Main/Settings/StorageInsights.en.resx @@ -129,10 +129,6 @@ Website URL Table column header for logo source domain - - Type - Table column header for MIME type - Used by Table column header for the number of items using a logo diff --git a/apps/server/AliasVault.Client/Services/ItemService.cs b/apps/server/AliasVault.Client/Services/ItemService.cs index 43b5583b6..6c1bae855 100644 --- a/apps/server/AliasVault.Client/Services/ItemService.cs +++ b/apps/server/AliasVault.Client/Services/ItemService.cs @@ -1530,7 +1530,6 @@ public sealed class ItemService(HttpClient httpClient, DbService dbService, Conf // Restore (or refill) the existing row. existingLogo.IsDeleted = false; existingLogo.FileData = image; - existingLogo.MimeType = "image/png"; existingLogo.FetchedAt = now; existingLogo.UpdatedAt = now; item.LogoId = existingLogo.Id; @@ -1542,7 +1541,6 @@ public sealed class ItemService(HttpClient httpClient, DbService dbService, Conf Id = Guid.NewGuid(), Source = domain, FileData = image, - MimeType = "image/png", FetchedAt = now, CreatedAt = now, UpdatedAt = now,