refactor(connections): align UpsertStatus guild filter; validate heartbeat timeout < interval

Author: HandyS11

src/RustPlusBot.Host/Program.cs

@@ -46,6 +46,8 @@
         "Connections:MaxRetryDelay must be at least InitialRetryDelay.")
     .Validate(static o => o.HeartbeatInterval > TimeSpan.Zero, "Connections:HeartbeatInterval must be positive.")
     .Validate(static o => o.HeartbeatTimeout > TimeSpan.Zero, "Connections:HeartbeatTimeout must be positive.")
+    .Validate(static o => o.HeartbeatTimeout < o.HeartbeatInterval,
+        "Connections:HeartbeatTimeout must be less than HeartbeatInterval.")
     .ValidateOnStart();
 builder.Services.AddConnections();
 

src/RustPlusBot.Persistence/Connections/ConnectionStore.cs

@@ -28,7 +28,7 @@ public async Task<bool> UpsertStatusAsync(
         CancellationToken cancellationToken = default)
     {
         var existing = await context.ConnectionStates
-            .SingleOrDefaultAsync(s => s.RustServerId == serverId, cancellationToken)
+            .SingleOrDefaultAsync(s => s.GuildId == guildId && s.RustServerId == serverId, cancellationToken)
             .ConfigureAwait(false);
 
         if (existing is null)