Merge branch 'main' of https://github.com/miawinter98/Wave

2024-04-22 14:17:46 +02:00 · 2024-04-22 14:17:46 +02:00 · e3bec1cc8d
parent bb2f1f5c92 c50fc079fd
commit e3bec1cc8d
10 changed files with 772 additions and 17 deletions
--- a/Wave/Components/Account/Pages/Manage/ProfilePicture.razor
+++ b/Wave/Components/Account/Pages/Manage/ProfilePicture.razor
@ -40,7 +40,7 @@
    private async Task ProfilePictureChanged(string tempFilePath) {
        if (User is null) return;

-        var guid = await ImageService.StoreImageAsync(tempFilePath);
+        var guid = await ImageService.StoreImageAsync(tempFilePath, enforceSize:true);
        if (!guid.HasValue) throw new ApplicationException("Processing Image failed.");

        Guid? imageToDelete = null;
--- a/Wave/Components/Pages/CategoryView.razor
+++ b/Wave/Components/Pages/CategoryView.razor
@ -45,7 +45,7 @@
 		if (Category != null) return;

 		Category = await context.Set<Category>()
-			.IgnoreAutoIncludes().IgnoreQueryFilters()
+			.IgnoreAutoIncludes()
 			.Include(c => c.Articles).ThenInclude(a => a.Categories)
 			.Include(c => c.Articles).ThenInclude(a => a.Author)
 			.AsSplitQuery()
--- a/Wave/Components/Pages/UserView.razor
+++ b/Wave/Components/Pages/UserView.razor
@ -89,20 +89,17 @@
 	private ApplicationUser? User { get; set; }

 	protected override async Task OnInitializedAsync() {
+		if (User is not null) return;
 		await using var context = await ContextFactory.CreateDbContextAsync();

 		// Find user
 		if (Id is not null) {
-			var now = DateTimeOffset.UtcNow;
 			User = await context.Users
-				.IgnoreAutoIncludes().IgnoreQueryFilters()
-				.Include(u => u.Articles.Where(a => !a.IsDeleted && a.PublishDate <= now))
+				.IgnoreAutoIncludes()
+				.Include(u => u.Links)
+				.Include(u => u.Articles).ThenInclude(a => a.Categories)
+				.AsSplitQuery()
 				.FirstOrDefaultAsync(u => u.Id == Id.ToString());
-			await context.Set<Article>()
-				.Where(a => a.Author.Id == Id.ToString())
-				.Select(a => new { 
-					a.Id, a.Categories
-				}).LoadAsync();
 		}

 		// Validate access to user
--- a/Wave/Components/UserLinkComponent.razor
+++ b/Wave/Components/UserLinkComponent.razor
@ -1,9 +1,10 @@
@using Wave.Data
@using System.Net
+@using System.Text.RegularExpressions

 <a href="@Link.UrlString" rel="me" target="_blank" title="@Link.Url.Host" @attributes="AdditionalAttributes">
 	<img src="@("/api/proxy/favicon/" + WebUtility.UrlEncode(Link.Url.Host))" alt="" width="32" height="32" class="w-5 h-5" loading="async" />
-	@(Link.Url.Host.LastIndexOf('.') > -1 ? Link.Url.Host[..Link.Url.Host.LastIndexOf('.')] : Link.Url.Host)
+	@Regex.Replace(Link.Url.Host, @"(www\.|.de|.com)", "", RegexOptions.Compiled | RegexOptions.IgnoreCase)
 </a>

@code {
--- a/Wave/Data/ApplicationDbContext.cs
+++ b/Wave/Data/ApplicationDbContext.cs
@ -55,7 +55,11 @@ public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options
 			
 			article.Property(a => a.BodyPlain).HasDefaultValue("");

-			article.HasQueryFilter(a => !a.IsDeleted && a.Status >= ArticleStatus.Published && a.PublishDate <= DateTimeOffset.UtcNow);
+			article.Property(a => a.CanBePublic)
+				.HasComputedColumnSql(
+					$"\"{nameof(Article.IsDeleted)}\" = false AND \"{nameof(Article.Status)}\" = {(int)ArticleStatus.Published}", true);
+
+			article.HasQueryFilter(a => a.CanBePublic && a.PublishDate <= DateTimeOffset.UtcNow);
 			article.ToTable("Articles");
 		});

@ -74,7 +78,8 @@ public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options
 					articleCategory => {
 						articleCategory.HasKey(ac => ac.Id);
 						articleCategory.ToTable("ArticleCategories");
-						articleCategory.HasQueryFilter(ac => !ac.Article.IsDeleted);
+						articleCategory.HasQueryFilter(ac => 
+							ac.Article.CanBePublic && ac.Article.PublishDate <= DateTimeOffset.UtcNow);
 					});
 			
 			category.ToTable("Categories");
@ -95,7 +100,7 @@ public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options
 			newsletter.Property(a => a.DistributionDateTime)
 				.HasConversion(dateTimeOffsetUtcConverter);

-			newsletter.HasQueryFilter(n => !n.Article.IsDeleted);
+			newsletter.HasQueryFilter(n => n.Article.CanBePublic && n.Article.PublishDate <= DateTimeOffset.UtcNow);
 			newsletter.ToTable("Newsletter");
 		});
 		builder.Entity<EmailSubscriber>(subscriber => {
--- a/Wave/Data/Article.cs
+++ b/Wave/Data/Article.cs
@ -16,6 +16,9 @@ public class Article : ISoftDelete {
    public Guid Id { get; set; }
    public bool IsDeleted { get; set; }

+    // Computed 
+    public bool CanBePublic { get; set; }
+
    [MaxLength(256)]
    public required string Title { get; set; }
    public required string Body { get; set; }
--- a/Wave/Data/Migrations/postgres/ApplicationDbContextModelSnapshot.cs
+++ b/Wave/Data/Migrations/postgres/ApplicationDbContextModelSnapshot.cs
@ -325,6 +325,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                        .HasColumnType("text")
                        .HasDefaultValue("");

+                    b.Property<bool>("CanBePublic")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("boolean")
+                        .HasComputedColumnSql("\"IsDeleted\" = false AND \"Status\" = 2", true);
+
                    b.Property<DateTimeOffset>("CreationDate")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("timestamp with time zone")
--- a/Wave/Data/Migrations/postgres/Article_CanBePublic_Computed.Designer.cs
+++ b/Wave/Data/Migrations/postgres/Article_CanBePublic_Computed.Designer.cs
@ -0,0 +1,716 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Wave.Data;
+
+#nullable disable
+
+namespace Wave.Data.Migrations.postgres
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20240419191448_Article_CanBePublic_Computed")]
+    partial class Article_CanBePublic_Computed
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Npgsql:CollationDefinition:default-case-insensitive", "und-u-kf-upper-ks-level1,und-u-kf-upper-ks-level1,icu,False")
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Wave.Data.ApiClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ApiKeyKey")
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApiKeyKey");
+
+                    b.ToTable("ApiClaim");
+                });
+
+            modelBuilder.Entity("Wave.Data.ApiKey", b =>
+                {
+                    b.Property<string>("Key")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("OwnerName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.HasKey("Key");
+
+                    b.ToTable("ApiKey");
+                });
+
+            modelBuilder.Entity("Wave.Data.ApplicationUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AboutTheAuthor")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Biography")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)");
+
+                    b.Property<string>("BiographyHtml")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactEmail")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ContactPhone")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ContactPhoneBusiness")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ContactWebsite")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("FullName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+                });
+
+            modelBuilder.Entity("Wave.Data.Article", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AuthorId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyHtml")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyPlain")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("");
+
+                    b.Property<bool>("CanBePublic")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("boolean")
+                        .HasComputedColumnSql("\"IsDeleted\" = false AND \"Status\" = 2", true);
+
+                    b.Property<DateTimeOffset>("CreationDate")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("LastModified")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTimeOffset>("PublishDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ReviewerId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Slug")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasDefaultValue("");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuthorId");
+
+                    b.HasIndex("ReviewerId");
+
+                    b.ToTable("Articles", (string)null);
+                });
+
+            modelBuilder.Entity("Wave.Data.ArticleCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("ArticleId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CategoryId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ArticleId");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("ArticleCategories", (string)null);
+                });
+
+            modelBuilder.Entity("Wave.Data.ArticleImage", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ArticleId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ImageDescription")
+                        .IsRequired()
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ArticleId");
+
+                    b.ToTable("Images", (string)null);
+                });
+
+            modelBuilder.Entity("Wave.Data.Category", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Color")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(25);
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .UseCollation("default-case-insensitive");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("Categories", (string)null);
+                });
+
+            modelBuilder.Entity("Wave.Data.EmailNewsletter", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("ArticleId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("DistributionDateTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("IsSend")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ArticleId")
+                        .IsUnique();
+
+                    b.ToTable("Newsletter", (string)null);
+                });
+
+            modelBuilder.Entity("Wave.Data.EmailSubscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .UseCollation("default-case-insensitive");
+
+                    b.Property<string>("Language")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(8)
+                        .HasColumnType("character varying(8)")
+                        .HasDefaultValue("en-US");
+
+                    b.Property<DateTimeOffset?>("LastMailOpened")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTimeOffset?>("LastMailReceived")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("UnsubscribeReason")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("Unsubscribed")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email")
+                        .IsUnique();
+
+                    b.HasIndex("Unsubscribed");
+
+                    b.ToTable("NewsletterSubscribers", (string)null);
+                });
+
+            modelBuilder.Entity("Wave.Data.ProfilePicture", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ApplicationUserId")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ImageId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationUserId")
+                        .IsUnique();
+
+                    b.ToTable("ProfilePictures", (string)null);
+                });
+
+            modelBuilder.Entity("Wave.Data.UserLink", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ApplicationUserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UrlString")
+                        .IsRequired()
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationUserId");
+
+                    b.ToTable("UserLink");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Wave.Data.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Wave.Data.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Wave.Data.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Wave.Data.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Wave.Data.ApiClaim", b =>
+                {
+                    b.HasOne("Wave.Data.ApiKey", null)
+                        .WithMany("ApiClaims")
+                        .HasForeignKey("ApiKeyKey")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Wave.Data.Article", b =>
+                {
+                    b.HasOne("Wave.Data.ApplicationUser", "Author")
+                        .WithMany("Articles")
+                        .HasForeignKey("AuthorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Wave.Data.ApplicationUser", "Reviewer")
+                        .WithMany()
+                        .HasForeignKey("ReviewerId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Author");
+
+                    b.Navigation("Reviewer");
+                });
+
+            modelBuilder.Entity("Wave.Data.ArticleCategory", b =>
+                {
+                    b.HasOne("Wave.Data.Article", "Article")
+                        .WithMany()
+                        .HasForeignKey("ArticleId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Wave.Data.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Article");
+
+                    b.Navigation("Category");
+                });
+
+            modelBuilder.Entity("Wave.Data.ArticleImage", b =>
+                {
+                    b.HasOne("Wave.Data.Article", null)
+                        .WithMany("Images")
+                        .HasForeignKey("ArticleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Wave.Data.EmailNewsletter", b =>
+                {
+                    b.HasOne("Wave.Data.Article", "Article")
+                        .WithOne()
+                        .HasForeignKey("Wave.Data.EmailNewsletter", "ArticleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Article");
+                });
+
+            modelBuilder.Entity("Wave.Data.ProfilePicture", b =>
+                {
+                    b.HasOne("Wave.Data.ApplicationUser", null)
+                        .WithOne("ProfilePicture")
+                        .HasForeignKey("Wave.Data.ProfilePicture", "ApplicationUserId")
+                        .OnDelete(DeleteBehavior.SetNull);
+                });
+
+            modelBuilder.Entity("Wave.Data.UserLink", b =>
+                {
+                    b.HasOne("Wave.Data.ApplicationUser", null)
+                        .WithMany("Links")
+                        .HasForeignKey("ApplicationUserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Wave.Data.ApiKey", b =>
+                {
+                    b.Navigation("ApiClaims");
+                });
+
+            modelBuilder.Entity("Wave.Data.ApplicationUser", b =>
+                {
+                    b.Navigation("Articles");
+
+                    b.Navigation("Links");
+
+                    b.Navigation("ProfilePicture");
+                });
+
+            modelBuilder.Entity("Wave.Data.Article", b =>
+                {
+                    b.Navigation("Images");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
--- a/Wave/Data/Migrations/postgres/Article_CanBePublic_Computed.cs
+++ b/Wave/Data/Migrations/postgres/Article_CanBePublic_Computed.cs
@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Wave.Data.Migrations.postgres;
+
+/// <inheritdoc />
+public partial class Article_CanBePublic_Computed : Migration {
+	/// <inheritdoc />
+	protected override void Up(MigrationBuilder migrationBuilder) {
+		migrationBuilder.AddColumn<bool>(
+			name: "CanBePublic",
+			table: "Articles",
+			type: "boolean",
+			nullable: false,
+			computedColumnSql: "\"IsDeleted\" = false AND \"Status\" = 2",
+			stored: true);
+	}
+
+	/// <inheritdoc />
+	protected override void Down(MigrationBuilder migrationBuilder) {
+		migrationBuilder.DropColumn(
+			name: "CanBePublic",
+			table: "Articles");
+	}
+}
--- a/Wave/Services/ImageService.cs
+++ b/Wave/Services/ImageService.cs
@ -13,15 +13,16 @@ public class ImageService(ILogger<ImageService> logger) {
 		return File.Exists(path) ? path : null;
 	}

-	public async Task<byte[]> GetResized(string path, int size) {
+	public async Task<byte[]> GetResized(string path, int size, bool enforceSize = false, CancellationToken cancellation = default) {
 		var image = new MagickImage(path);
 		image.Resize(new MagickGeometry(size));
+		if (enforceSize) image.Extent(new MagickGeometry(size), Gravity.Center, MagickColors.Black);
 		using var memory = new MemoryStream();
-		await image.WriteAsync(memory);
+		await image.WriteAsync(memory, cancellation);
 		return memory.ToArray();
 	}

-	public async ValueTask<Guid?> StoreImageAsync(string temporaryPath, int size = 800,
+	public async ValueTask<Guid?> StoreImageAsync(string temporaryPath, int size = 800, bool enforceSize = false,
 		CancellationToken cancellation = default) {
 		if (File.Exists(temporaryPath) is not true) return null;

@ -33,6 +34,7 @@ public class ImageService(ILogger<ImageService> logger) {

 			// Jpeg with 90% compression should look decent
 			image.Resize(new MagickGeometry(size)); // this preserves aspect ratio
+			if (enforceSize) image.Extent(new MagickGeometry(size), Gravity.Center, MagickColors.Black);
 			image.Format = MagickFormat.Jpeg;
 			image.Quality = 90;