diff --git a/Iceshrimp.Backend/Core/Database/Tables/User.cs b/Iceshrimp.Backend/Core/Database/Tables/User.cs index fb832d4f..3da61447 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/User.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/User.cs @@ -124,7 +124,7 @@ public class User : IEntity [Column("isBot")] public bool IsBot { get; set; } - [Column("isSystem")] public bool IsSystem { get; set; } + [Column("isSystem")] public bool IsSystemUser { get; set; } [Column("isRelayActor")] public bool IsRelayActor { get; set; } diff --git a/Iceshrimp.Backend/Core/Services/SystemUserService.cs b/Iceshrimp.Backend/Core/Services/SystemUserService.cs index c38b84f0..98850803 100644 --- a/Iceshrimp.Backend/Core/Services/SystemUserService.cs +++ b/Iceshrimp.Backend/Core/Services/SystemUserService.cs @@ -80,7 +80,7 @@ public class SystemUserService(ILogger logger, DatabaseContex IsLocked = true, IsExplorable = false, IsBot = true, - IsSystem = true + IsSystemUser = true }; var userKeypair = new UserKeypair diff --git a/Iceshrimp.Backend/Core/Services/UserService.cs b/Iceshrimp.Backend/Core/Services/UserService.cs index 1277a2db..a549e888 100644 --- a/Iceshrimp.Backend/Core/Services/UserService.cs +++ b/Iceshrimp.Backend/Core/Services/UserService.cs @@ -660,6 +660,8 @@ public class UserService( throw GracefulException.UnprocessableEntity("You cannot follow yourself"); if (follower.IsRemoteUser && followee.IsRemoteUser) throw GracefulException.UnprocessableEntity("Cannot process follow between two remote users"); + if (follower.IsSystemUser || followee.IsSystemUser) + throw GracefulException.UnprocessableEntity("System users cannot have follow relationships"); Guid? relationshipId = null;